diff options
author | enahum <nahumhbl@gmail.com> | 2016-06-02 16:47:26 -0300 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-06-02 12:47:26 -0700 |
commit | 159953050a9c4fb700bbde79042ead4843b0bea5 (patch) | |
tree | 747a022c5cf579599402447b5e5d0f51dfee9f76 /webapp/root.jsx | |
parent | e44b8ec6d57fc55230a5c97ea105b7fd9ef59aca (diff) | |
download | chat-159953050a9c4fb700bbde79042ead4843b0bea5.tar.gz chat-159953050a9c4fb700bbde79042ead4843b0bea5.tar.bz2 chat-159953050a9c4fb700bbde79042ead4843b0bea5.zip |
PLT-1800 Load server side locale from the config.json (#3202)
* PLT-1800 Load server side locale from the config.json
* Add support for locales with country specifics
* Fix localization on served locale file as plain/text
* Remove github.com/cloudfoundry/jibber_jabber as vendor dependency
* Fix get locale on login_controller
Diffstat (limited to 'webapp/root.jsx')
-rw-r--r-- | webapp/root.jsx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/webapp/root.jsx b/webapp/root.jsx index d326f32fc..268a208a2 100644 --- a/webapp/root.jsx +++ b/webapp/root.jsx @@ -53,6 +53,7 @@ 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'; @@ -142,8 +143,8 @@ function preRenderSetup(callwhendone) { ); function afterIntl() { - I18n.doAddLocaleData(); $.when(d1).done(() => { + I18n.doAddLocaleData(); callwhendone(); }); } @@ -363,6 +364,10 @@ function renderRootComponent() { component={ConfigurationSettings} /> <Route + path='localization' + component={LocalizationSettings} + /> + <Route path='users_and_teams' component={UsersAndTeamsSettings} /> |