OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

pull/21833/head
Weblate 2018-12-13 23:36:23 +00:00
parent 31819ade2c bae9996c64
commit 6dd854996e
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/structures/RightPanel.js
View File

@ -326,7 +326,8 @@ module.exports = React.createClass({
let notifCount = 0;
MatrixClientPeg.get().getRooms().forEach(r => notifCount += (r.getUnreadNotificationCount('highlight') || 0));
if (notifCount > 0) {
notifCountBadge = <div title={_t("%counts Notifications")}>{ formatCount(notifCount) }</div>;
const title = _t("%(count)s Notifications", {count: formatCount(notifCount)});
notifCountBadge = <div title={title}>{ formatCount(notifCount) }</div>;
}
headerButtons = [

2
src/i18n/strings/en_EN.json
View File

@ -1144,6 +1144,8 @@
"%(count)s Members|other": "%(count)s Members",
"%(count)s Members|one": "%(count)s Member",
"Invite to this room": "Invite to this room",
"%(count)s Notifications|other": "%(count)s Notifications",
"%(count)s Notifications|one": "%(count)s Notification",
"Files": "Files",
"Notifications": "Notifications",
"Hide panel": "Hide panel",