PLT-1900 removing lang from preview and making spanish beta

2 files changed, 36 insertions, 42 deletions

diff --git a/web/react/components/user_settings/user_settings_advanced.jsx b/web/react/components/user_settings/user_settings_advanced.jsx
index 5c0757589..e513f81d2 100644
--- a/web/react/components/user_settings/user_settings_advanced.jsx
+++ b/web/react/components/user_settings/user_settings_advanced.jsx
@@ -47,10 +47,6 @@ const holders = defineMessages({
     EMBED_PREVIEW: {
         id: 'user.settings.advance.embed_preview',
         defaultMessage: 'Show preview snippet of links below message'
-    },
-    LOC_PREVIEW: {
-        id: 'user.settings.advance.loc_preview',
-        defaultMessage: 'Show user language in display settings'
     }
 });
 
diff --git a/web/react/components/user_settings/user_settings_display.jsx b/web/react/components/user_settings/user_settings_display.jsx
index 4b11c06fb..98a010959 100644
--- a/web/react/components/user_settings/user_settings_display.jsx
+++ b/web/react/components/user_settings/user_settings_display.jsx
@@ -379,46 +379,44 @@ class UserSettingsDisplay extends React.Component {
             );
         }
 
-        if (Utils.isFeatureEnabled(PreReleaseFeatures.LOC_PREVIEW)) {
-            if (this.props.activeSection === 'languages') {
-                var inputs = [];
-                inputs.push(
-                    <ManageLanguages
-                        user={this.props.user}
-                        key='languages-ui'
-                    />
-                );
+        if (this.props.activeSection === 'languages') {
+            var inputs = [];
+            inputs.push(
+                <ManageLanguages
+                    user={this.props.user}
+                    key='languages-ui'
+                />
+            );
 
-                languagesSection = (
-                    <SettingItemMax
-                        title={formatMessage(holders.language)}
-                        width='medium'
-                        inputs={inputs}
-                        updateSection={(e) => {
-                            this.updateSection('');
-                            e.preventDefault();
-                        }}
-                    />
-                );
-            } else {
-                var locale = 'English';
-                Utils.languages().forEach((l) => {
-                    if (l.value === this.props.user.locale) {
-                        locale = l.name;
-                    }
-                });
+            languagesSection = (
+                <SettingItemMax
+                    title={formatMessage(holders.language)}
+                    width='medium'
+                    inputs={inputs}
+                    updateSection={(e) => {
+                        this.updateSection('');
+                        e.preventDefault();
+                    }}
+                />
+            );
+        } else {
+            var locale = 'English';
+            Utils.languages().forEach((l) => {
+                if (l.value === this.props.user.locale) {
+                    locale = l.name;
+                }
+            });
 
-                languagesSection = (
-                    <SettingItemMin
-                        title={formatMessage(holders.language)}
-                        width='medium'
-                        describe={locale}
-                        updateSection={() => {
-                            this.updateSection('languages');
-                        }}
-                    />
-                );
-            }
+            languagesSection = (
+                <SettingItemMin
+                    title={formatMessage(holders.language)}
+                    width='medium'
+                    describe={locale}
+                    updateSection={() => {
+                        this.updateSection('languages');
+                    }}
+                />
+            );
         }
 
         return (