From fa612bc570e0ac4bc259bf242fb43153b9946884 Mon Sep 17 00:00:00 2001 From: hujj Date: Tue, 6 Aug 2024 14:35:12 +0800 Subject: [PATCH] feat: 1. Merge PR from rishacha (https://github.com/rishacha) 2. Add a setting for the calendar local, currently support "zh-cn" and "en-us" [#47] --- CHANGELOG.md | 7 ++++++- README.md | 4 ++++ README_zh_CN.md | 3 ++- i18n/en_US.json | 3 +-- i18n/zh_CN.json | 6 +----- plugin.json | 2 +- src/ScheduleManager.ts | 2 +- src/components/Settings.vue | 20 ++++++++++++-------- src/i18n/en_US.json | 3 +-- src/i18n/zh_CN.json | 6 +----- 10 files changed, 30 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c694e7..f1a100c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -135,4 +135,9 @@ ## v1.3.2 ### feat: -1. 在设置界面中增加是否显示农历的选项 [#48] \ No newline at end of file +1. 在设置界面中增加是否显示农历的选项 [#48] + +## v1.3.3 +### feat: +1. Merge PR from rishacha (https://github.com/rishacha) +2. 在设置界面中增加日历显示语言的选项，目前支持简体中文和英文 [#47] \ No newline at end of file diff --git a/README.md b/README.md index a34ae38..3789908 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,10 @@ # Schedule Manager +## Updates +1. Add the lunar calendar display switch in the settings +2. Add a setting for the calendar local + Note: Upgrading from version "1.0. x" to version "1.1. x" may require reopening the plugin to update the format of the schedule records ## Introduction diff --git a/README_zh_CN.md b/README_zh_CN.md index 535a55f..423914d 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -3,7 +3,8 @@ # 日程管理 ## 本次更新 -1. 添加节假日显示 +1. 在设置中增加是否显示农历的选项 +2. 在设置中增加日历显示语言的选项 最近事情比较多，先更新比较简单的功能吧，正在研究实现跨平台日程提醒，目前的思路是通过iCal、CalDav、Google Calendar等连接第三方日历应用（比如可以连接手机自带日历），将日程添加到这些日历应用中，不知道大家有没有更好的想法，可以在链滴上发帖子讨论，或者到github上提issue diff --git a/i18n/en_US.json b/i18n/en_US.json index b9bd4d4..aa18825 100644 --- a/i18n/en_US.json +++ b/i18n/en_US.json @@ -63,6 +63,5 @@ "gregorianCalendar": "Gregorian calendar", "lunarCalendar": "Lunar calendar", "showLunarCalendar": "Show chinese lunar calendar", - "selectLocale": "Select your locale", - "localeOptions":["en-us","zh-cn"] + "selectLocale": "Select your calendar locale" } \ No newline at end of file diff --git a/i18n/zh_CN.json b/i18n/zh_CN.json index 8657e27..c09b93b 100644 --- a/i18n/zh_CN.json +++ b/i18n/zh_CN.json @@ -63,9 +63,5 @@ "gregorianCalendar": "公历", "lunarCalendar": "农历", "showLunarCalendar": "显示农历", - "selectLocale": "Select your locale", - "localeOptions": [ - "zh-cn", - "en-us" - ] + "selectLocale": "日历语言设置" } \ No newline at end of file diff --git a/plugin.json b/plugin.json index dcad86e..f4c63b9 100644 --- a/plugin.json +++ b/plugin.json @@ -2,7 +2,7 @@ "name": "siyuan-plugin-schedule-manager", "author": "RogerHuHu", "url": "https://github.com/RogerHuHu/siyuan-plugin-schedule-manager", - "version": "1.3.2", + "version": "1.3.3", "minAppVersion": "2.10.6", "backends": ["all"], "frontends": ["all"], diff --git a/src/ScheduleManager.ts b/src/ScheduleManager.ts index c0fecb2..553788c 100644 --- a/src/ScheduleManager.ts +++ b/src/ScheduleManager.ts @@ -274,7 +274,7 @@ export class ScheduleManager { globalData.archiveTime = doc.archiveTime === undefined ? 7 : parseInt(doc.archiveTime, 10); globalData.selectedFirstDayOfWeek = doc.firstDayOfWeek === undefined ? 0 : doc.firstDayOfWeek; globalData.showLunarCalendar = doc.showLunarCalendar; - globalData.userLocale = doc.userLocale; + globalData.userLocale = doc.userLocale === undefined ? "zh-cn" : doc.userLocale; }) } } diff --git a/src/components/Settings.vue b/src/components/Settings.vue index b11e11c..a7834c4 100644 --- a/src/components/Settings.vue +++ b/src/components/Settings.vue @@ -43,10 +43,10 @@ - +
{{ selectLocaleText }}
 - + @@ -110,12 +110,16 @@ export default defineComponent({ } ], - localeOptions: i18n.localeOptions.map((locale,idx)=>{ - return { - value: idx, - label: locale + localeOptions: [ + { + label: "简体中文", + value: "zh-cn" + }, + { + label: "English(US)", + value: "en-us" } - }), + ], isShowLunarCalendar: ref(true) }; @@ -130,7 +134,7 @@ export default defineComponent({ mounted() { this.archiveTime = globalData.archiveTime; this.isShowLunarCalendar = globalData.showLunarCalendar; - // this.selectedLocale = globalData.userLocale; + this.selectedLocale = globalData.userLocale; }, methods: { diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index b9bd4d4..aa18825 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -63,6 +63,5 @@ "gregorianCalendar": "Gregorian calendar", "lunarCalendar": "Lunar calendar", "showLunarCalendar": "Show chinese lunar calendar", - "selectLocale": "Select your locale", - "localeOptions":["en-us","zh-cn"] + "selectLocale": "Select your calendar locale" } \ No newline at end of file diff --git a/src/i18n/zh_CN.json b/src/i18n/zh_CN.json index 8657e27..c09b93b 100644 --- a/src/i18n/zh_CN.json +++ b/src/i18n/zh_CN.json @@ -63,9 +63,5 @@ "gregorianCalendar": "公历", "lunarCalendar": "农历", "showLunarCalendar": "显示农历", - "selectLocale": "Select your locale", - "localeOptions": [ - "zh-cn", - "en-us" - ] + "selectLocale": "日历语言设置" } \ No newline at end of file