diff --git a/frontend/src/components/system-upgrade/index.vue b/frontend/src/components/system-upgrade/index.vue index a92b7b35b..c2c921d23 100644 --- a/frontend/src/components/system-upgrade/index.vue +++ b/frontend/src/components/system-upgrade/index.vue @@ -90,7 +90,7 @@ const toEdition = () => { const onLoadUpgradeInfo = async () => { loading.value = true; await loadUpgradeInfo() - .then((res) => { + .then(async (res) => { loading.value = false; if (res.data.testVersion || res.data.newVersion || res.data.latestVersion) { upgradeInfo.value = res.data; @@ -101,7 +101,10 @@ const onLoadUpgradeInfo = async () => { } else if (upgradeInfo.value.newVersion) { upgradeVersion.value = upgradeInfo.value.newVersion; } - upgradeRef.value.acceptParams({ upgradeInfo: upgradeInfo.value, upgradeVersion: upgradeVersion.value }); + await upgradeRef.value.acceptParams({ + upgradeInfo: upgradeInfo.value, + upgradeVersion: upgradeVersion.value, + }); } else { MsgSuccess(i18n.global.t('setting.noUpgrade')); return; diff --git a/frontend/src/components/system-upgrade/upgrade/index.vue b/frontend/src/components/system-upgrade/upgrade/index.vue index 6f2ea435c..4a54f3bed 100644 --- a/frontend/src/components/system-upgrade/upgrade/index.vue +++ b/frontend/src/components/system-upgrade/upgrade/index.vue @@ -2,7 +2,7 @@
-

{{ $t('app.version') }}

+

{{ versionTitle }}

@@ -32,13 +32,16 @@ import MarkDownEditor from '@/components/mkdown-editor/index.vue'; import { loadReleaseNotes, upgrade } from '@/api/modules/setting'; -import i18n from '@/lang'; +import i18n, { loadLocaleMessages } from '@/lang'; import { MsgSuccess } from '@/utils/message'; -import { ref } from 'vue'; +import { computed, ref } from 'vue'; import { useGlobalStore } from '@/composables/useGlobalStore'; import { ElMessageBox } from 'element-plus'; -const { isLoading, isOnRestart } = useGlobalStore(); +const { isLoading, isOnRestart, isIntl } = useGlobalStore(); + +const releaseNotesLocale = computed(() => (isIntl.value ? 'en' : 'zh')); +const versionTitle = computed(() => i18n.global.t('app.version', {}, { locale: releaseNotesLocale.value })); const drawerVisible = ref(false); const upgradeInfo = ref(); @@ -49,7 +52,8 @@ interface DialogProps { upgradeInfo: number; upgradeVersion: string; } -const acceptParams = (params: DialogProps): void => { +const acceptParams = async (params: DialogProps): Promise => { + await loadLocaleMessages(releaseNotesLocale.value); upgradeInfo.value = params.upgradeInfo; upgradeVersion.value = params.upgradeVersion; drawerVisible.value = true; diff --git a/frontend/src/views/setting/panel/edition/index.vue b/frontend/src/views/setting/panel/edition/index.vue index d00d0476b..a2d2c1f80 100644 --- a/frontend/src/views/setting/panel/edition/index.vue +++ b/frontend/src/views/setting/panel/edition/index.vue @@ -1,6 +1,13 @@