From f9bd3d8808e4e83426913e5fbf18174b9121f3e4 Mon Sep 17 00:00:00 2001
From: nicolas <nclm@users.noreply.github.com>
Date: Tue, 22 Nov 2016 10:21:56 +0100
Subject: Adding French locale to mastodon.jsx

---
 app/assets/javascripts/components/containers/mastodon.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app/assets')

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({
 
-- 
cgit