Merge "Add username as parameter for gender support"

This commit is contained in:
Aaron Schulz 2012-05-12 01:41:26 +00:00 committed by Gerrit Code Review
commit 3a8c2e47f7
2 changed files with 6 additions and 4 deletions

View file

@ -423,12 +423,12 @@ class UserrightsPage extends SpecialPage {
$grouplist = '';
$count = count( $list );
if( $count > 0 ) {
$grouplist = $this->msg( 'userrights-groupsmember', $count )->parse();
$grouplist = $this->msg( 'userrights-groupsmember', $count, $user->getName() )->parse();
$grouplist = '<p>' . $grouplist . ' ' . $this->getLanguage()->listToText( $list ) . "</p>\n";
}
$count = count( $autolist );
if( $count > 0 ) {
$autogrouplistintro = $this->msg( 'userrights-groupsmember-auto', $count )->parse();
$autogrouplistintro = $this->msg( 'userrights-groupsmember-auto', $count, $user->getName() )->parse();
$grouplist .= '<p>' . $autogrouplistintro . ' ' . $this->getLanguage()->listToText( $autolist ) . "</p>\n";
}

View file

@ -1534,12 +1534,14 @@ Used in [[Special:Preferences]], tab "Watchlist". The display options refer to:
'userrights-groupsmember' => 'Used when editing user groups in [[Special:Userrights]]. The messsage is followed by a list of group names.
Parameters:
* $1 - optional, for PLURAL use, the number of items in the list following the message. Avoid PLURAL, if your language can do without.',
* $1 - optional, for PLURAL use, the number of items in the list following the message. Avoid PLURAL, if your language can do without.
* $2 - optional, a username that can be used for GENDER.',
'userrights-groupsmember-auto' => 'Used when editing user groups in [[Special:Userrights]]. The messsage is followed by a list of group names.
"Implicit" is for groups that the user was automatically added to (such as "autoconfirmed"); cf. {{msg-mw|userrights-groupsmember}}
Parameters:
* $1 - optional, for PLURAL use, the number of items in the list following the message. Please avoid PLURAL, if your language can do without.',
* $1 - optional, for PLURAL use, the number of items in the list following the message. Please avoid PLURAL, if your language can do without.
* $2 - optional, a username that can be used for GENDER.',
'userrights-groups-help' => 'Instructions displayed on [[Special:UserRights]]. Parameters:
* $1 is a username - optional, can be used for GENDER',
'userrights-reason' => 'Text beside log field when editing user groups