From 3f0443b55236555951dc45c03dcb05baea86350c Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Mon, 8 Feb 2016 11:12:59 -0800
Subject: PLT-1900 removing lang from preview and making spanish beta

---
 .../user_settings/user_settings_display.jsx        | 74 +++++++++++-----------
 1 file changed, 36 insertions(+), 38 deletions(-)

(limited to 'web/react/components/user_settings/user_settings_display.jsx')

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 (
-- 
cgit v1.2.3-1-g7c22


From d0ad249bc2485293eeb3a25267598f27a5f78727 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Mon, 8 Feb 2016 11:32:46 -0800
Subject: Fixing eslint error

---
 web/react/components/user_settings/user_settings_display.jsx | 1 -
 1 file changed, 1 deletion(-)

(limited to 'web/react/components/user_settings/user_settings_display.jsx')

diff --git a/web/react/components/user_settings/user_settings_display.jsx b/web/react/components/user_settings/user_settings_display.jsx
index 98a010959..5f23a8995 100644
--- a/web/react/components/user_settings/user_settings_display.jsx
+++ b/web/react/components/user_settings/user_settings_display.jsx
@@ -10,7 +10,6 @@ import PreferenceStore from '../../stores/preference_store.jsx';
 import * as Utils from '../../utils/utils.jsx';
 
 import Constants from '../../utils/constants.jsx';
-const PreReleaseFeatures = Constants.PRE_RELEASE_FEATURES;
 
 import {savePreferences} from '../../utils/client.jsx';
 import {intlShape, injectIntl, defineMessages, FormattedMessage} from 'mm-intl';
-- 
cgit v1.2.3-1-g7c22