code refactor

This commit is contained in:
MaysWind
2024-08-03 18:21:04 +08:00
parent 77439f675b
commit f1f61a9038
10 changed files with 28 additions and 28 deletions
+1 -1
View File
@@ -256,7 +256,7 @@ export default {
}
},
currentLanguageCode() {
return this.$locale.getCurrentLanguageCode();
return this.$locale.getCurrentLanguageTag();
},
currentLanguageName() {
return this.$locale.getCurrentLanguageDisplayName();
+2 -2
View File
@@ -89,7 +89,7 @@ export default {
const self = this;
return {
currentLocale: self.$locale.getCurrentLanguageCode(),
currentLocale: self.$locale.getCurrentLanguageTag(),
logouting: false
};
},
@@ -167,7 +167,7 @@ export default {
},
methods: {
onPageAfterIn() {
this.currentLocale = this.$locale.getCurrentLanguageCode();
this.currentLocale = this.$locale.getCurrentLanguageTag();
},
logout() {
const self = this;
+5 -5
View File
@@ -66,9 +66,9 @@
smart-select :smart-select-params="{ openIn: 'popup', popupPush: true, closeOnSelect: true, scrollToSelectedItem: true, searchbar: true, searchbarPlaceholder: $t('Language'), searchbarDisableText: $t('Cancel'), appendSearchbarNotFound: $t('No results'), pageTitle: $t('Language'), popupCloseLinkText: $t('Done') }"
>
<select v-model="currentLocale">
<option :value="locale"
:key="locale"
v-for="(lang, locale) in allLanguages">{{ lang.displayName }}</option>
<option :value="languageTag"
:key="languageTag"
v-for="(lang, languageTag) in allLanguages">{{ lang.displayName }}</option>
</select>
</f7-list-item>
@@ -191,7 +191,7 @@ export default {
],
data() {
const userStore = useUserStore();
const newUser = userStore.generateNewUserModel(this.$locale.getCurrentLanguageCode());
const newUser = userStore.generateNewUserModel(this.$locale.getCurrentLanguageTag());
return {
user: newUser,
@@ -218,7 +218,7 @@ export default {
},
currentLocale: {
get: function () {
return this.$locale.getCurrentLanguageCode();
return this.$locale.getCurrentLanguageTag();
},
set: function (value) {
const isCurrencyDefault = this.user.defaultCurrency === this.settingsStore.localeDefaultSettings.currency;
+1 -1
View File
@@ -104,7 +104,7 @@ export default {
&& webauthn.isSupported();
},
currentLanguageCode() {
return this.$locale.getCurrentLanguageCode();
return this.$locale.getCurrentLanguageTag();
},
currentLanguageName() {
return this.$locale.getCurrentLanguageDisplayName();
+1 -1
View File
@@ -71,7 +71,7 @@ export default {
return {
loadingError: null,
currentLocale: self.$locale.getCurrentLanguageCode(),
currentLocale: self.$locale.getCurrentLanguageTag(),
categoryType: 0,
submitting: false,
showMoreActionSheet: false,
+3 -3
View File
@@ -123,8 +123,8 @@
:title="currentLanguageName"
smart-select :smart-select-params="{ openIn: 'popup', popupPush: true, closeOnSelect: true, scrollToSelectedItem: true, searchbar: true, searchbarPlaceholder: $t('Language'), searchbarDisableText: $t('Cancel'), appendSearchbarNotFound: $t('No results'), pageTitle: $t('Language'), popupCloseLinkText: $t('Done') }">
<select v-model="newProfile.language">
<option :value="language.code"
:key="language.code"
<option :value="language.languageTag"
:key="language.languageTag"
v-for="language in allLanguages">{{ language.displayName }}</option>
</select>
</f7-list-item>
@@ -440,7 +440,7 @@ export default {
},
currentLanguageName() {
for (let i = 0; i < this.allLanguages.length; i++) {
if (this.allLanguages[i].code === this.newProfile.language) {
if (this.allLanguages[i].languageTag === this.newProfile.language) {
return this.allLanguages[i].displayName;
}
}