diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-05-24 10:39:56 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-05-24 10:39:56 -0400 |
commit | 4ae7128ecb66cdddeb9d40a24970c6552814c18b (patch) | |
tree | b979b83b3c25be0c817b3b4f4dc4d17735801048 /webapp/root.jsx | |
parent | 3b5a5110c72d7eb2c94d9f428145383b15bd0e4e (diff) | |
download | chat-4ae7128ecb66cdddeb9d40a24970c6552814c18b.tar.gz chat-4ae7128ecb66cdddeb9d40a24970c6552814c18b.tar.bz2 chat-4ae7128ecb66cdddeb9d40a24970c6552814c18b.zip |
Revert "PLT-1800 Load server side locale from the config.json (#3076)"
This reverts commit 34beaa569bfb32f1607375f1d5a22859322060d2.
Diffstat (limited to 'webapp/root.jsx')
-rw-r--r-- | webapp/root.jsx | 7 |
1 files changed, 1 insertions, 6 deletions
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(); }); } @@ -364,10 +363,6 @@ function renderRootComponent() { component={ConfigurationSettings} /> <Route - path='localization' - component={LocalizationSettings} - /> - <Route path='users_and_teams' component={UsersAndTeamsSettings} /> |