mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-11 23:14:29 +02:00
Code Issues Releases Wiki Activity

Merge branch 'key-adjustment' of https://github.com/dcsjapan/flarum-core into dcsjapan-key-adjustment

Browse Source 
# Conflicts:
#	js/forum/src/components/LogInModal.js
This commit is contained in:
Toby Zerner
2015-10-21 10:02:07 +10:30
parent 9aeaccf9a4 659cfb72ad
commit b23e821013
54 changed files with 216 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
js/forum/src/components/NotificationList.js
View File

@@ -57,12 +57,12 @@ export default class NotificationList extends Component {
{Button.component({
className: 'Button Button--icon Button--link',
icon: 'check',
title: app.trans('core.forum.notifications_mark_all_as_read_tooltip'),
title: app.translator.trans('core.forum.notifications.mark_all_as_read_tooltip'),
onclick: this.markAllAsRead.bind(this)
})}
</div>
<h4 className="App-titleControl App-titleControl--text">{app.trans('core.forum.notifications_title')}</h4>
<h4 className="App-titleControl App-titleControl--text">{app.translator.trans('core.forum.notifications.title')}</h4>
</div>
<div className="NotificationList-content">
@@ -96,7 +96,7 @@ export default class NotificationList extends Component {
);
})
: !this.loading
? <div className="NotificationList-empty">{app.trans('core.forum.notifications_empty_text')}</div>
? <div className="NotificationList-empty">{app.translator.trans('core.forum.notifications.empty_text')}</div>
: LoadingIndicator.component({className: 'LoadingIndicator--block'})}
</div>
</div>