jenkins-bot has submitted this change and it was merged.
Change subject: Remove unused message 'resetpass'
......................................................................
Remove unused message 'resetpass'
This was (unintentionally?) replaced by 'changepassword' in r86280
(1a80d4637002), which renamed the special page from Special:ResetPass
to Special:ChangePassword.
'changepassword' was previously used in Special:Preferences until
r49790 (155ddf6de4a2) for a heading directly above the link to
Special:ResetPass.
I moved messages 'changepassword' and 'changepassword-summary' to
the correct blocks in MessagesEn.php and messages.inc and also
updated message documentation that referred to Special:ResetPass.
Change-Id: Ie5cbda5538f53c8e8d84c5e9d4d818fd745ff46c
---
M languages/messages/MessagesEn.php
M languages/messages/MessagesQqq.php
M maintenance/language/messages.inc
3 files changed, 9 insertions(+), 11 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index f8912eb..20ded80 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1265,7 +1265,8 @@
'user-mail-no-body' => 'Tried to send email with an empty or unreasonably
short body.',
# Change password dialog
-'resetpass' => 'Change password',
+'changepassword' => 'Change password',
+'changepassword-summary' => '', # do not translate or duplicate this
message to other languages
'resetpass_announce' => 'You logged in with a temporary emailed code.
To finish logging in, you must set a new password here:',
'resetpass_text' => '<!-- Add text here -->', # only translate this
message to other languages if you have to change it
@@ -1879,8 +1880,6 @@
'mypreferences' => 'Preferences',
'prefs-edits' => 'Number of edits:',
'prefsnologintext2' => 'Please $1 to set user preferences.',
-'changepassword' => 'Change password',
-'changepassword-summary' => '', # do not translate or duplicate this
message to other languages
'prefs-skin' => 'Skin',
'skin-preview' => 'Preview',
'datedefault' => 'No preference',
diff --git a/languages/messages/MessagesQqq.php
b/languages/messages/MessagesQqq.php
index dd6f7b4..11eff9e 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -1593,10 +1593,10 @@
'changepassword-success' => 'Used in [[Special:ChangePassword]].',
'resetpass_forbidden' => "Used as error message in changing password. Maybe
the external auth plugin won't allow local password changes.",
'resetpass-no-info' => 'Error message for [[Special:ChangePassword]].',
-'resetpass-submit-loggedin' => 'Button on [[Special:ResetPass]] to submit new
password.
+'resetpass-submit-loggedin' => 'Button on [[Special:ChangePassword]] to submit
new password.
{{Identical|Change password}}',
-'resetpass-submit-cancel' => 'Used on [[Special:ResetPass]].
+'resetpass-submit-cancel' => 'Used on [[Special:ChangePassword]].
{{Identical|Cancel}}',
'resetpass-wrong-oldpass' => 'Error message shown on
[[Special:ChangePassword]] when the old password is not valid.',
'resetpass-temp-password' => 'The label of the input box for the temporary
password (received by email) on the form displayed after logging in with a
temporary password.',
@@ -2951,8 +2951,8 @@
'prefs-edits' => 'In user preferences.',
'prefsnologintext2' => 'Parameters:
* $1 - a link to [[Special:UserLogin]] with {{msg-mw|loginreqlink}} as link
description',
-'changepassword' => "Section heading on [[Special:Preferences]], tab 'User
profile'.
-{{Identical|Change password}}",
+'changepassword' => 'Title of [[Special:ChangePassword]].
+{{Identical|Change password}}',
'prefs-skin' => 'Used in user preferences.
{{Identical|Skin}}',
'skin-preview' => '{{doc-actionlink}}
@@ -2982,7 +2982,7 @@
'prefs-watchlist-edits-max' => 'Shown as hint in [[Special:Preferences]], tab
"Watchlist"',
'prefs-watchlist-token' => 'Used in [[Special:Preferences]], tab Watchlist.',
'prefs-misc' => 'Tab used on the [[Special:Preferences|user preferences]]
special page.',
-'prefs-resetpass' => 'Button on user data tab in user preferences. When you
click the button you go to the special page [[Special:ResetPass]].
+'prefs-resetpass' => 'Button on user data tab in user preferences. When you
click the button you go to the special page [[Special:ChangePassword]].
{{Identical|Change password}}',
'prefs-changeemail' => 'Link on [[Special:Preferences]] to
[[Special:ChangeEmail]].
diff --git a/maintenance/language/messages.inc
b/maintenance/language/messages.inc
index 36f80bd..eb0b4dd 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -571,7 +571,8 @@
'user-mail-no-body',
),
'resetpass' => array(
- 'resetpass',
+ 'changepassword',
+ 'changepassword-summary',
'resetpass_announce',
'resetpass_text',
'resetpass_header',
@@ -1008,8 +1009,6 @@
'mypreferences',
'prefs-edits',
'prefsnologintext2',
- 'changepassword',
- 'changepassword-summary',
'prefs-skin',
'skin-preview',
'datedefault',
--
To view, visit https://gerrit.wikimedia.org/r/99621
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5cbda5538f53c8e8d84c5e9d4d818fd745ff46c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: PleaseStand <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Parent5446 <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
