brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unlockDialog: Use just the counter to format notifications

Browse Source 
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872
This commit is contained in:
Georges Basile Stavracas Neto 2019-11-29 16:05:12 -03:00 committed by Florian Müllner
parent 3651cb2047
commit 05c918dc1a
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/ui/unlockDialog.js
View File

@ -71,13 +71,6 @@ var NotificationsBox = GObject.registerClass({
this.visible = this._notificationBox.visible; this.visible = this._notificationBox.visible;
} }
_makeNotificationCountText(count, isChat) {
if (isChat)
return ngettext('%d new message', '%d new messages', count).format(count);
else
return ngettext('%d new notification', '%d new notifications', count).format(count);
}
_makeNotificationSource(source, box) { _makeNotificationSource(source, box) {
let sourceActor = new MessageTray.SourceActor(source, SUMMARY_ICON_SIZE); let sourceActor = new MessageTray.SourceActor(source, SUMMARY_ICON_SIZE);
box.add_child(sourceActor); box.add_child(sourceActor);
@ -93,7 +86,7 @@ var NotificationsBox = GObject.registerClass({
let count = source.unseenCount; let count = source.unseenCount;
let countLabel = new St.Label({ let countLabel = new St.Label({
text: this._makeNotificationCountText(count, source.isChat), text: `${count}`,
style_class: 'unlock-dialog-notification-count-text', style_class: 'unlock-dialog-notification-count-text',
}); });
textBox.add(countLabel); textBox.add(countLabel);
@ -239,7 +232,7 @@ var NotificationsBox = GObject.registerClass({
this._showSource(source, obj, obj.sourceBox); this._showSource(source, obj, obj.sourceBox);
} else { } else {
let count = source.unseenCount; let count = source.unseenCount;
obj.countLabel.text = this._makeNotificationCountText(count, source.isChat); obj.countLabel.text = `${count}`;
} }
obj.sourceBox.visible = obj.visible && (source.unseenCount > 0); obj.sourceBox.visible = obj.visible && (source.unseenCount > 0);