jenkins-bot has submitted this change and it was merged.
Change subject: Remove (X) next to Alerts/Messages if there is one section
......................................................................
Remove (X) next to Alerts/Messages if there is one section
Change-Id: Ibf66328e31bfefb3d588196c3f4babfa65bb52f3
Eg: Alerts(X) becomes Alerts
---
M Resources.php
M i18n/en.json
M i18n/qqq.json
M modules/overlay/ext.echo.overlay.js
4 files changed, 9 insertions(+), 1 deletion(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Resources.php b/Resources.php
index 1089626..3061e38 100644
--- a/Resources.php
+++ b/Resources.php
@@ -77,6 +77,8 @@
'echo-feedback',
'echo-notification-alert',
'echo-notification-message',
+ 'echo-notification-alert-text-only',
+ 'echo-notification-message-text-only',
'echo-email-batch-bullet'
),
),
diff --git a/i18n/en.json b/i18n/en.json
index c894582..cebee3e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -96,6 +96,8 @@
"echo-email-footer-default-html": "To control which emails we send you, <a
href=\"$2\" style=\"text-decoration:none; color: #3868B0;\">check your
preferences</a>.<br />\n$1",
"echo-notification-alert": "{{PLURAL:$1|Alerts ($1)|Alerts ($1)|100=Alerts
(99+)}}",
"echo-notification-message": "{{PLURAL:$1|Messages ($1)|Messages
($1)|100=Messages (99+)}}",
+ "echo-notification-alert-text-only": "Alerts",
+ "echo-notification-message-text-only": "Messages",
"echo-overlay-link": "All notifications",
"echo-overlay-title": "<b>Notifications</b>",
"echo-overlay-title-overflow": "<b>{{PLURAL:$1|Notifications}}</b>
(showing $1 of $2 unread)",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index be42641..fba4350 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -115,6 +115,8 @@
"echo-email-footer-default-html": "Default footer content for Echo html
e-mail notifications. Parameters:\n* $1 - the address of the organization that
sent the email\n* $2 - the URL to the notification preference page\nFor
plain-text version, see {{msg-mw|Echo-email-footer-default}}.",
"echo-notification-alert": "Label for alert notifications tab in Echo
overlay. Parameters:\n* $1 - the number of unread alerts.\nSee also:\n*
{{msg-mw|Echo-notification-message}}\n{{Identical|Alert}}",
"echo-notification-message": "Label for message notifications tab in
Echo overlay. Parameters:\n* $1 - the number of unread messages.\nSee also:\n*
{{msg-mw|Echo-notification-alert}}\n{{Identical|Message}}",
+ "echo-notification-alert-text-only": "Label for alert notifications tab
in Echo overlay without alert notification count next to it",
+ "echo-notification-message-text-only": "Label for message notifications
tab in Echo overlay without message notification count next to it",
"echo-overlay-link": "Link to \"all notifications\" at the bottom of
the overlay.\n{{Identical|All notifications}}",
"echo-overlay-title": "Title at the top of the notifications overlay.
Should include bold tags.\n{{Identical|Notification}}",
"echo-overlay-title-overflow": "Title at the top of the notifications
overlay when there are additional unread notifications that are not being
shown.\n\nParameters:\n* $1 - the number of unread notifications being shown\n*
$2 - the total number of unread notifications that exist",
diff --git a/modules/overlay/ext.echo.overlay.js
b/modules/overlay/ext.echo.overlay.js
index 302cfcb..c9c1e2a 100644
--- a/modules/overlay/ext.echo.overlay.js
+++ b/modules/overlay/ext.echo.overlay.js
@@ -278,10 +278,12 @@
$.each( this.tabs, function( i, echoTab ) {
var
- tabName = echoTab.name,
+ tabName = self.tabs.length > 1 ?
echoTab.name : ( echoTab.name + '-text-only' ),
// Messages that can be used here:
// * echo-notification-alert
// * echo-notification-message
+ // * echo-notification-alert-text-only
+ // * echo-notification-message-text-only
// @todo: Unread value is inaccurate.
If a user has more than mw.echo.overlay.notificationLimit
// API change needed
label = mw.msg( 'echo-notification-' +
tabName, echoTab.getNumberUnread() );
--
To view, visit https://gerrit.wikimedia.org/r/159228
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf66328e31bfefb3d588196c3f4babfa65bb52f3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Bsitu <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
