zhengchen.tao/ezbookkeeping
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code refactor

Browse Source
This commit is contained in:
MaysWind
2023-07-17 23:13:54 +08:00
parent f0ef9ad51e
commit 714933df56
9 changed files with 43 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/i18n.js
+12 -1
View File
@@ -259,6 +259,10 @@ function getLocaleFromLanguageAlias(alias) {
return null;
}
function getCurrentLanguageCode(i18nGlobal) {
return i18nGlobal.locale;
}
function getCurrentLanguageInfo(i18nGlobal) {
const locale = getLanguageInfo(i18nGlobal.locale);
@@ -266,7 +270,12 @@ function getCurrentLanguageInfo(i18nGlobal) {
return locale;
}
return getDefaultLanguage();
return getLanguageInfo(getDefaultLanguage());
}
function getCurrentLanguageDisplayName(i18nGlobal) {
const currentLanguageInfo = getCurrentLanguageInfo(i18nGlobal);
return currentLanguageInfo.displayName;
}
function getDefaultCurrency(translateFn) {
@@ -917,7 +926,9 @@ export function i18nFunctions(i18nGlobal) {
getAllLanguageInfoArray: (includeSystemDefault) => getAllLanguageInfoArray(i18nGlobal.t, includeSystemDefault),
getLanguageInfo: getLanguageInfo,
getDefaultLanguage: getDefaultLanguage,
getCurrentLanguageCode: () => getCurrentLanguageCode(i18nGlobal),
getCurrentLanguageInfo: () => getCurrentLanguageInfo(i18nGlobal),
getCurrentLanguageDisplayName: () => getCurrentLanguageDisplayName(i18nGlobal),
getDefaultCurrency: () => getDefaultCurrency(i18nGlobal.t),
getDefaultFirstDayOfWeek: () => getDefaultFirstDayOfWeek(i18nGlobal.t),
getCurrencyName: (currencyCode) => getCurrencyName(currencyCode, i18nGlobal.t),
src/views/desktop/LoginPage.vue
+5 -14
View File
@@ -8,10 +8,10 @@
</router-link>
<v-row no-gutters class="auth-wrapper">
<v-col cols="12" md="8" class="d-none d-md-flex align-center justify-center position-relative">
<div class="d-flex auth-img-footer" v-if="currentTheme !== 'dark'">
<div class="d-flex auth-img-footer" v-if="!isDarkMode">
<v-img src="img/desktop/background.svg"/>
</div>
<div class="d-flex auth-img-footer" v-if="currentTheme === 'dark'">
<div class="d-flex auth-img-footer" v-if="isDarkMode">
<v-img src="img/desktop/background-dark.svg"/>
</div>
<div class="d-flex align-center justify-center w-100 pt-10">
@@ -221,20 +221,11 @@ export default {
return !this.passcode;
}
},
currentTheme: {
get: function () {
return this.globalTheme.global.name.value;
}
isDarkMode() {
return this.globalTheme.global.name.value === 'dark';
},
currentLanguageName() {
const currentLocale = this.$i18n.locale;
let lang = this.$locale.getLanguageInfo(currentLocale);
if (!lang) {
lang = this.$locale.getLanguageInfo(this.$locale.getDefaultLanguage());
}
return lang.displayName;
return this.$locale.getCurrentLanguageDisplayName();
}
},
setup() {
src/views/desktop/SignupPage.vue
+6 -11
View File
@@ -8,10 +8,10 @@
</router-link>
<v-row no-gutters class="auth-wrapper">
<v-col cols="12" md="4" class="d-none d-md-flex align-center justify-center position-relative">
<div class="d-flex auth-img-footer" v-if="currentTheme !== 'dark'">
<div class="d-flex auth-img-footer" v-if="!isDarkMode">
<v-img src="img/desktop/background.svg"/>
</div>
<div class="d-flex auth-img-footer" v-if="currentTheme === 'dark'">
<div class="d-flex auth-img-footer" v-if="isDarkMode">
<v-img src="img/desktop/background-dark.svg"/>
</div>
<div class="d-flex align-center justify-center w-100 pt-10">
@@ -272,7 +272,7 @@ export default {
confirmPassword: '',
email: '',
nickname: '',
language: self.$i18n.locale,
language: self.$locale.getCurrentLanguageCode(),
defaultCurrency: settingsStore.localeDefaultSettings.currency,
firstDayOfWeek: settingsStore.localeDefaultSettings.firstDayOfWeek,
},
@@ -311,7 +311,7 @@ export default {
},
currentLocale: {
get: function () {
return this.$i18n.locale;
return this.$locale.getCurrentLanguageCode();
},
set: function (value) {
const isCurrencyDefault = this.user.defaultCurrency === this.settingsStore.localeDefaultSettings.currency;
@@ -331,10 +331,8 @@ export default {
}
}
},
currentTheme: {
get: function () {
return this.globalTheme.global.name.value;
}
isDarkMode() {
return this.globalTheme.global.name.value === 'dark';
},
currentLanguageName() {
const languageInfo = this.$locale.getLanguageInfo(this.currentLocale);
@@ -345,9 +343,6 @@ export default {
return languageInfo.displayName;
},
currentDayOfWeekName() {
return getNameByKeyValue(this.allWeekDays, this.user.firstDayOfWeek, 'type', 'displayName');
},
inputIsEmpty() {
return !!this.inputEmptyProblemMessage;
},
src/views/desktop/UnlockPage.vue
+5 -14
View File
@@ -8,10 +8,10 @@
</router-link>
<v-row no-gutters class="auth-wrapper">
<v-col cols="12" md="8" class="d-none d-md-flex align-center justify-center position-relative">
<div class="d-flex auth-img-footer" v-if="currentTheme !== 'dark'">
<div class="d-flex auth-img-footer" v-if="!isDarkMode">
<v-img src="img/desktop/background.svg"/>
</div>
<div class="d-flex auth-img-footer" v-if="currentTheme === 'dark'">
<div class="d-flex auth-img-footer" v-if="isDarkMode">
<v-img src="img/desktop/background-dark.svg"/>
</div>
<div class="d-flex align-center justify-center w-100 pt-10">
@@ -133,20 +133,11 @@ export default {
&& this.$user.getWebAuthnCredentialId()
&& webauthn.isSupported();
},
currentTheme: {
get: function () {
return this.globalTheme.global.name.value;
}
isDarkMode() {
return this.globalTheme.global.name.value === 'dark';
},
currentLanguageName() {
const currentLocale = this.$i18n.locale;
let lang = this.$locale.getLanguageInfo(currentLocale);
if (!lang) {
lang = this.$locale.getLanguageInfo(this.$locale.getDefaultLanguage());
}
return lang.displayName;
return this.$locale.getCurrentLanguageDisplayName();
}
},
setup() {
src/views/mobile/LoginPage.vue
+5 -9
View File
@@ -70,7 +70,7 @@
@click="changeLanguage(locale)"
>
<template #after>
<f7-icon class="list-item-checked-icon" f7="checkmark_alt" v-if="$i18n.locale === locale"></f7-icon>
<f7-icon class="list-item-checked-icon" f7="checkmark_alt" v-if="currentLanguageCode === locale"></f7-icon>
</template>
</f7-list-item>
</f7-list>
@@ -183,15 +183,11 @@ export default {
return 'Use a backup code';
}
},
currentLanguageCode() {
return this.$locale.getCurrentLanguageCode();
},
currentLanguageName() {
const currentLocale = this.$i18n.locale;
let lang = this.$locale.getLanguageInfo(currentLocale);
if (!lang) {
lang = this.$locale.getLanguageInfo(this.$locale.getDefaultLanguage());
}
return lang.displayName;
return this.$locale.getCurrentLanguageDisplayName();
}
},
methods: {
src/views/mobile/SettingsPage.vue
+2 -2
View File
@@ -103,7 +103,7 @@ export default {
const self = this;
return {
currentLocale: self.$i18n.locale,
currentLocale: self.$locale.getCurrentLanguageCode(),
logouting: false
};
},
@@ -196,7 +196,7 @@ export default {
},
methods: {
onPageAfterIn() {
this.currentLocale = this.$i18n.locale;
this.currentLocale = this.$locale.getCurrentLanguageCode();
},
logout() {
const self = this;
src/views/mobile/SignupPage.vue
+2 -2
View File
@@ -198,7 +198,7 @@ export default {
confirmPassword: '',
email: '',
nickname: '',
language: self.$i18n.locale,
language: self.$locale.getCurrentLanguageCode(),
defaultCurrency: settingsStore.localeDefaultSettings.currency,
firstDayOfWeek: settingsStore.localeDefaultSettings.firstDayOfWeek,
},
@@ -227,7 +227,7 @@ export default {
},
currentLocale: {
get: function () {
return this.$i18n.locale;
return this.$locale.getCurrentLanguageCode();
},
set: function (value) {
const isCurrencyDefault = this.user.defaultCurrency === this.settingsStore.localeDefaultSettings.currency;
src/views/mobile/UnlockPage.vue
+5 -9
View File
@@ -48,7 +48,7 @@
@click="changeLanguage(locale)"
>
<template #after>
<f7-icon class="list-item-checked-icon" f7="checkmark_alt" v-if="$i18n.locale === locale"></f7-icon>
<f7-icon class="list-item-checked-icon" f7="checkmark_alt" v-if="currentLanguageCode === locale"></f7-icon>
</template>
</f7-list-item>
</f7-list>
@@ -94,15 +94,11 @@ export default {
&& this.$user.getWebAuthnCredentialId()
&& webauthn.isSupported();
},
currentLanguageCode() {
return this.$locale.getCurrentLanguageCode();
},
currentLanguageName() {
const currentLocale = this.$i18n.locale;
let lang = this.$locale.getLanguageInfo(currentLocale);
if (!lang) {
lang = this.$locale.getLanguageInfo(this.$locale.getDefaultLanguage());
}
return lang.displayName;
return this.$locale.getCurrentLanguageDisplayName();
}
},
methods: {
src/views/mobile/categories/PresetPage.vue
+1 -1
View File
@@ -71,7 +71,7 @@ export default {
return {
loadingError: null,
currentLocale: self.$i18n.locale,
currentLocale: self.$locale.getCurrentLanguageCode(),
categoryType: 0,
allCategories: [],
submitting: false,