From 817079a981927db92d6aac3a43aeac5c41dd6488 Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Sun, 31 Jan 2021 16:23:45 +0800
Subject: [PATCH] modify date/time format

---
 src/locales/en.js                           | 26 +++++++++++++--------
 src/locales/zh_Hans.js                      | 26 +++++++++++++--------
 src/views/mobile/Home.vue                   | 10 ++++----
 src/views/mobile/statistics/Transaction.vue |  2 +-
 src/views/mobile/transactions/List.vue      |  4 ++--
 5 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/src/locales/en.js b/src/locales/en.js
index f1159596..de80c559 100644
--- a/src/locales/en.js
+++ b/src/locales/en.js
@@ -9,19 +9,25 @@ export default {
     },
     'format': {
         'date': {
-            'long': 'MM/DD/YYYY',
-            'short': 'M/D/YYYY',
-            'year': 'YYYY',
-            'yearMonth': 'YYYY-M',
-            'monthDay': 'M/D',
-            'shortMonthDay': 'M/D'
+            'long': 'M/D/YYYY',
+            'short': 'M/D/YYYY'
         },
         'datetime': {
-            'long': 'MM/DD/YYYY HH:mm:ss',
-            'long-without-second': 'MM/DD/YYYY HH:mm',
+            'long': 'M/D/YYYY HH:mm:ss',
+            'long-without-second': 'M/D/YYYY HH:mm',
         },
-        'time': {
-            'hourMinute': 'HH:mm'
+        'year': {
+            'long': 'YYYY'
+        },
+        'yearMonth': {
+            'long': 'YYYY-M'
+        },
+        'monthDay': {
+            'long': 'M/D',
+            'short': 'M/D'
+        },
+        'hourMinute': {
+            'long': 'HH:mm'
         },
         'currency': {
             'symbol': '{symbol} {amount}'
diff --git a/src/locales/zh_Hans.js b/src/locales/zh_Hans.js
index 949fc917..b6d61f1a 100644
--- a/src/locales/zh_Hans.js
+++ b/src/locales/zh_Hans.js
@@ -9,19 +9,25 @@ export default {
     },
     'format': {
         'date': {
-            'long': 'YYYY年MM月DD日',
-            'short': 'YYYY-M-D',
-            'year': 'YYYY年',
-            'yearMonth': 'YYYY年M月',
-            'monthDay': 'M月D日',
-            'shortMonthDay': 'M-D'
+            'long': 'YYYY年M月D日',
+            'short': 'YYYY-M-D'
         },
         'datetime': {
-            'long': 'YYYY年MM月DD日 HH:mm:ss',
-            'long-without-second': 'YYYY年MM月DD日 HH:mm',
+            'long': 'YYYY年M月D日 HH:mm:ss',
+            'long-without-second': 'YYYY年M月D日 HH:mm',
         },
-        'time': {
-            'hourMinute': 'HH:mm'
+        'year': {
+            'long': 'YYYY年'
+        },
+        'yearMonth': {
+            'long': 'YYYY年M月'
+        },
+        'monthDay': {
+            'long': 'M月D日',
+            'short': 'M-D'
+        },
+        'hourMinute': {
+            'long': 'HH:mm'
         },
         'currency': {
             'symbol': '{symbol} {amount}'
diff --git a/src/views/mobile/Home.vue b/src/views/mobile/Home.vue
index bb07dc30..35603f91 100644
--- a/src/views/mobile/Home.vue
+++ b/src/views/mobile/Home.vue
@@ -72,10 +72,10 @@
                         </div>
                         <div slot="footer" class="overview-transaction-footer padding-bottom-half">
                             <span v-if="loading">MM/DD</span>
-                            <span v-else-if="!loading">{{ dateRange.thisWeek.startTime | moment($t('format.date.monthDay')) }}</span>
+                            <span v-else-if="!loading">{{ dateRange.thisWeek.startTime | moment($t('format.monthDay.long')) }}</span>
                             <span>-</span>
                             <span v-if="loading">MM/DD</span>
-                            <span v-else-if="!loading">{{ dateRange.thisWeek.endTime | moment($t('format.date.monthDay')) }}</span>
+                            <span v-else-if="!loading">{{ dateRange.thisWeek.endTime | moment($t('format.monthDay.long')) }}</span>
                         </div>
                          <div slot="after">
                              <div class="text-color-red">
@@ -99,10 +99,10 @@
                         </div>
                         <div slot="footer" class="overview-transaction-footer padding-bottom-half">
                             <span v-if="loading">MM/DD</span>
-                            <span v-else-if="!loading">{{ dateRange.thisMonth.startTime | moment($t('format.date.monthDay')) }}</span>
+                            <span v-else-if="!loading">{{ dateRange.thisMonth.startTime | moment($t('format.monthDay.long')) }}</span>
                             <span>-</span>
                             <span v-if="loading">MM/DD</span>
-                            <span v-else-if="!loading">{{ dateRange.thisMonth.endTime | moment($t('format.date.monthDay')) }}</span>
+                            <span v-else-if="!loading">{{ dateRange.thisMonth.endTime | moment($t('format.monthDay.long')) }}</span>
                         </div>
                          <div slot="after">
                              <div class="text-color-red">
@@ -126,7 +126,7 @@
                         </div>
                         <div slot="footer" class="overview-transaction-footer padding-bottom-half">
                             <span v-if="loading">YYYY</span>
-                            <span v-else-if="!loading">{{ dateRange.thisYear.startTime | moment($t('format.date.year')) }}</span>
+                            <span v-else-if="!loading">{{ dateRange.thisYear.startTime | moment($t('format.year.long')) }}</span>
                         </div>
                          <div slot="after">
                             <div class="text-color-red">
diff --git a/src/views/mobile/statistics/Transaction.vue b/src/views/mobile/statistics/Transaction.vue
index 6be6ee43..66f1db9a 100644
--- a/src/views/mobile/statistics/Transaction.vue
+++ b/src/views/mobile/statistics/Transaction.vue
@@ -536,7 +536,7 @@ export default {
             const endTimeYear = this.$utilities.getYear(this.$utilities.parseDateFromUnixTime(query.endTime));
 
             const displayStartTime = this.$utilities.formatUnixTime(query.startTime, this.$t('format.date.short'));
-            const displayEndTime = this.$utilities.formatUnixTime(query.endTime, this.$t(startTimeYear !== endTimeYear ? 'format.date.short' : 'format.date.shortMonthDay'));
+            const displayEndTime = this.$utilities.formatUnixTime(query.endTime, this.$t(startTimeYear !== endTimeYear ? 'format.date.short' : 'format.monthDay.short'));
 
             return `${displayStartTime} ~ ${displayEndTime}`;
         }
diff --git a/src/views/mobile/transactions/List.vue b/src/views/mobile/transactions/List.vue
index dc75ad7c..5aea1ff1 100644
--- a/src/views/mobile/transactions/List.vue
+++ b/src/views/mobile/transactions/List.vue
@@ -137,7 +137,7 @@
                 <f7-card-header>
                     <f7-accordion-toggle class="full-line">
                         <small :style="{ opacity: 0.6 }">
-                            <span>{{ transactionMonthList.yearMonth | moment($t('format.date.yearMonth')) }}</span>
+                            <span>{{ transactionMonthList.yearMonth | moment($t('format.yearMonth.long')) }}</span>
                         </small>
                         <small class="transaction-amount-statistics" v-if="transactionMonthList.totalAmount">
                             <span class="text-color-red">
@@ -193,7 +193,7 @@
                                     <span>{{ transaction.comment }}</span>
                                 </div>
                                 <div slot="footer" class="transaction-footer">
-                                    <span>{{ transaction.time | moment($t('format.time.hourMinute')) }}</span>
+                                    <span>{{ transaction.time | moment($t('format.hourMinute.long')) }}</span>
                                     <span v-if="transaction.sourceAccount">·</span>
                                     <span v-if="transaction.sourceAccount">{{ transaction.sourceAccount.name }}</span>
                                     <span v-if="transaction.sourceAccount && transaction.type === $constants.transaction.allTransactionTypes.Transfer && transaction.destinationAccount && transaction.sourceAccount.id !== transaction.destinationAccount.id">→</span>