diff options
Diffstat (limited to 'web')
| -rw-r--r-- | web/react/components/user_settings/user_settings_advanced.jsx | 4 | ||||
| -rw-r--r-- | web/react/components/user_settings/user_settings_display.jsx | 75 | ||||
| -rw-r--r-- | web/react/utils/constants.jsx | 4 | ||||
| -rw-r--r-- | web/react/utils/utils.jsx | 2 | ||||
| -rw-r--r-- | web/static/i18n/en.json | 1 | ||||
| -rw-r--r-- | web/static/i18n/es.json | 1 |
6 files changed, 37 insertions, 50 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..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'; @@ -379,46 +378,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 ( diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx index d7d8a2ced..9689591a6 100644 --- a/web/react/utils/constants.jsx +++ b/web/react/utils/constants.jsx @@ -456,10 +456,6 @@ export default { EMBED_PREVIEW: { label: 'embed_preview', description: 'Show preview snippet of links below message' - }, - LOC_PREVIEW: { - label: 'loc_preview', - description: 'Show user language in display settings' } }, OVERLAY_TIME_DELAY: 400, diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index 238a209a4..896a94ac5 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -1373,7 +1373,7 @@ export function languages() { }, { value: 'es', - name: 'Español' + name: 'Español (Beta)' } ] ); diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json index 64d06f46d..ff25d98c2 100644 --- a/web/static/i18n/en.json +++ b/web/static/i18n/en.json @@ -1126,7 +1126,6 @@ "user.settings.advance.enabled": "enabled", "user.settings.advance.markdown_preview": "Show markdown preview option in message input box", "user.settings.advance.embed_preview": "Show preview snippet of links below message", - "user.settings.advance.loc_preview": "Show user language in display settings", "user.settings.advance.sendDesc": "If enabled 'Enter' inserts a new line and 'Ctrl + Enter' submits the message.", "user.settings.advance.preReleaseDesc": "Check any pre-released features you'd like to preview. You may also need to refresh the page before the setting will take effect.", "user.settings.advance.title": "Advanced Settings", diff --git a/web/static/i18n/es.json b/web/static/i18n/es.json index a65b20e4c..19582b836 100644 --- a/web/static/i18n/es.json +++ b/web/static/i18n/es.json @@ -1050,7 +1050,6 @@ "user.settings.advance.enabled": "habilitada(s)", "user.settings.advance.feature": " Característica ", "user.settings.advance.features": " Características ", - "user.settings.advance.loc_preview": "Mostrar el idioma del usuario en la configuración de visualización", "user.settings.advance.markdown_preview": "Mostrar la previsualización de mensajes escritos con markdown", "user.settings.advance.off": "Encendido", "user.settings.advance.on": "Apagado", |