- 修复l10n冲突问题

- 优化无安排视图的星期显示颜色
ipuppet · Oct 9, 2021 · 275b06c · 275b06c
1 parent fec9ea0
commit 275b06c
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 25 deletions.
diff --git a/config.json b/config.json
@@ -1,7 +1,7 @@
 {
     "info": {
         "name": "WAIO",
-        "version": "1.4.7",
+        "version": "1.4.8",
         "author": "ipuppet",
         "module": false
     },

diff --git a/scripts/widget/Calendar/calendar.js b/scripts/widget/Calendar/calendar.js
@@ -26,13 +26,13 @@ class Calendar {
 
     localizedWeek(index) {
         const week = [
-            $l10n("SUNDAY"),
-            $l10n("MONDAY"),
-            $l10n("TUESDAY"),
-            $l10n("WEDNESDAY"),
-            $l10n("THURSDAY"),
-            $l10n("FRIDAY"),
-            $l10n("SATURDAY")
+            $l10n("SHORT_SUNDAY"),
+            $l10n("SHORT_MONDAY"),
+            $l10n("SHORT_TUESDAY"),
+            $l10n("SHORT_WEDNESDAY"),
+            $l10n("SHORT_THURSDAY"),
+            $l10n("SHORT_FRIDAY"),
+            $l10n("SHORT_SATURDAY")
         ]
         if (this.firstDayOfWeek === 1) {
             index += 1

diff --git a/scripts/widget/Calendar/strings/en.strings b/scripts/widget/Calendar/strings/en.strings
@@ -6,13 +6,13 @@
 "_SUNDAY" = "Sunday";
 "_MONDAY" = "Monday";
 
-"SUNDAY" = "S";
-"MONDAY" = "M";
-"TUESDAY" = "T";
-"WEDNESDAY" = "W";
-"THURSDAY" = "T";
-"FRIDAY" = "F";
-"SATURDAY" = "S";
+"SHORT_SUNDAY" = "S";
+"SHORT_MONDAY" = "M";
+"SHORT_TUESDAY" = "T";
+"SHORT_WEDNESDAY" = "W";
+"SHORT_THURSDAY" = "T";
+"SHORT_FRIDAY" = "F";
+"SHORT_SATURDAY" = "S";
 
 "BLANK_MONTH" = " ";
 "JANUARY_C" = "January";

diff --git a/scripts/widget/Calendar/strings/zh-Hans.strings b/scripts/widget/Calendar/strings/zh-Hans.strings
@@ -6,13 +6,13 @@
 "_SUNDAY" = "周日";
 "_MONDAY" = "周一";
 
-"SUNDAY" = "日";
-"MONDAY" = "一";
-"TUESDAY" = "二";
-"WEDNESDAY" = "三";
-"THURSDAY" = "四";
-"FRIDAY" = "五";
-"SATURDAY" = "六";
+"SHORT_SUNDAY" = "日";
+"SHORT_MONDAY" = "一";
+"SHORT_TUESDAY" = "二";
+"SHORT_WEDNESDAY" = "三";
+"SHORT_THURSDAY" = "四";
+"SHORT_FRIDAY" = "五";
+"SHORT_SATURDAY" = "六";
 
 "BLANK_MONTH" = "月";
 "JANUARY_C" = "一";

diff --git a/scripts/widget/Schedule/schedule.js b/scripts/widget/Schedule/schedule.js
@@ -238,6 +238,7 @@ class Schedule {
      */
     scheduleView(family) {
         const nothingView = (text) => {
+            const date = new Date()
             return {
                 type: "vstack",
                 props: {
@@ -271,8 +272,9 @@ class Schedule {
                                         maxWidth: Infinity,
                                         alignment: $widget.alignment.leading
                                     },
-                                    text: this.week[new Date().getDay()],
+                                    text: this.week[date.getDay()],
                                     font: $font(11),
+                                    color: this.colorDate,
                                     widgetURL: this.urlScheme
                                 }
                             },
@@ -285,7 +287,7 @@ class Schedule {
                                         maxWidth: Infinity,
                                         alignment: $widget.alignment.leading
                                     },
-                                    text: String(new Date().getDate()),
+                                    text: String(date.getDate()),
                                     font: $font(33),
                                     widgetURL: this.urlScheme
                                 }

diff --git a/scripts/widget/Schedule/strings/en.strings b/scripts/widget/Schedule/strings/en.strings
@@ -20,7 +20,7 @@
 "REMINDER_COLOR" = "Reminder Color";
 "NO_CALENDAR" = "No Schedule";
 "NO_REMINDER" = "No Reminder";
-"NO_CALENDAR&REMINDER" = "No Schedule";
+"NO_CALENDAR&REMINDER" = "No Events";
 "ITEM_LENGTH" = "Items to Display";
 "CLICK_EVENT" = "Click Event";
 "REMINDER" = "Reminder";