diff options
Diffstat (limited to 'web')
-rw-r--r-- | web/react/components/user_settings/manage_languages.jsx | 36 | ||||
-rw-r--r-- | web/react/components/user_settings/user_settings_display.jsx | 23 | ||||
-rw-r--r-- | web/static/i18n/en.json | 1 | ||||
-rw-r--r-- | web/static/i18n/es.json | 1 | ||||
-rw-r--r-- | web/static/i18n/pt.json | 3 |
5 files changed, 29 insertions, 35 deletions
diff --git a/web/react/components/user_settings/manage_languages.jsx b/web/react/components/user_settings/manage_languages.jsx index fee6d9da2..2d1c74717 100644 --- a/web/react/components/user_settings/manage_languages.jsx +++ b/web/react/components/user_settings/manage_languages.jsx @@ -1,6 +1,8 @@ // Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved. // See License.txt for license information. +import SettingItemMax from '../setting_item_max.jsx'; + import * as Client from '../../utils/client.jsx'; import * as Utils from '../../utils/utils.jsx'; @@ -69,7 +71,7 @@ export default class ManageLanguage extends React.Component { </option>); }); - return ( + const input = ( <div key='changeLanguage'> <br/> <label className='control-label'> @@ -88,24 +90,28 @@ export default class ManageLanguage extends React.Component { {options} </select> {serverError} - <div className='padding-top'> - <a - className={'btn btn-sm btn-primary'} - href='#' - onClick={this.changeLanguage} - > - <FormattedMessage - id='user.settings.languages' - defaultMessage='Set language' - /> - </a> - </div> </div> </div> ); + + return ( + <SettingItemMax + title={ + <FormattedMessage + id='user.settings.display.language' + defaultMessage='Language' + /> + } + width='medium' + submit={this.changeLanguage} + inputs={[input]} + updateSection={this.props.updateSection} + /> + ); } } ManageLanguage.propTypes = { - user: React.PropTypes.object -};
\ No newline at end of file + user: React.PropTypes.object.isRequired, + updateSection: React.PropTypes.func.isRequired +}; diff --git a/web/react/components/user_settings/user_settings_display.jsx b/web/react/components/user_settings/user_settings_display.jsx index 5f23a8995..62c469e32 100644 --- a/web/react/components/user_settings/user_settings_display.jsx +++ b/web/react/components/user_settings/user_settings_display.jsx @@ -46,10 +46,6 @@ const holders = defineMessages({ fontTitle: { id: 'user.settings.display.fontTitle', defaultMessage: 'Display Font' - }, - language: { - id: 'user.settings.display.language', - defaultMessage: 'Language' } }); @@ -379,19 +375,9 @@ class UserSettingsDisplay extends React.Component { } if (this.props.activeSection === 'languages') { - var inputs = []; - inputs.push( + languagesSection = ( <ManageLanguages user={this.props.user} - key='languages-ui' - /> - ); - - languagesSection = ( - <SettingItemMax - title={formatMessage(holders.language)} - width='medium' - inputs={inputs} updateSection={(e) => { this.updateSection(''); e.preventDefault(); @@ -408,7 +394,12 @@ class UserSettingsDisplay extends React.Component { languagesSection = ( <SettingItemMin - title={formatMessage(holders.language)} + title={ + <FormattedMessage + id='user.settings.display.language' + defaultMessage='Language' + /> + } width='medium' describe={locale} updateSection={() => { diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json index dc4633594..ce379e49c 100644 --- a/web/static/i18n/en.json +++ b/web/static/i18n/en.json @@ -1228,7 +1228,6 @@ "user.settings.integrations.outWebhooks": "Outgoing Webhooks", "user.settings.integrations.outWebhooksDescription": "Manage your outgoing webhooks", "user.settings.integrations.title": "Integration Settings", - "user.settings.languages": "Set language", "user.settings.languages.change": "Change interface language", "user.settings.modal.advanced": "Advanced", "user.settings.modal.confirmBtns": "Yes, Discard", diff --git a/web/static/i18n/es.json b/web/static/i18n/es.json index 026d8eec6..2cf58dfb2 100644 --- a/web/static/i18n/es.json +++ b/web/static/i18n/es.json @@ -1228,7 +1228,6 @@ "user.settings.integrations.outWebhooks": "Webhooks de salida", "user.settings.integrations.outWebhooksDescription": "Administra tus webhooks de salida", "user.settings.integrations.title": "Configuraciones de Integración", - "user.settings.languages": "Cambiar Idioma", "user.settings.languages.change": "Cambia el idioma con el que se muestra la intefaz de usuario", "user.settings.modal.advanced": "Avanzada", "user.settings.modal.confirmBtns": "Sí, Descartar", diff --git a/web/static/i18n/pt.json b/web/static/i18n/pt.json index 1088c961c..cd718e01b 100644 --- a/web/static/i18n/pt.json +++ b/web/static/i18n/pt.json @@ -1228,7 +1228,6 @@ "user.settings.integrations.outWebhooks": "Webhooks Saída", "user.settings.integrations.outWebhooksDescription": "Gerencie seus webhooks saída", "user.settings.integrations.title": "Configuração de Integração", - "user.settings.languages": "Definir idioma", "user.settings.languages.change": "Alterar o idioma da interface", "user.settings.modal.advanced": "Avançado", "user.settings.modal.confirmBtns": "Sim, Descartar", @@ -1288,4 +1287,4 @@ "view_image_popover.download": "Download", "view_image_popover.file": "Arquivo {count} de {total}", "view_image_popover.publicLink": "Obter O Link Público" -}
\ No newline at end of file +} |