diff --git a/src/lib/i18n.js b/src/lib/i18n.js index 4ea9a31f..f771989d 100644 --- a/src/lib/i18n.js +++ b/src/lib/i18n.js @@ -441,20 +441,27 @@ function getAllTimezones(includeSystemDefault, translateFn) { const allTimezoneInfos = []; for (let i = 0; i < allTimezones.length; i++) { + const utcOffset = (allTimezones[i].timezoneName !== timezone.utcTimezoneName ? getTimezoneOffset(allTimezones[i].timezoneName) : ''); + const displayName = translateFn(`timezone.${allTimezones[i].displayName}`); + allTimezoneInfos.push({ name: allTimezones[i].timezoneName, - utcOffset: (allTimezones[i].timezoneName !== timezone.utcTimezoneName ? getTimezoneOffset(allTimezones[i].timezoneName) : ''), + utcOffset: utcOffset, utcOffsetMinutes: getTimezoneOffsetMinutes(allTimezones[i].timezoneName), - displayName: translateFn(`timezone.${allTimezones[i].displayName}`) + displayName: displayName, + displayNameWithUtcOffset: `(UTC${utcOffset}) ${displayName}` }); } if (includeSystemDefault) { + const defaultDisplayName = translateFn('System Default'); + allTimezoneInfos.push({ name: '', utcOffset: defaultTimezoneOffset, utcOffsetMinutes: defaultTimezoneOffsetMinutes, - displayName: translateFn('System Default') + displayName: defaultDisplayName, + displayNameWithUtcOffset: `(UTC${defaultTimezoneOffset}) ${defaultDisplayName}` }); } diff --git a/src/views/mobile/SettingsPage.vue b/src/views/mobile/SettingsPage.vue index 702e552e..b6fbe7c9 100644 --- a/src/views/mobile/SettingsPage.vue +++ b/src/views/mobile/SettingsPage.vue @@ -33,9 +33,8 @@ :title="$t('Timezone')" smart-select :smart-select-params="{ openIn: 'popup', popupPush: true, closeOnSelect: true, scrollToSelectedItem: true, searchbar: true, searchbarPlaceholder: $t('Timezone'), searchbarDisableText: $t('Cancel'), appendSearchbarNotFound: $t('No results'), popupCloseLinkText: $t('Done') }"> diff --git a/src/views/mobile/transactions/EditPage.vue b/src/views/mobile/transactions/EditPage.vue index 6af5c46f..b769c0b4 100644 --- a/src/views/mobile/transactions/EditPage.vue +++ b/src/views/mobile/transactions/EditPage.vue @@ -225,9 +225,8 @@ :header="$t('Transaction Time Zone')" smart-select :smart-select-params="{ openIn: 'popup', popupPush: true, closeOnSelect: true, scrollToSelectedItem: true, searchbar: true, searchbarPlaceholder: $t('Timezone'), searchbarDisableText: $t('Cancel'), appendSearchbarNotFound: $t('No results'), pageTitle: $t('Transaction Time Zone'), popupCloseLinkText: $t('Done') }">