about summary refs log tree commit diff
diff options
context:
space:
mode:
authornicolas <nclm@users.noreply.github.com>2016-11-22 10:21:56 +0100
committerGitHub <noreply@github.com>2016-11-22 10:21:56 +0100
commitf9bd3d8808e4e83426913e5fbf18174b9121f3e4 (patch)
treef07d4614b27ea5ec7cbc611e3c6b93c2119efbe9
parent115ce905783a2d9c301868f5bc0bfb52991790a0 (diff)
Adding French locale to mastodon.jsx
-rw-r--r--app/assets/javascripts/components/containers/mastodon.jsx3
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 3528ef81c..87c7c65f3 100644
--- a/app/assets/javascripts/components/containers/mastodon.jsx
+++ b/app/assets/javascripts/components/containers/mastodon.jsx
@@ -38,6 +38,7 @@ import { IntlProvider, addLocaleData } from 'react-intl';
 import en from 'react-intl/locale-data/en';
 import de from 'react-intl/locale-data/de';
 import es from 'react-intl/locale-data/es';
+import fr from 'react-intl/locale-data/fr';
 import getMessagesForLocale from '../locales';
 
 const store = configureStore();
@@ -46,7 +47,7 @@ const browserHistory = useRouterHistory(createBrowserHistory)({
   basename: '/web'
 });
 
-addLocaleData([...en, ...de, ...es]);
+addLocaleData([...en, ...de, ...es, ...fr]);
 
 const Mastodon = React.createClass({