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/user_settings | |
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/user_settings')
-rw-r--r-- | webapp/components/user_settings/user_settings_display.jsx | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/webapp/components/user_settings/user_settings_display.jsx b/webapp/components/user_settings/user_settings_display.jsx index a7015d403..7036d7389 100644 --- a/webapp/components/user_settings/user_settings_display.jsx +++ b/webapp/components/user_settings/user_settings_display.jsx @@ -641,7 +641,11 @@ export default class UserSettingsDisplay extends React.Component { ); } + const userLocale = this.props.user.locale; if (this.props.activeSection === 'languages') { + if (!I18n.isLanguageAvailable(userLocale)) { + this.props.user.locale = global.window.mm_config.DefaultClientLocale; + } languagesSection = ( <ManageLanguages user={this.props.user} @@ -652,7 +656,12 @@ export default class UserSettingsDisplay extends React.Component { /> ); } else { - var locale = I18n.getLanguageInfo(this.props.user.locale).name; + let locale; + if (I18n.isLanguageAvailable(userLocale)) { + locale = I18n.getLanguageInfo(userLocale).name; + } else { + locale = I18n.getLanguageInfo(global.window.mm_config.DefaultClientLocale).name; + } languagesSection = ( <SettingItemMin |