From 99a2f40a4e25024336e3d9c20ffe71e4cb4ba313 Mon Sep 17 00:00:00 2001 From: MaysWind Date: Sat, 25 Jan 2025 23:22:45 +0800 Subject: [PATCH] add English hint for language option when current language is not English --- src/views/base/users/UserProfilePageBase.ts | 12 ++++++++++++ .../user/settings/tabs/UserBasicSettingTab.vue | 5 +++-- src/views/mobile/users/UserProfilePage.vue | 5 +++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/views/base/users/UserProfilePageBase.ts b/src/views/base/users/UserProfilePageBase.ts index eaebb929..06f5f5eb 100644 --- a/src/views/base/users/UserProfilePageBase.ts +++ b/src/views/base/users/UserProfilePageBase.ts @@ -20,6 +20,7 @@ import { getCategorizedAccounts } from '@/lib/account.ts'; export function useUserProfilePageBase() { const { + tt, getDefaultCurrency, getDefaultFirstDayOfWeek, getAllLanguageOptions, @@ -72,6 +73,16 @@ export function useUserProfilePageBase() { const allIncomeAmountColorTypes = computed(() => getAllIncomeAmountColors()); const allTransactionEditScopeTypes = computed(() => getAllTransactionEditScopeTypes()); + const languageTitle = computed(() => { + const languageInCurrentLanguage = tt('Language'); + + if (languageInCurrentLanguage !== 'Language') { + return `${languageInCurrentLanguage} / Language`; + } + + return languageInCurrentLanguage; + }); + const supportDigitGroupingSymbol = computed(() => { for (const digitGroupingType of allDigitGroupingTypes.value) { if (digitGroupingType.type === newProfile.value.digitGrouping) { @@ -195,6 +206,7 @@ export function useUserProfilePageBase() { allExpenseAmountColorTypes, allIncomeAmountColorTypes, allTransactionEditScopeTypes, + languageTitle, supportDigitGroupingSymbol, inputIsNotChangedProblemMessage, inputInvalidProblemMessage, diff --git a/src/views/desktop/user/settings/tabs/UserBasicSettingTab.vue b/src/views/desktop/user/settings/tabs/UserBasicSettingTab.vue index 3cd2a765..d711079f 100644 --- a/src/views/desktop/user/settings/tabs/UserBasicSettingTab.vue +++ b/src/views/desktop/user/settings/tabs/UserBasicSettingTab.vue @@ -120,8 +120,8 @@ item-value="languageTag" persistent-placeholder :disabled="loading || saving" - :label="tt('Language')" - :placeholder="tt('Language')" + :label="languageTitle" + :placeholder="languageTitle" :items="allLanguages" v-model="newProfile.language" /> @@ -381,6 +381,7 @@ const { allExpenseAmountColorTypes, allIncomeAmountColorTypes, allTransactionEditScopeTypes, + languageTitle, supportDigitGroupingSymbol, inputIsNotChangedProblemMessage, inputInvalidProblemMessage, diff --git a/src/views/mobile/users/UserProfilePage.vue b/src/views/mobile/users/UserProfilePage.vue index 0fe6e6fd..40b3e781 100644 --- a/src/views/mobile/users/UserProfilePage.vue +++ b/src/views/mobile/users/UserProfilePage.vue @@ -128,9 +128,9 @@ + smart-select :smart-select-params="{ openIn: 'popup', popupPush: true, closeOnSelect: true, scrollToSelectedItem: true, searchbar: true, searchbarPlaceholder: languageTitle, searchbarDisableText: tt('Cancel'), appendSearchbarNotFound: tt('No results'), pageTitle: languageTitle, popupCloseLinkText: tt('Done') }">