change system default display order

This commit is contained in:
MaysWind
2021-03-13 17:05:35 +08:00
parent 0f627e3375
commit bcf6216971
2 changed files with 10 additions and 6 deletions
+9 -1
View File
@@ -214,7 +214,7 @@ Vue.prototype.$locale = {
moment.tz.setDefault(); moment.tz.setDefault();
} }
}, },
getAllTimezones: function () { getAllTimezones: function (includeSystemDefault) {
const allTimezones = timezone.all; const allTimezones = timezone.all;
const allTimezoneInfos = []; const allTimezoneInfos = [];
@@ -226,6 +226,14 @@ Vue.prototype.$locale = {
}); });
} }
if (includeSystemDefault) {
allTimezoneInfos.push({
name: '',
utcOffset: this.defaultTimezoneOffset,
displayName: i18n.t('System Default')
});
}
allTimezoneInfos.sort(function(c1, c2){ allTimezoneInfos.sort(function(c1, c2){
const utcOffset1 = parseInt(c1.utcOffset.replace(':', '')); const utcOffset1 = parseInt(c1.utcOffset.replace(':', ''));
const utcOffset2 = parseInt(c2.utcOffset.replace(':', '')); const utcOffset2 = parseInt(c2.utcOffset.replace(':', ''));
+1 -5
View File
@@ -37,7 +37,6 @@
:title="$t('Timezone')" :title="$t('Timezone')"
smart-select :smart-select-params="{ openIn: 'popup', searchbar: true, searchbarPlaceholder: $t('Timezone'), searchbarDisableText: $t('Cancel'), closeOnSelect: true, popupCloseLinkText: $t('Done'), scrollToSelectedItem: true }"> smart-select :smart-select-params="{ openIn: 'popup', searchbar: true, searchbarPlaceholder: $t('Timezone'), searchbarDisableText: $t('Cancel'), closeOnSelect: true, popupCloseLinkText: $t('Done'), scrollToSelectedItem: true }">
<select v-model="currentTimezone"> <select v-model="currentTimezone">
<option value="">{{ `(UTC${defaultTimezoneOffset}) ${$t('System Default')}` }}</option>
<option v-for="timezone in allTimezones" <option v-for="timezone in allTimezones"
:key="timezone.name" :key="timezone.name"
:value="timezone.name">{{ `(UTC${timezone.utcOffset}) ${timezone.displayName}` }}</option> :value="timezone.name">{{ `(UTC${timezone.utcOffset}) ${timezone.displayName}` }}</option>
@@ -117,10 +116,7 @@ export default {
return this.$locale.getAllLanguages(); return this.$locale.getAllLanguages();
}, },
allTimezones() { allTimezones() {
return this.$locale.getAllTimezones(); return this.$locale.getAllTimezones(true);
},
defaultTimezoneOffset() {
return this.$locale.defaultTimezoneOffset;
}, },
currentLocale: { currentLocale: {
get: function () { get: function () {