Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102425
Change subject: WIP: Show the comment that the user wrote when signing up
......................................................................
WIP: Show the comment that the user wrote when signing up
Needs styling.
Change-Id: I53b204b57468d342379906d6871f669bb44dcc04
---
M Resources.php
M TranslateSandbox.i18n.php
M resources/js/ext.translate.special.translatesandbox.js
M specials/SpecialTranslateSandbox.php
M tests/browser/features/manage_translator_sandbox.feature
M tests/browser/features/step_definitions/manage_translator_sandbox_steps.rb
M tests/browser/features/support/pages/manage_translator_sandbox_page.rb
7 files changed, 50 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/25/102425/1
diff --git a/Resources.php b/Resources.php
index 43dd214..feb3062 100644
--- a/Resources.php
+++ b/Resources.php
@@ -381,6 +381,7 @@
'tsb-older-requests',
'tsb-accept-all-button-label',
'tsb-reject-all-button-label',
+ 'tsb-user-posted-a-comment',
'tsb-reminder-link-text',
'tsb-reminder-sending',
'tsb-reminder-sent',
diff --git a/TranslateSandbox.i18n.php b/TranslateSandbox.i18n.php
index caec762..14ff76d 100644
--- a/TranslateSandbox.i18n.php
+++ b/TranslateSandbox.i18n.php
@@ -58,6 +58,7 @@
'tsb-older-requests' => '$1 older {{PLURAL:$1|request|requests}}',
'tsb-accept-all-button-label' => 'Accept all',
'tsb-reject-all-button-label' => 'Reject all',
+ 'tsb-user-posted-a-comment' => 'The following comment was posted by the
user:',
'tsb-reminder-link-text' => 'Send email reminder',
'tsb-didnt-make-any-translations' => 'This user did not make any
translations.',
'tsb-translations-source' => 'Source',
@@ -133,6 +134,7 @@
See also:
* {{msg-mw|Tsb-accept-all-button-label}}',
+ 'tsb-user-posted-a-comment' => 'A label that appears near some text
posted by the user.',
'tsb-reminder-link-text' => 'Link text for sending reminder emails
about translator signup requests.
See also:
diff --git a/resources/js/ext.translate.special.translatesandbox.js
b/resources/js/ext.translate.special.translatesandbox.js
index dd9e4b6..5be8ed5 100644
--- a/resources/js/ext.translate.special.translatesandbox.js
+++ b/resources/js/ext.translate.special.translatesandbox.js
@@ -110,6 +110,8 @@
$( '<div>' )
.addClass( 'languages row autonym' ),
$( '<div>' )
+ .addClass( 'signup-comment row' ),
+ $( '<div>' )
.addClass( 'actions row' )
.append(
$( '<button>' )
@@ -135,17 +137,30 @@
.addClass( 'translations row' )
);
- if ( request.languagepreferences &&
request.languagepreferences.languages ) {
- $.each( request.languagepreferences.languages, function
( index, language ) {
- $detailsPane.find( '.languages' ).append(
- $( '<span>' )
- .prop( {
- dir: $.uls.data.getDir(
language ),
- lang: language
- } )
- .text( $.uls.data.getAutonym(
language ) )
+ if ( request.languagepreferences ) {
+ if ( request.languagepreferences.languages ) {
+ $.each( request.languagepreferences.languages,
function ( index, language ) {
+ $detailsPane.find( '.languages'
).append(
+ $( '<span>' )
+ .prop( {
+ dir:
$.uls.data.getDir( language ),
+ lang: language
+ } )
+ .text(
$.uls.data.getAutonym( language ) )
+ );
+ } );
+ }
+
+ if ( request.languagepreferences.comment ) {
+ $detailsPane.find( '.signup-comment' ).append(
+ $( '<div>' )
+ .addClass(
'signup-comment-label' )
+ .text( mw.msg(
'tsb-user-posted-a-comment' ) ),
+ $( '<div>' )
+ .addClass(
'signup-comment-text' )
+ .text(
request.languagepreferences.comment )
);
- } );
+ }
}
// @todo: move higher in the tree
diff --git a/specials/SpecialTranslateSandbox.php
b/specials/SpecialTranslateSandbox.php
index 0047b9e..49a5076 100644
--- a/specials/SpecialTranslateSandbox.php
+++ b/specials/SpecialTranslateSandbox.php
@@ -69,7 +69,7 @@
'translate-sandbox',
FormatJson::encode( array(
'languages' => array(
$testLanguages[$i] ),
- 'comment' => ''
+ 'comment' => '',
) )
);
@@ -103,7 +103,7 @@
'translate-sandbox',
FormatJson::encode( array(
'languages' => $testLanguages,
- 'comment' => ''
+ 'comment' => "I know some languages,
and I'm a developer.",
) )
);
$polyglotUser->saveSettings();
diff --git a/tests/browser/features/manage_translator_sandbox.feature
b/tests/browser/features/manage_translator_sandbox.feature
index c94fb98..89f7598 100644
--- a/tests/browser/features/manage_translator_sandbox.feature
+++ b/tests/browser/features/manage_translator_sandbox.feature
@@ -206,6 +206,16 @@
And I should see the checkbox next to the request from "Pupu0" disabled
And I should not see any translations done by the user in the second
column
+ Scenario: Selecting a user who wrote a comment when signing up
+ Given I am on the Translator sandbox management page with users in the
sandbox
+ When I click on "Kissa" in the first column
+ Then I should see that the user wrote a comment that says "I know some
languages, and I'm a developer."
+
+ Scenario: Selecting a user who didn't write a comment when signing up
+ Given I am on the Translator sandbox management page with users in the
sandbox
+ When I click on "Pupu2" in the first column
+ Then I should not see that the user wrote a comment
+
Scenario: Accepting one user
Given I am on the Translator sandbox management page with users in the
sandbox
When I click on "Pupu2" in the first column
diff --git
a/tests/browser/features/step_definitions/manage_translator_sandbox_steps.rb
b/tests/browser/features/step_definitions/manage_translator_sandbox_steps.rb
index a8b98b7..c01e402 100644
--- a/tests/browser/features/step_definitions/manage_translator_sandbox_steps.rb
+++ b/tests/browser/features/step_definitions/manage_translator_sandbox_steps.rb
@@ -156,6 +156,14 @@
on(ManageTranslatorSandboxPage).selected_counter.should == text
end
+Then(/^I should see that the user wrote a comment that says "(.*?)"$/) do
|text|
+ on(ManageTranslatorSandboxPage).signup_comment_text.should == text
+end
+
+Then(/^I should not see that the user wrote a comment$/) do
+ on(ManageTranslatorSandboxPage).signup_comment_text_element.should_not
exist
+end
+
Then(/^I should see the name of the first user in the first column in the
header of the second column$/) do
on(ManageTranslatorSandboxPage) do |page|
page.details_header.should == page.username_in_request(0)
diff --git
a/tests/browser/features/support/pages/manage_translator_sandbox_page.rb
b/tests/browser/features/support/pages/manage_translator_sandbox_page.rb
index cffb12a..e3d12f5 100644
--- a/tests/browser/features/support/pages/manage_translator_sandbox_page.rb
+++ b/tests/browser/features/support/pages/manage_translator_sandbox_page.rb
@@ -25,6 +25,8 @@
checkbox(:select_all_checkbox, class: "request-selector-all")
+ div(:signup_comment_text, class: "signup-comment-text")
+
def details_button(label)
@browser.button(text: label)
end
--
To view, visit https://gerrit.wikimedia.org/r/102425
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I53b204b57468d342379906d6871f669bb44dcc04
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Amire80 <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
