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