IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Broken notifications in non-english locales

Browse Source
This commit is contained in:
Robin Ward 2017-09-14 14:26:31 -04:00
parent 797936d2c5
commit 38064c5776
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/widgets/notification-item.js.es6
View File

@ -102,7 +102,11 @@ createWidget('notification-item', {
let title = I18n.t(`notifications.alt.${notName}`); let title = I18n.t(`notifications.alt.${notName}`);
let icon = iconNode(`notification.${notName}`, { title }); let icon = iconNode(`notification.${notName}`, { title });
let text = emojiUnescape(this.text(notificationType, notName)); let text = emojiUnescape(this.text(notificationType, notName));
let html = new RawHtml({ html: `<p>${text}</p>` });
// We can use a `<p>` tag here once other languages have fixed their HTML
// translations.
let html = new RawHtml({ html: `<div>${text}</div>` });
let contents = [ icon, html ]; let contents = [ icon, html ];
const href = this.url(); const href = this.url();

7
app/assets/stylesheets/common/base/menu-panel.scss
View File

@ -214,6 +214,13 @@
margin-right: 5px; margin-right: 5px;
padding-top: 2px; padding-top: 2px;
} }
// This is until other languages remove the HTML from within
// notifications. It can then be removed
div i.fa {
display: none;
}
span { color: $primary; } span { color: $primary; }
&:hover { background-color: $highlight-medium; } &:hover { background-color: $highlight-medium; }
a { padding: 0; } a { padding: 0; }