From bcf6216971698dcf01345b4ffd0d28ae578746ef Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Sat, 13 Mar 2021 17:05:35 +0800
Subject: [PATCH] change system default display order

---
 src/mobile-main.js            | 10 +++++++++-
 src/views/mobile/Settings.vue |  6 +-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/mobile-main.js b/src/mobile-main.js
index 200277f4..f2472fba 100644
--- a/src/mobile-main.js
+++ b/src/mobile-main.js
@@ -214,7 +214,7 @@ Vue.prototype.$locale = {
             moment.tz.setDefault();
         }
     },
-    getAllTimezones: function () {
+    getAllTimezones: function (includeSystemDefault) {
         const allTimezones = timezone.all;
         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){
             const utcOffset1 = parseInt(c1.utcOffset.replace(':', ''));
             const utcOffset2 = parseInt(c2.utcOffset.replace(':', ''));
diff --git a/src/views/mobile/Settings.vue b/src/views/mobile/Settings.vue
index 2ecc95a1..ab473d68 100644
--- a/src/views/mobile/Settings.vue
+++ b/src/views/mobile/Settings.vue
@@ -37,7 +37,6 @@
                         :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 }">
                         <select v-model="currentTimezone">
-                            <option value="">{{ `(UTC${defaultTimezoneOffset}) ${$t('System Default')}` }}</option>
                             <option v-for="timezone in allTimezones"
                                     :key="timezone.name"
                                     :value="timezone.name">{{ `(UTC${timezone.utcOffset}) ${timezone.displayName}` }}</option>
@@ -117,10 +116,7 @@ export default {
             return this.$locale.getAllLanguages();
         },
         allTimezones() {
-            return this.$locale.getAllTimezones();
-        },
-        defaultTimezoneOffset() {
-            return this.$locale.defaultTimezoneOffset;
+            return this.$locale.getAllTimezones(true);
         },
         currentLocale: {
             get: function () {