From 4ae0bcec653e071b61cf20754ba524cb3ba2dceb Mon Sep 17 00:00:00 2001 From: umbor <14857490+umbors@users.noreply.github.com> Date: Sun, 11 Jun 2023 14:24:17 +0800 Subject: [PATCH] Fix some bugs Fix some bugs --- webui/package.json | 2 +- webui/src/components/layout/ab-topbar.vue | 10 ++++++---- webui/src/locales/index.ts | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/webui/package.json b/webui/package.json index b49ccc44..4da38e55 100644 --- a/webui/package.json +++ b/webui/package.json @@ -23,7 +23,7 @@ "naive-ui": "^2.34.4", "pinia": "^2.1.3", "vue": "^3.3.4", - "vue-i18n": "^9.3.0-beta.19", + "vue-i18n": "^9.2.2", "vue-router": "^4.2.1" }, "devDependencies": { diff --git a/webui/src/components/layout/ab-topbar.vue b/webui/src/components/layout/ab-topbar.vue index 5f8629ec..3963bee0 100644 --- a/webui/src/components/layout/ab-topbar.vue +++ b/webui/src/components/layout/ab-topbar.vue @@ -68,12 +68,14 @@ onUnmounted(() => { function changeLocale(){ if(localStorage.getItem('lang') === 'zh-CN'){ - locale.value = 'en-US'; - localStorage.setItem('lang', locale.value); + let newLang = 'en-US'; + locale.value = newLang; + localStorage.setItem('lang', newLang); location.reload(); } else { - locale.value = 'zh-CN'; - localStorage.setItem('lang', locale.value); + let newLang = 'zh-CN'; + locale.value = newLang; + localStorage.setItem('lang', newLang); location.reload(); } } diff --git a/webui/src/locales/index.ts b/webui/src/locales/index.ts index d9faf181..33bab3b1 100644 --- a/webui/src/locales/index.ts +++ b/webui/src/locales/index.ts @@ -4,7 +4,7 @@ import messages from '@intlify/unplugin-vue-i18n/messages' //Default language is the same as last setting (undefined is browser language) let lang = localStorage.getItem('lang'); if(lang === null){ - const navLang = navigator.language || navigator.userLanguage; + const navLang = navigator.language; let localLang = navLang || false; lang = localLang || 'en-US'; }