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/components/login | |
| 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/components/login')
| -rw-r--r-- | webapp/components/login/login_controller.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/components/login/login_controller.jsx b/webapp/components/login/login_controller.jsx index 1b1f65436..c1b7f8a74 100644 --- a/webapp/components/login/login_controller.jsx +++ b/webapp/components/login/login_controller.jsx @@ -118,7 +118,7 @@ export default class LoginController extends React.Component { finishSignin() { GlobalActions.emitInitialLoad( () => { - GlobalActions.loadBrowserLocale(); + GlobalActions.loadDefaultLocale(); browserHistory.push('/select_team'); } ); |