diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-05-24 10:39:56 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-05-24 10:39:56 -0400 |
commit | 4ae7128ecb66cdddeb9d40a24970c6552814c18b (patch) | |
tree | b979b83b3c25be0c817b3b4f4dc4d17735801048 /webapp/components/user_settings | |
parent | 3b5a5110c72d7eb2c94d9f428145383b15bd0e4e (diff) | |
download | chat-4ae7128ecb66cdddeb9d40a24970c6552814c18b.tar.gz chat-4ae7128ecb66cdddeb9d40a24970c6552814c18b.tar.bz2 chat-4ae7128ecb66cdddeb9d40a24970c6552814c18b.zip |
Revert "PLT-1800 Load server side locale from the config.json (#3076)"
This reverts commit 34beaa569bfb32f1607375f1d5a22859322060d2.
Diffstat (limited to 'webapp/components/user_settings')
-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 27e7c93a4..fa0118d1e 100644 --- a/webapp/components/user_settings/user_settings_display.jsx +++ b/webapp/components/user_settings/user_settings_display.jsx @@ -632,11 +632,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} @@ -647,12 +643,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 |