From fb48cc3b7400f73c01d59a038eaf7fc3020c39f4 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 21 Nov 2016 10:24:50 +0100 Subject: Desktop notifications --- app/assets/javascripts/components/containers/mastodon.jsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'app/assets/javascripts/components/containers') diff --git a/app/assets/javascripts/components/containers/mastodon.jsx b/app/assets/javascripts/components/containers/mastodon.jsx index cf77c169d..a8a9e365e 100644 --- a/app/assets/javascripts/components/containers/mastodon.jsx +++ b/app/assets/javascripts/components/containers/mastodon.jsx @@ -60,8 +60,10 @@ const Mastodon = React.createClass({ mixins: [PureRenderMixin], componentWillMount() { - store.dispatch(setAccessToken(this.props.token)); - store.dispatch(setAccountSelf(JSON.parse(this.props.account))); + const { token, account, locale } = this.props; + + store.dispatch(setAccessToken(token)); + store.dispatch(setAccountSelf(JSON.parse(account))); if (typeof App !== 'undefined') { this.subscription = App.cable.subscriptions.create('TimelineChannel', { @@ -78,7 +80,7 @@ const Mastodon = React.createClass({ case 'block': return store.dispatch(refreshTimeline('mentions', true)); case 'notification': - return store.dispatch(updateNotifications(JSON.parse(data.message))); + return store.dispatch(updateNotifications(JSON.parse(data.message), getMessagesForLocale(locale), locale)); } } -- cgit