diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-06-01 11:56:27 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-06-01 11:56:27 -0400 |
| commit | 786e4dce7d520f79b8cf76939d84678d72941420 (patch) | |
| tree | 5bb520880d200cba90c5ada250c63144e18c3333 /webapp/root.jsx | |
| parent | b00a60ab71b2bd4640c8608d71805ba9caae97d9 (diff) | |
| download | chat-786e4dce7d520f79b8cf76939d84678d72941420.tar.gz chat-786e4dce7d520f79b8cf76939d84678d72941420.tar.bz2 chat-786e4dce7d520f79b8cf76939d84678d72941420.zip | |
Revert "PLT-1800 Load server side locale from the config.json" (#3201)
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 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(); }); } @@ -364,10 +363,6 @@ function renderRootComponent() { component={ConfigurationSettings} /> <Route - path='localization' - component={LocalizationSettings} - /> - <Route path='users_and_teams' component={UsersAndTeamsSettings} /> |