Remove broken GENDER support for 'editusergroup'

This is a label on a button, displayed next to a text field for
the username. So the username is not known when this is displayed.

This undoes some changes from 24db39408e814cf4163df1bfd303aab1963a02c1
and 99c4684f2cea9230328cbb377253307255a474af.

Change-Id: I69daef350ea2184671b9d158dd1ff2d15cad0eb4

diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php
index 3c28eb5..30b050c 100644 (file)
--- a/includes/specials/SpecialUserrights.php
+++ b/includes/specials/SpecialUserrights.php
@@ -437,10 +437,7 @@ class UserrightsPage extends SpecialPage {
                                )
                        ) . ' ' .
                        Xml::submitButton(
-                               $this->msg(
-                                       'editusergroup',
-                                       $this->mFetchedUser === null ? '[]' : $this->mFetchedUser->getName()
-                               )->text()
+                               $this->msg( 'editusergroup' )->text()
                        ) .
                        Html::closeElement( 'fieldset' ) .
                        Html::closeElement( 'form' ) . "\n"

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 37890a9..592356d 100644 (file)
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1137,7 +1137,7 @@
        "userrights-summary": "",
        "userrights-lookup-user": "Select a user",
        "userrights-user-editname": "Enter a username:",
-       "editusergroup": "Load {{GENDER:$1|user}} groups",
+       "editusergroup": "Load user groups",
        "editinguser": "Changing user rights of {{GENDER:$1|user}} <strong>[[User:$1|$1]]</strong> $2",
        "userrights-editusergroup": "Edit user groups",
        "saveusergroups": "Save {{GENDER:$1|user}} groups",

diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index edf4b85..4bc8739 100644 (file)
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1321,7 +1321,7 @@
        "userrights-summary": "{{doc-specialpagesummary|userrights}}",
        "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}}.\nParameters:\n* $1 - username, for GENDER support",
+       "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",
        "saveusergroups": "Button text when editing user groups.\nParameters:\n* $1 - username, for GENDER support",