IAlex has uploaded a new change for review. https://gerrit.wikimedia.org/r/59806
Change subject: Merge 'passwordreset-pretext' into 'passwordreset-text' message ...................................................................... Merge 'passwordreset-pretext' into 'passwordreset-text' message It is confusing to have in the same two messages which can be interpreted with different meanings. When there is more than one way of resetting a password, two messages are being show to the user: - 'passwordreset-pretext' saying to fill only one of the fields below - 'passwordreset-text' saying to *complete* the form, which people can interpret as "fill all the fields below" This already got changed at the English Wikipedia, see https://en.wikipedia.org/wiki/Wikipedia:MediaWiki_messages/Archive_5#Special:PasswordReset_improvements I think it's worth changing MediaWiki too. Change-Id: Ia2f0c889959d11396411ba44ae595ffad5d498d2 --- M includes/specials/SpecialPasswordReset.php M languages/messages/MessagesEn.php M maintenance/language/messages.inc 3 files changed, 5 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/06/59806/1 diff --git a/includes/specials/SpecialPasswordReset.php b/includes/specials/SpecialPasswordReset.php index a166b56..ad1d784 100644 --- a/includes/specials/SpecialPasswordReset.php +++ b/includes/specials/SpecialPasswordReset.php @@ -103,11 +103,8 @@ } public function alterForm( HTMLForm $form ) { - $form->setSubmitTextMsg( 'mailmypassword' ); - } - - protected function preText() { global $wgPasswordResetRoutes; + $i = 0; if ( isset( $wgPasswordResetRoutes['username'] ) && $wgPasswordResetRoutes['username'] ) { $i++; @@ -118,7 +115,9 @@ if ( isset( $wgPasswordResetRoutes['domain'] ) && $wgPasswordResetRoutes['domain'] ) { $i++; } - return $this->msg( 'passwordreset-pretext', $i )->parseAsBlock(); + + $form->setHeaderText( $this->msg( 'passwordreset-text', $i )->parseAsBlock() ); + $form->setSubmitTextMsg( 'mailmypassword' ); } /** diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index f3a0072..587ea87 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1227,11 +1227,10 @@ # Special:PasswordReset 'passwordreset' => 'Reset password', -'passwordreset-text' => 'Complete this form to reset your password.', +'passwordreset-text' => '{{PLURAL:$1|Complete this form to reset your password.|Enter one of the pieces of data to reset your password.}}', 'passwordreset-legend' => 'Reset password', 'passwordreset-disabled' => 'Password resets have been disabled on this wiki.', 'passwordreset-emaildisabled' => 'Email features have been disabled on this wiki.', -'passwordreset-pretext' => '{{PLURAL:$1||Enter one of the pieces of data below}}', 'passwordreset-username' => 'Username:', 'passwordreset-domain' => 'Domain:', 'passwordreset-capture' => 'View the resulting email?', diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index 39083f9..2736ef4 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -548,7 +548,6 @@ 'passwordreset-legend', 'passwordreset-disabled', 'passwordreset-emaildisabled', - 'passwordreset-pretext', 'passwordreset-username', 'passwordreset-domain', 'passwordreset-capture', -- To view, visit https://gerrit.wikimedia.org/r/59806 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia2f0c889959d11396411ba44ae595ffad5d498d2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: IAlex <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
