(Bug 35987) Clarify change password on Special:ChangeEmail

Continuing Ravichandran's work, I fixed issues raised by IAlex.

Change-Id: Ib8bec70bf0aa451d26971569214b4b13c2abddff

diff --git a/includes/specials/SpecialChangeEmail.php b/includes/specials/SpecialChangeEmail.php
index 99d2ebf..eae8e3a 100644 (file)
--- a/includes/specials/SpecialChangeEmail.php
+++ b/includes/specials/SpecialChangeEmail.php
@@ -154,7 +154,7 @@ class SpecialChangeEmail extends UnlistedSpecialPage {
                        array( 'wpNewEmail', 'changeemail-newemail', 'email', $this->mNewEmail ),
                );
                if ( $wgRequirePasswordforEmailChange ) {
-                       $items[] = array( 'wpPassword', 'yourpassword', 'password', $this->mPassword );
+                       $items[] = array( 'wpPassword', 'changeemail-password', 'password', $this->mPassword );
                }
 
                $this->getOutput()->addHTML(

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index aa582f6..affeb8f 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1261,6 +1261,7 @@ Temporary password: $2',
 'changeemail-oldemail' => 'Current e-mail address:',
 'changeemail-newemail' => 'New e-mail address:',
 'changeemail-none'     => '(none)',
+'changeemail-password' => 'Your {{SITENAME}} password:',
 'changeemail-submit'   => 'Change e-mail',
 'changeemail-cancel'   => 'Cancel',
 

diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index 3f54d9e..456343d 100644 (file)
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -921,6 +921,7 @@ Parameters:
 'changeemail-none' => "Probably appears in 'Current E-mail address' field when no address held, in [[Special:ChangeEmail]].
 
 {{Identical|None}}",
+'changeemail-password' => 'Label for password field in [[Special:ChangeEmail]].',
 'changeemail-submit' => 'Submit button on [[Special:ChangeEmail]]',
 'changeemail-cancel' => 'Cancel button on [[Special:ChangeEmail]]
 

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index b4b9365..87625b0 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -559,6 +559,7 @@ $wgMessageStructure = array(
                'changeemail-oldemail',
                'changeemail-newemail',
                'changeemail-none',
+               'changeemail-password',
                'changeemail-submit',
                'changeemail-cancel',
        ),