jenkins-bot has submitted this change and it was merged.
Change subject: Misleading messages on Special:Userrights
......................................................................
Misleading messages on Special:Userrights
Corrects what is not addressed by I57e9ca4f20fe557e4024c4f5a4865170f02ebb45
Bug: T152428
Change-Id: I105be73acc5a2bc088b557ccafbdf9db726480da
---
M includes/specials/SpecialUserrights.php
M languages/i18n/en.json
M languages/i18n/qqq.json
3 files changed, 13 insertions(+), 4 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialUserrights.php
b/includes/specials/SpecialUserrights.php
index 5b4f1f8..3ba46c1 100644
--- a/includes/specials/SpecialUserrights.php
+++ b/includes/specials/SpecialUserrights.php
@@ -549,9 +549,14 @@
Xml::element(
'legend',
[],
- $this->msg( 'userrights-editusergroup',
$user->getName() )->text()
+ $this->msg(
+ $canChangeAny ?
'userrights-editusergroup' : 'userrights-viewusergroup',
+ $user->getName()
+ )->text()
) .
- $this->msg( 'editinguser' )->params( wfEscapeWikiText(
$user->getName() ) )
+ $this->msg(
+ $canChangeAny ? 'editinguser' :
'viewinguserrights'
+ )->params( wfEscapeWikiText( $user->getName() ) )
->rawParams( $userToolLinks )->parse()
);
if ( $canChangeAny ) {
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index d167904..733f003 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1140,7 +1140,9 @@
"userrights-user-editname": "Enter a username:",
"editusergroup": "Load user groups",
"editinguser": "Changing user rights of {{GENDER:$1|user}}
<strong>[[User:$1|$1]]</strong> $2",
+ "viewinguserrights": "Viewing user rights of {{GENDER:$1|user}}
<strong>[[User:$1|$1]]</strong> $2",
"userrights-editusergroup": "Edit user groups",
+ "userrights-viewusergroup": "View user groups",
"saveusergroups": "Save {{GENDER:$1|user}} groups",
"userrights-groupsmember": "Member of:",
"userrights-groupsmember-auto": "Implicit member of:",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 936fd8b..fea648d 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1323,8 +1323,10 @@
"userrights-lookup-user": "Label text when managing user rights
([[Special:UserRights]])",
"userrights-user-editname": "Displayed on [[Special:UserRights]].",
"editusergroup": "Button name, in page [[Special:Userrights]], in the
section named {{MediaWiki:userrights-lookup-user}}. The username or gender of
the user is not known when this message is displayed.",
- "editinguser": "Appears on [[Special:UserRights]]. Parameters:\n* $1 -
a plaintext username\n* $2 - user tool links. e.g. \"(Talk | contribs | block |
send email)\"",
- "userrights-editusergroup": "Parameter:\n* $1 - (Optional) a username,
can be used for GENDER",
+ "editinguser": "Appears on [[Special:UserRights]]. Parameters:\n* $1 -
a plaintext username\n* $2 - user tool links. e.g. \"(Talk | contribs | block |
send email)\"\n\nRelated messages:\n* {{msg-mw|viewinguserrights}}",
+ "viewinguserrights": "Appears on [[Special:UserRights]]. Parameters:\n*
$1 - a plaintext username\n* $2 - user tool links. e.g. \"(Talk | contribs |
block | send email)\"\n\nRelated messages:\n* {{msg-mw|editinguser}}",
+ "userrights-editusergroup": "Parameter:\n* $1 - (Optional) a username,
can be used for GENDER\n\nRelated messages:\n*
{{msg-mw|userrights-viewusergroup}}",
+ "userrights-viewusergroup": "Parameter:\n* $1 - (Optional) a username,
can be used for GENDER\n\nRelated messages:\n*
{{msg-mw|userrights-editusergroup}}",
"saveusergroups": "Button text when editing user
groups.\nParameters:\n* $1 - username, for GENDER support",
"userrights-groupsmember": "Used when editing user groups in
[[Special:Userrights]].\n\nThe message is followed by a list of group
names.\n\nParameters:\n* $1 - (Optional) the number of items in the list
following the message, for PLURAL\n* $2 - (Optional) the user name, for GENDER",
"userrights-groupsmember-auto": "Used when editing user groups in
[[Special:Userrights]]. The message is followed by a list of group
names.\n\n\"Implicit\" is for groups that the user was automatically added to
(such as \"autoconfirmed\"); cf.
{{msg-mw|userrights-groupsmember}}\n\nParameters:\n* $1 - (Optional) the number
of items in the list following the message, for PLURAL\n* $2 - (Optional) the
user name, for GENDER",
--
To view, visit https://gerrit.wikimedia.org/r/325338
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I105be73acc5a2bc088b557ccafbdf9db726480da
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Huji <huji.h...@gmail.com>
Gerrit-Reviewer: Alex Monk <a...@wikimedia.org>
Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
