diff options
| author | Kurtis Rainbolt-Greene <kurtis@rainbolt-greene.online> | 2017-04-07 20:50:21 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 20:50:21 -0700 |
| commit | 40703b96fa6ccc2b53a266ab67bbb61ce4b64160 (patch) | |
| tree | b61e19dbdb5e51af6321ef40e44541c47304e2f7 /app/assets/javascripts/components/containers/mastodon.jsx | |
| parent | 4b621188adcd3e68272fc58db3cb5dfe51e71b38 (diff) | |
| parent | 541c538f9bbd00028b388468b2753b1136f3d5b3 (diff) | |
Merge branch 'master' into fix-default-locale-regression
Diffstat (limited to 'app/assets/javascripts/components/containers/mastodon.jsx')
| -rw-r--r-- | app/assets/javascripts/components/containers/mastodon.jsx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/components/containers/mastodon.jsx b/app/assets/javascripts/components/containers/mastodon.jsx index cbb7b85bc..00f20074d 100644 --- a/app/assets/javascripts/components/containers/mastodon.jsx +++ b/app/assets/javascripts/components/containers/mastodon.jsx @@ -47,6 +47,7 @@ import pt from 'react-intl/locale-data/pt'; import hu from 'react-intl/locale-data/hu'; import uk from 'react-intl/locale-data/uk'; import fi from 'react-intl/locale-data/fi'; +import eo from 'react-intl/locale-data/eo'; import getMessagesForLocale from '../locales'; import { hydrateStore } from '../actions/store'; import createStream from '../stream'; @@ -59,7 +60,7 @@ const browserHistory = useRouterHistory(createBrowserHistory)({ basename: '/web' }); -addLocaleData([...en, ...de, ...es, ...fr, ...pt, ...hu, ...uk, ...fi]); +addLocaleData([...en, ...de, ...es, ...fr, ...pt, ...hu, ...uk, ...fi, ...eo]); const Mastodon = React.createClass({ |