Merge "Revert "Add GENDER support to tooltip messages""

This commit is contained in:
jenkins-bot 2016-04-02 15:07:59 +00:00 committed by Gerrit Code Review
commit f082457d27
3 changed files with 13 additions and 13 deletions

View file

@ -353,7 +353,7 @@ class EchoHooks {
$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();
}
}

View file

@ -68,12 +68,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.",

View file

@ -59,12 +59,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 <code>$1</code> 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 <code>$1</code> 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 <code>$1</code> 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-pref-tooltip-edit-user-talk": "This is a short description of the edit-user-talk notification category. Parameters:\n* $1 - username, used for GENDER\n{{Related|Echo-pref-tooltip}}",
"echo-pref-tooltip-article-linked": "This is a short description of the article-linked notification category. Parameters:\n* $1 - username, used for GENDER\n{{Related|Echo-pref-tooltip}}",
"echo-pref-tooltip-reverted": "This is a short description of the tooltip-reverted notification category. Parameters:\n* $1 - username, used for GENDER\n{{Related|Echo-pref-tooltip}}",
"echo-pref-tooltip-mention": "This is a short description of the mention notification category. Parameters:\n* $1 - username, used for GENDER\n{{Related|Echo-pref-tooltip}}",
"echo-pref-tooltip-user-rights": "This is a short description of the user rights changes notification category Parameters:\n* $1 - username, used for GENDER\n{{Related|Echo-pref-tooltip}}",
"echo-pref-tooltip-emailuser": "This is a short description of the user email notification category Parameters:\n* $1 - username, used for GENDER\n{{Related|Echo-pref-tooltip}}",
"echo-pref-tooltip-edit-user-talk": "This is a short description of the edit-user-talk notification category.\n{{Related|Echo-pref-tooltip}}",
"echo-pref-tooltip-article-linked": "This is a short description of the article-linked notification category.\n{{Related|Echo-pref-tooltip}}",
"echo-pref-tooltip-reverted": "This is a short description of the tooltip-reverted notification category.\n{{Related|Echo-pref-tooltip}}",
"echo-pref-tooltip-mention": "This is a short description of the mention notification category.\n{{Related|Echo-pref-tooltip}}",
"echo-pref-tooltip-user-rights": "This is a short description of the user rights changes notification category\n{{Related|Echo-pref-tooltip}}",
"echo-pref-tooltip-emailuser": "This is a short description of the user email notification category\n{{Related|Echo-pref-tooltip}}",
"echo-no-agent": "Shown in place of a username in a notification\n\tif the notification has no specified user.",
"echo-no-title": "Shown in place of a page title in a notification if the notification has no specified page title.",
"echo-error-no-formatter": "Error message displayed when no formatting has been defined for a notification. In other words, the extension doesn't know how to properly display the notification.",