[MediaWiki-commits] [Gerrit] Revert "Add GENDER support to tooltip messages" - change (mediawiki...Echo)
jenkins-bot has submitted this change and it was merged. Change subject: Revert "Add GENDER support to tooltip messages" .. Revert "Add GENDER support to tooltip messages" There was no need to merge this, and I suggest it is reverted. Parameterless use of GENDER is supported already. "{{GENDER:|male|female|other}}" will switch for the current user. This reverts commit c8b80f2003e08401921a16fcce88fc3dd8e78f53. Change-Id: I15a0bd79abea9d9f0e9b0547c87e848ebf88b5de --- M Hooks.php M i18n/en.json M i18n/qqq.json 3 files changed, 13 insertions(+), 13 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/Hooks.php b/Hooks.php index 3d6a55f..afdaacf 100644 --- a/Hooks.php +++ b/Hooks.php @@ -350,7 +350,7 @@ $categoryMessage = wfMessage( 'echo-category-title-' . $category )->numParams( 1 )->escaped(); $rows[$categoryMessage] = $category; if ( isset( $wgEchoNotificationCategories[$category]['tooltip'] ) ) { - $tooltips[$categoryMessage] = wfMessage( $wgEchoNotificationCategories[$category]['tooltip'], $user->getName() )->text(); + $tooltips[$categoryMessage] = wfMessage( $wgEchoNotificationCategories[$category]['tooltip'] )->text(); } } diff --git a/i18n/en.json b/i18n/en.json index 2815a3f..f9c1c2b 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -34,12 +34,12 @@ "echo-category-title-system": "{{PLURAL:$1|System}}", "echo-category-title-user-rights": "{{PLURAL:$1|User rights change|User rights changes}}", "echo-category-title-emailuser": "{{PLURAL:$1|Email from other user|Emails from other users}}", - "echo-pref-tooltip-edit-user-talk": "Notify {{GENDER:$1|me}} when someone posts a message or replies on my talk page.", - "echo-pref-tooltip-article-linked": "Notify {{GENDER:$1|me}} when someone links to a page I created from an article page.", - "echo-pref-tooltip-reverted": "Notify {{GENDER:$1|me}} when someone reverts an edit I made, by using the undo or rollback tool.", - "echo-pref-tooltip-mention": "Notify {{GENDER:$1|me}} when someone links to my {{GENDER:$1|user}} page.", - "echo-pref-tooltip-user-rights": "Notify {{GENDER:$1|me}} when someone changes my {{GENDER:$1|user}} rights.", - "echo-pref-tooltip-emailuser": "Notify {{GENDER:$1|me}} when someone sends {{GENDER:$1|me}} an email.", + "echo-pref-tooltip-edit-user-talk": "Notify me when someone posts a message or replies on my talk page.", + "echo-pref-tooltip-article-linked": "Notify me when someone links to a page I created from an article page.", + "echo-pref-tooltip-reverted": "Notify me when someone reverts an edit I made, by using the undo or rollback tool.", + "echo-pref-tooltip-mention": "Notify me when someone links to my user page.", + "echo-pref-tooltip-user-rights": "Notify me when someone changes my user rights.", + "echo-pref-tooltip-emailuser": "Notify me when someone sends me an email.", "echo-no-agent": "[Nobody]", "echo-no-title": "[No page]", "echo-error-no-formatter": "No formatting defined for notification.", diff --git a/i18n/qqq.json b/i18n/qqq.json index b638d50..78636a5 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -55,12 +55,12 @@ "echo-category-title-system": "This is a short title for notification category.\n\nUsed in a list of options under the heading {{msg-mw|Prefs-echosubscriptions}} in Special:Preferences. As far as I can see this always needs to be a plural for an unspecified number.\n\nIt used to be used as $1 in {{msg-mw|Echo-dismiss-message}}, but this message is no longer used, apparently.\n\nParameters:\n* $1 - number of messages, for PLURAL support\n{{Related|Echo-category-title}}\n{{Identical|System}}", "echo-category-title-user-rights": "This is a short title for notification category.\n\nUsed in a list of options under the heading {{msg-mw|Prefs-echosubscriptions}} in Special:Preferences. As far as I can see this always needs to be a plural for an unspecified number.\n\nIt used to be used as $1 in {{msg-mw|Echo-dismiss-message}}, but this message is no longer used, apparently.\n\nParameters:\n* $1 - number of messages, for PLURAL support\n{{Related|Echo-category-title}}", "echo-category-title-emailuser": "This is a short title for notification category.\n\nUsed in a list of options under the heading {{msg-mw|Prefs-echosubscriptions}} in Special:Preferences. As far as I can see this always needs to be a plural for an unspecified number.\n\nIt used to be used as $1 in {{msg-mw|Echo-dismiss-message}}, but this message is no longer used, apparently.\n\nParameters:\n* $1 - number of messages, for PLURAL
[MediaWiki-commits] [Gerrit] Revert "Add GENDER support to tooltip messages" - change (mediawiki...Echo)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/281167 Change subject: Revert "Add GENDER support to tooltip messages" .. Revert "Add GENDER support to tooltip messages" There was no need to merge this, and I suggest it is reverted. Parameterless use of GENDER is supported already. "{{GENDER:|male|female|other}}" will switch for the current user. This reverts commit c8b80f2003e08401921a16fcce88fc3dd8e78f53. Change-Id: I15a0bd79abea9d9f0e9b0547c87e848ebf88b5de --- M Hooks.php M i18n/en.json M i18n/qqq.json 3 files changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo refs/changes/67/281167/1 diff --git a/Hooks.php b/Hooks.php index 3d6a55f..afdaacf 100644 --- a/Hooks.php +++ b/Hooks.php @@ -350,7 +350,7 @@ $categoryMessage = wfMessage( 'echo-category-title-' . $category )->numParams( 1 )->escaped(); $rows[$categoryMessage] = $category; if ( isset( $wgEchoNotificationCategories[$category]['tooltip'] ) ) { - $tooltips[$categoryMessage] = wfMessage( $wgEchoNotificationCategories[$category]['tooltip'], $user->getName() )->text(); + $tooltips[$categoryMessage] = wfMessage( $wgEchoNotificationCategories[$category]['tooltip'] )->text(); } } diff --git a/i18n/en.json b/i18n/en.json index 2815a3f..f9c1c2b 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -34,12 +34,12 @@ "echo-category-title-system": "{{PLURAL:$1|System}}", "echo-category-title-user-rights": "{{PLURAL:$1|User rights change|User rights changes}}", "echo-category-title-emailuser": "{{PLURAL:$1|Email from other user|Emails from other users}}", - "echo-pref-tooltip-edit-user-talk": "Notify {{GENDER:$1|me}} when someone posts a message or replies on my talk page.", - "echo-pref-tooltip-article-linked": "Notify {{GENDER:$1|me}} when someone links to a page I created from an article page.", - "echo-pref-tooltip-reverted": "Notify {{GENDER:$1|me}} when someone reverts an edit I made, by using the undo or rollback tool.", - "echo-pref-tooltip-mention": "Notify {{GENDER:$1|me}} when someone links to my {{GENDER:$1|user}} page.", - "echo-pref-tooltip-user-rights": "Notify {{GENDER:$1|me}} when someone changes my {{GENDER:$1|user}} rights.", - "echo-pref-tooltip-emailuser": "Notify {{GENDER:$1|me}} when someone sends {{GENDER:$1|me}} an email.", + "echo-pref-tooltip-edit-user-talk": "Notify me when someone posts a message or replies on my talk page.", + "echo-pref-tooltip-article-linked": "Notify me when someone links to a page I created from an article page.", + "echo-pref-tooltip-reverted": "Notify me when someone reverts an edit I made, by using the undo or rollback tool.", + "echo-pref-tooltip-mention": "Notify me when someone links to my user page.", + "echo-pref-tooltip-user-rights": "Notify me when someone changes my user rights.", + "echo-pref-tooltip-emailuser": "Notify me when someone sends me an email.", "echo-no-agent": "[Nobody]", "echo-no-title": "[No page]", "echo-error-no-formatter": "No formatting defined for notification.", diff --git a/i18n/qqq.json b/i18n/qqq.json index b638d50..78636a5 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -55,12 +55,12 @@ "echo-category-title-system": "This is a short title for notification category.\n\nUsed in a list of options under the heading {{msg-mw|Prefs-echosubscriptions}} in Special:Preferences. As far as I can see this always needs to be a plural for an unspecified number.\n\nIt used to be used as $1 in {{msg-mw|Echo-dismiss-message}}, but this message is no longer used, apparently.\n\nParameters:\n* $1 - number of messages, for PLURAL support\n{{Related|Echo-category-title}}\n{{Identical|System}}", "echo-category-title-user-rights": "This is a short title for notification category.\n\nUsed in a list of options under the heading {{msg-mw|Prefs-echosubscriptions}} in Special:Preferences. As far as I can see this always needs to be a plural for an unspecified number.\n\nIt used to be used as $1 in {{msg-mw|Echo-dismiss-message}}, but this message is no longer used, apparently.\n\nParameters:\n* $1 - number of messages, for PLURAL support\n{{Related|Echo-category-title}}", "echo-category-title-emailuser": "This is a short title for notification category.\n\nUsed in a list of options under the heading {{msg-mw|Prefs-echosubscriptions}} in Special:Preferences. As far as I can see this always needs to be a plural for an unspecified number.\n\nIt used to be used as $1 in {{msg-mw|Echo-dismiss-message}}, but this message is no longer used, apparently.\n\nParameters:\n* $1 - number of messages,