From 34beaa569bfb32f1607375f1d5a22859322060d2 Mon Sep 17 00:00:00 2001
From: enahum <nahumhbl@gmail.com>
Date: Tue, 24 May 2016 09:36:27 -0300
Subject: PLT-1800 Load server side locale from the config.json (#3076)

* PLT-1800 Load server side locale from the config.json

* Add support for locales with country specifics
---
 webapp/root.jsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'webapp/root.jsx')

diff --git a/webapp/root.jsx b/webapp/root.jsx
index aef2607ef..d2f7f1099 100644
--- a/webapp/root.jsx
+++ b/webapp/root.jsx
@@ -53,6 +53,7 @@ const ActionTypes = Constants.ActionTypes;
 import AdminConsole from 'components/admin_console/admin_console.jsx';
 import SystemAnalytics from 'components/analytics/system_analytics.jsx';
 import ConfigurationSettings from 'components/admin_console/configuration_settings.jsx';
+import LocalizationSettings from 'components/admin_console/localization_settings.jsx';
 import UsersAndTeamsSettings from 'components/admin_console/users_and_teams_settings.jsx';
 import PrivacySettings from 'components/admin_console/privacy_settings.jsx';
 import LogSettings from 'components/admin_console/log_settings.jsx';
@@ -142,8 +143,8 @@ function preRenderSetup(callwhendone) {
     );
 
     function afterIntl() {
-        I18n.doAddLocaleData();
         $.when(d1).done(() => {
+            I18n.doAddLocaleData();
             callwhendone();
         });
     }
@@ -362,6 +363,10 @@ function renderRootComponent() {
                                 path='configuration'
                                 component={ConfigurationSettings}
                             />
+                            <Route
+                                path='localization'
+                                component={LocalizationSettings}
+                            />
                             <Route
                                 path='users_and_teams'
                                 component={UsersAndTeamsSettings}
-- 
cgit v1.2.3-1-g7c22