diff options
Diffstat (limited to 'src/components')
7 files changed, 34 insertions, 87 deletions
diff --git a/src/components/interface_language_switcher/interface_language_switcher.vue b/src/components/interface_language_switcher/interface_language_switcher.vue index 7ad1fe2e..6d1f83c4 100644 --- a/src/components/interface_language_switcher/interface_language_switcher.vue +++ b/src/components/interface_language_switcher/interface_language_switcher.vue @@ -1,12 +1,12 @@ <template> <div> <label for="interface-language-switcher"> - {{ promptText }} + {{ $t('settings.interfaceLanguage') }} </label> {{ ' ' }} <Select id="interface-language-switcher" - v-model="controlledLanguage" + v-model="language" > <option v-for="lang in languages" @@ -20,43 +20,39 @@ </template> <script> +import languagesObject from '../../i18n/messages' import localeService from '../../services/locale/locale.service.js' +import ISO6391 from 'iso-639-1' +import _ from 'lodash' import Select from '../select/select.vue' export default { components: { Select }, - props: { - promptText: { - type: String, - required: true - }, - language: { - type: String, - required: true - }, - setLanguage: { - type: Function, - required: true - } - }, computed: { languages () { - return localeService.languages + return _.map(languagesObject.languages, (code) => ({ code: code, name: this.getLanguageName(code) })).sort((a, b) => a.name.localeCompare(b.name)) }, - controlledLanguage: { - get: function () { return this.language }, + language: { + get: function () { return this.$store.getters.mergedConfig.interfaceLanguage }, set: function (val) { - this.setLanguage(val) + this.$store.dispatch('setOption', { name: 'interfaceLanguage', value: val }) } } }, methods: { getLanguageName (code) { - return localeService.getLanguageName(code) + const specialLanguageNames = { + 'ja_easy': 'やさしいにほんご', + 'zh': '简体中文', + 'zh_Hant': '繁體中文' + } + const languageName = specialLanguageNames[code] || ISO6391.getNativeName(code) + const browserLocale = localeService.internalToBrowserLocale(code) + return languageName.charAt(0).toLocaleUpperCase(browserLocale) + languageName.slice(1) } } } diff --git a/src/components/registration/registration.js b/src/components/registration/registration.js index 6eb316d0..a3ef0f04 100644 --- a/src/components/registration/registration.js +++ b/src/components/registration/registration.js @@ -1,8 +1,6 @@ import useVuelidate from '@vuelidate/core' import { required, requiredIf, sameAs } from '@vuelidate/validators' import { mapActions, mapState } from 'vuex' -import InterfaceLanguageSwitcher from '../interface_language_switcher/interface_language_switcher.vue' -import localeService from '../../services/locale/locale.service.js' const registration = { setup () { return { v$: useVuelidate() } }, @@ -13,14 +11,10 @@ const registration = { username: '', password: '', confirm: '', - reason: '', - language: '' + reason: '' }, captcha: {} }), - components: { - InterfaceLanguageSwitcher - }, validations () { return { user: { @@ -32,8 +26,7 @@ const registration = { required, sameAs: sameAs(this.user.password) }, - reason: { required: requiredIf(() => this.accountApprovalRequired) }, - language: {} + reason: { required: requiredIf(() => this.accountApprovalRequired) } } } }, @@ -71,9 +64,6 @@ const registration = { this.user.captcha_solution = this.captcha.solution this.user.captcha_token = this.captcha.token this.user.captcha_answer_data = this.captcha.answer_data - if (this.user.language) { - this.user.language = localeService.internalToBackendLocale(this.user.language) - } this.v$.$touch() diff --git a/src/components/registration/registration.vue b/src/components/registration/registration.vue index 6fa70a09..3d409109 100644 --- a/src/components/registration/registration.vue +++ b/src/components/registration/registration.vue @@ -163,18 +163,6 @@ </div> <div - class="form-group" - :class="{ 'form-group--error': $v.user.language.$error }" - > - <interface-language-switcher - for="email-language" - :prompt-text="$t('registration.email_language')" - :language="$v.user.language.$model" - :set-language="val => $v.user.language.$model = val" - /> - </div> - - <div v-if="accountApprovalRequired" class="form-group" > diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js index de925155..62d86176 100644 --- a/src/components/settings_modal/tabs/general_tab.js +++ b/src/components/settings_modal/tabs/general_tab.js @@ -72,12 +72,6 @@ const GeneralTab = { !this.$store.state.users.currentUser.background_image }, instanceShoutboxPresent () { return this.$store.state.instance.shoutAvailable }, - language: { - get: function () { return this.$store.getters.mergedConfig.interfaceLanguage }, - set: function (val) { - this.$store.dispatch('setOption', { name: 'interfaceLanguage', value: val }) - } - }, ...SharedComputedObject() }, methods: { diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue index 39149d7f..a2c6bffa 100644 --- a/src/components/settings_modal/tabs/general_tab.vue +++ b/src/components/settings_modal/tabs/general_tab.vue @@ -4,11 +4,7 @@ <h2>{{ $t('settings.interface') }}</h2> <ul class="setting-list"> <li> - <interface-language-switcher - :prompt-text="$t('settings.interfaceLanguage')" - :language="language" - :set-language="val => language = val" - /> + <interface-language-switcher /> </li> <li v-if="instanceSpecificPanelPresent"> <BooleanSetting path="hideISP"> diff --git a/src/components/settings_modal/tabs/profile_tab.js b/src/components/settings_modal/tabs/profile_tab.js index 8781bb91..f2b48b4b 100644 --- a/src/components/settings_modal/tabs/profile_tab.js +++ b/src/components/settings_modal/tabs/profile_tab.js @@ -8,10 +8,8 @@ import EmojiInput from 'src/components/emoji_input/emoji_input.vue' import suggestor from 'src/components/emoji_input/suggestor.js' import Autosuggest from 'src/components/autosuggest/autosuggest.vue' import Checkbox from 'src/components/checkbox/checkbox.vue' -import InterfaceLanguageSwitcher from 'src/components/interface_language_switcher/interface_language_switcher.vue' import BooleanSetting from '../helpers/boolean_setting.vue' import SharedComputedObject from '../helpers/shared_computed_object.js' -import localeService from 'src/services/locale/locale.service.js' import { library } from '@fortawesome/fontawesome-svg-core' import { @@ -42,8 +40,7 @@ const ProfileTab = { banner: null, bannerPreview: null, background: null, - backgroundPreview: null, - emailLanguage: this.$store.state.users.currentUser.language || '' + backgroundPreview: null } }, components: { @@ -53,8 +50,7 @@ const ProfileTab = { Autosuggest, ProgressButton, Checkbox, - BooleanSetting, - InterfaceLanguageSwitcher + BooleanSetting }, computed: { user () { @@ -115,25 +111,19 @@ const ProfileTab = { }, methods: { updateProfile () { - const params = { - note: this.newBio, - locked: this.newLocked, - // Backend notation. - /* eslint-disable camelcase */ - display_name: this.newName, - fields_attributes: this.newFields.filter(el => el != null), - bot: this.bot, - show_role: this.showRole - /* eslint-enable camelcase */ - } - - if (this.emailLanguage) { - params.language = localeService.internalToBackendLocale(this.emailLanguage) - } - this.$store.state.api.backendInteractor - .updateProfile({ params }) - .then((user) => { + .updateProfile({ + params: { + note: this.newBio, + locked: this.newLocked, + // Backend notation. + /* eslint-disable camelcase */ + display_name: this.newName, + fields_attributes: this.newFields.filter(el => el != null), + bot: this.bot, + show_role: this.showRole + /* eslint-enable camelcase */ + } }).then((user) => { this.newFields.splice(user.fields.length) merge(this.newFields, user.fields) this.$store.commit('addNewUsers', [user]) diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue index 4cd93772..881016fb 100644 --- a/src/components/settings_modal/tabs/profile_tab.vue +++ b/src/components/settings_modal/tabs/profile_tab.vue @@ -89,13 +89,6 @@ {{ $t('settings.bot') }} </Checkbox> </p> - <p> - <interface-language-switcher - :prompt-text="$t('settings.email_language')" - :language="emailLanguage" - :set-language="val => emailLanguage = val" - /> - </p> <button :disabled="newName && newName.length === 0" class="btn button-default" |