From 786e4dce7d520f79b8cf76939d84678d72941420 Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Wed, 1 Jun 2016 11:56:27 -0400
Subject: Revert "PLT-1800 Load server side locale from the config.json"
 (#3201)

---
 webapp/root.jsx | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'webapp/root.jsx')

diff --git a/webapp/root.jsx b/webapp/root.jsx
index 40cf351de..dc2df64ac 100644
--- a/webapp/root.jsx
+++ b/webapp/root.jsx
@@ -53,7 +53,6 @@ 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';
@@ -143,8 +142,8 @@ function preRenderSetup(callwhendone) {
     );
 
     function afterIntl() {
+        I18n.doAddLocaleData();
         $.when(d1).done(() => {
-            I18n.doAddLocaleData();
             callwhendone();
         });
     }
@@ -363,10 +362,6 @@ function renderRootComponent() {
                                 path='configuration'
                                 component={ConfigurationSettings}
                             />
-                            <Route
-                                path='localization'
-                                component={LocalizationSettings}
-                            />
                             <Route
                                 path='users_and_teams'
                                 component={UsersAndTeamsSettings}
-- 
cgit v1.2.3-1-g7c22

