imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Weblate 2018-12-13 23:36:23 +00:00
commit 6dd854996e
2 changed files with 4 additions and 1 deletions
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; let notifCount = 0;
MatrixClientPeg.get().getRooms().forEach(r => notifCount += (r.getUnreadNotificationCount('highlight') || 0)); MatrixClientPeg.get().getRooms().forEach(r => notifCount += (r.getUnreadNotificationCount('highlight') || 0));
if (notifCount > 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 = [ headerButtons = [

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

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