about summary refs log tree commit diff
path: root/app/assets/javascripts/components/containers
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-11-18 15:36:16 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-11-18 15:53:46 +0100
commit85d1b74ac3bbd563c35a7212069b84f8d3a6bd99 (patch)
tree5226341c1cbe8e7cf983b629577c22812056062a /app/assets/javascripts/components/containers
parentc1be1ac7c6ebaabcd936f41d7a74ec8977625942 (diff)
Adding german localization
Diffstat (limited to 'app/assets/javascripts/components/containers')
-rw-r--r--app/assets/javascripts/components/containers/mastodon.jsx6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/components/containers/mastodon.jsx b/app/assets/javascripts/components/containers/mastodon.jsx
index a12b19746..e61107cd1 100644
--- a/app/assets/javascripts/components/containers/mastodon.jsx
+++ b/app/assets/javascripts/components/containers/mastodon.jsx
@@ -34,6 +34,8 @@ import Favourites from '../features/favourites';
 import HashtagTimeline from '../features/hashtag_timeline';
 import { IntlProvider, addLocaleData } from 'react-intl';
 import en from 'react-intl/locale-data/en';
+import de from 'react-intl/locale-data/de';
+import getMessagesForLocale from '../locales';
 
 const store = configureStore();
 
@@ -41,7 +43,7 @@ const browserHistory = useRouterHistory(createBrowserHistory)({
   basename: '/web'
 });
 
-addLocaleData([...en]);
+addLocaleData([...en, ...de]);
 
 const Mastodon = React.createClass({
 
@@ -89,7 +91,7 @@ const Mastodon = React.createClass({
     const { locale } = this.props;
 
     return (
-      <IntlProvider locale={locale}>
+      <IntlProvider locale={locale} messages={getMessagesForLocale(locale)}>
         <Provider store={store}>
           <Router history={browserHistory} render={applyRouterMiddleware(useScroll())}>
             <Route path='/' component={UI}>