Revert "PLT-1800 Load server side locale from the config.json" (#3133)

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