summaryrefslogtreecommitdiffstats
path: root/webapp/root.jsx
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-05-27 09:01:35 -0400
committerChristopher Speller <crspeller@gmail.com>2016-05-27 09:01:35 -0400
commitec7a273550a1aaf31e80abc90c99d06a94664b5d (patch)
treebd0d1080a5ef66b9e7985682919b1c2bd21d4bf1 /webapp/root.jsx
parenta2c183f401bdf8e9abddd35d4561d42034325046 (diff)
downloadchat-ec7a273550a1aaf31e80abc90c99d06a94664b5d.tar.gz
chat-ec7a273550a1aaf31e80abc90c99d06a94664b5d.tar.bz2
chat-ec7a273550a1aaf31e80abc90c99d06a94664b5d.zip
Revert "PLT-1800 Load server side locale from the config.json" (#3133)
Diffstat (limited to 'webapp/root.jsx')
-rw-r--r--webapp/root.jsx7
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}
/>