diff options
author | Eugen <eugen@zeonfederated.com> | 2017-04-13 13:26:16 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-13 13:26:16 +0200 |
commit | 1a12fd14d438380e24421e9c8a8894cc705aba51 (patch) | |
tree | b276d81e18839706eaebe1db5870edc0b8628064 /app/assets/javascripts/components/containers/mastodon.jsx | |
parent | a18fd491b9ad9b2e1677d0e0355712a08967fe14 (diff) | |
parent | 282bb55c3cae07229d4c9a2fe58c1c2a136c57b9 (diff) |
Merge branch 'master' into master
Diffstat (limited to 'app/assets/javascripts/components/containers/mastodon.jsx')
-rw-r--r-- | app/assets/javascripts/components/containers/mastodon.jsx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/components/containers/mastodon.jsx b/app/assets/javascripts/components/containers/mastodon.jsx index d8810dc64..b9086de42 100644 --- a/app/assets/javascripts/components/containers/mastodon.jsx +++ b/app/assets/javascripts/components/containers/mastodon.jsx @@ -52,8 +52,8 @@ import no from 'react-intl/locale-data/no'; import ru from 'react-intl/locale-data/ru'; import uk from 'react-intl/locale-data/uk'; import zh from 'react-intl/locale-data/zh'; +import bg from 'react-intl/locale-data/bg'; import { localeData as zh_hk } from '../locales/zh-hk'; - import getMessagesForLocale from '../locales'; import { hydrateStore } from '../actions/store'; import createStream from '../stream'; @@ -66,7 +66,6 @@ const browserHistory = useRouterHistory(createBrowserHistory)({ basename: '/web' }); - addLocaleData([ ...en, ...de, @@ -82,9 +81,9 @@ addLocaleData([ ...uk, ...zh, ...zh_hk, + ...bg, ]); - const Mastodon = React.createClass({ propTypes: { |