From 4ae7128ecb66cdddeb9d40a24970c6552814c18b Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Tue, 24 May 2016 10:39:56 -0400
Subject: Revert "PLT-1800 Load server side locale from the config.json
 (#3076)"

This reverts commit 34beaa569bfb32f1607375f1d5a22859322060d2.
---
 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 d2f7f1099..aef2607ef 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