From e82abc8d970522022cea769309f9573e372e095c Mon Sep 17 00:00:00 2001 From: matejsuchanek Date: Sun, 10 Apr 2016 20:41:57 +0200 Subject: [PATCH] Fix GENDER support in logentry-rights-rights Introduced in 70f0b0e588e40a18ce53c56a59efcc740f2766d2. Got to core by my +1, sorry Bug: T52583 Change-Id: I328fadacf7e5e3b7b250b76556ed585eeba424ca --- includes/logging/RightsLogFormatter.php | 4 +++- languages/i18n/en.json | 2 +- languages/i18n/qqq.json | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/includes/logging/RightsLogFormatter.php b/includes/logging/RightsLogFormatter.php index 1fd4b7f364..be73c86495 100644 --- a/includes/logging/RightsLogFormatter.php +++ b/includes/logging/RightsLogFormatter.php @@ -97,13 +97,15 @@ class RightsLogFormatter extends LogFormatter { $params[3] = $this->msg( 'rightsnone' )->text(); } if ( count( $newGroups ) ) { - // Array_values is used here because of bug 42211 + // Array_values is used here because of T44211 // see use of array_unique in UserrightsPage::doSaveUserGroups on $newGroups. $params[4] = $lang->listToText( array_values( $newGroups ) ); } else { $params[4] = $this->msg( 'rightsnone' )->text(); } + $params[5] = $userName; + return $params; } diff --git a/languages/i18n/en.json b/languages/i18n/en.json index f2cdbe2dad..fb103581ae 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -3787,7 +3787,7 @@ "logentry-protect-protect-cascade": "$1 {{GENDER:$2|protected}} $3 $4 [cascading]", "logentry-protect-modify": "$1 {{GENDER:$2|changed}} protection level for $3 $4", "logentry-protect-modify-cascade": "$1 {{GENDER:$2|changed}} protection level for $3 $4 [cascading]", - "logentry-rights-rights": "$1 {{GENDER:$2|changed}} group membership for {{GENDER:$3|$3}} from $4 to $5", + "logentry-rights-rights": "$1 {{GENDER:$2|changed}} group membership for {{GENDER:$6|$3}} from $4 to $5", "logentry-rights-rights-legacy": "$1 {{GENDER:$2|changed}} group membership for $3", "logentry-rights-autopromote": "$1 was automatically {{GENDER:$2|promoted}} from $4 to $5", "logentry-upload-upload": "$1 {{GENDER:$2|uploaded}} $3", diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json index ee3bd1ecb3..47d52ad4d6 100644 --- a/languages/i18n/qqq.json +++ b/languages/i18n/qqq.json @@ -3964,7 +3964,7 @@ "logentry-protect-protect-cascade": "{{Logentry|[[Special:Log/protect]]}}\n\n* $4 - protect expiry (formatted with {{msg-mw|protect-summary-desc}}, multiple possible)\nFor word \"cascading\" see {{msg-mw|protect-summary-cascade}}", "logentry-protect-modify": "{{Logentry|[[Special:Log/protect]]}}\n\n* $4 - protect expiry (formatted with {{msg-mw|protect-summary-desc}}, multiple possible)", "logentry-protect-modify-cascade": "{{Logentry|[[Special:Log/protect]]}}\n\n* $4 - protect expiry (formatted with {{msg-mw|protect-summary-desc}}, multiple possible)\nFor word \"cascading\" see {{msg-mw|protect-summary-cascade}}", - "logentry-rights-rights": "* $1 - username\n* $2 - (see below)\n* $3 - username, also used for GENDER support\n* $4 - list of user groups or {{msg-mw|Rightsnone}}\n* $5 - list of user groups or {{msg-mw|Rightsnone}}\n----\n{{Logentry|[[Special:Log/rights]]}}", + "logentry-rights-rights": "* $1 - (see below)\n* $2 - (see below)\n* $3 - target user, like $1\n* $4 - list of user groups or {{msg-mw|Rightsnone}}\n* $5 - list of user groups or {{msg-mw|Rightsnone}}\n* $6 - target user, can be used with GENDER\n----\n{{Logentry|[[Special:Log/rights]]}}", "logentry-rights-rights-legacy": "* $1 - username\n* $2 - (see below)\n* $3 - username\n----\n{{Logentry|[[Special:Log/rights]]}}", "logentry-rights-autopromote": "* $1 - username\n* $2 - (see below)\n* $3 - (see below)\n* $4 - comma separated list of old user groups or {{msg-mw|Rightsnone}}\n* $5 - comma separated list of new user groups\n----\n{{Logentry|[[Special:Log/rights]]}}", "logentry-upload-upload": "{{Logentry|[[Special:Log/upload]]}}", -- 2.20.1