From 21932b298d1ed06ee85430799f2053bbd0882d25 Mon Sep 17 00:00:00 2001
From: Rishabh Chakrabarti <Rishabh.Chakrabarti@ibm.com>
Date: Sun, 4 Aug 2024 05:10:05 +0530
Subject: [PATCH 1/6] Added selectable locale fix

Added i18n options
---
 i18n/en_US.json             |  4 +++-
 i18n/zh_CN.json             |  6 +++++-
 src/components/Calendar.vue |  2 +-
 src/components/Settings.vue | 28 ++++++++++++++++++++++++++++
 src/i18n/en_US.json         |  4 +++-
 src/utils/utils.ts          |  3 ++-
 6 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/i18n/en_US.json b/i18n/en_US.json
index 938a228..7887767 100644
--- a/i18n/en_US.json
+++ b/i18n/en_US.json
@@ -62,5 +62,7 @@
   "firstDayOfWeek": "First day of week",
   "gregorianCalendar": "Gregorian calendar",
   "lunarCalendar": "Lunar calendar",
-  "showLunarCalendar": "Show chinese lunar calendar"
+  "showLunarCalendar": "Show chinese lunar calendar",
+  "selectLocale": "Select your locale",
+  "localeOptions":["en-US","zh-CN"]
 }
\ No newline at end of file
diff --git a/i18n/zh_CN.json b/i18n/zh_CN.json
index a261216..94c8fcd 100644
--- a/i18n/zh_CN.json
+++ b/i18n/zh_CN.json
@@ -62,5 +62,9 @@
   "firstDayOfWeek": "一周开始",
   "gregorianCalendar": "公历",
   "lunarCalendar": "农历",
-  "showLunarCalendar": "显示农历"
+  "showLunarCalendar": "显示农历",
+  "localeOptions": [
+    "zh-CN",
+    "en-US"
+  ]
 }
diff --git a/src/components/Calendar.vue b/src/components/Calendar.vue
index d35c00d..70b2cde 100644
--- a/src/components/Calendar.vue
+++ b/src/components/Calendar.vue
@@ -73,7 +73,7 @@
           plugins: [dayGridPlugin, interactionPlugin, timeGridPlugin, listPlugin, rrulePlugin],
           initialView: 'dayGridMonth', // 默认为哪个视图（月： dayGridMonth，周：timeGridWeek，日：timeGridDay）
           firstDay: 1, // 设置一周中显示的第一天是哪天，周日是 0，周一是 1， 类推
-          locale: 'zh-cn', // 切换语言，当前为中文
+          locale: globalData.userLocale, // 切换语言，当前为中文
           eventColor: '#3BB2E3', // 全部日历日程背景色
           initialDate: moment().format('YYYY-MM-DD'), // 自定义设置背景颜色时，一定要初始化日期时间
           //aspectRatio: 1.65, // 设置日历单元格宽度与高度的比例
diff --git a/src/components/Settings.vue b/src/components/Settings.vue
index ed3f8c4..94c6a47 100644
--- a/src/components/Settings.vue
+++ b/src/components/Settings.vue
@@ -43,6 +43,19 @@
       <n-gi>
         <n-switch v-model:value="isShowLunarCalendar" @update:value="handleUpdateShowLunarCalendar"/>
       </n-gi>
+      <n-gi :span="6">
+        <div class="sm-schedule-item-header" style="margin-top: 3px;">{{ selectLocaleText }}</div>
+      </n-gi>
+      <n-gi>
+        <n-select :options="localeOptions" size="tiny" v-model:value="selectedLocale" />
+      </n-gi>
+      <n-gi>
+        <n-button quaternary circle size="small" @click="handleUpdateLocale()">
+          <template #icon>
+            <n-icon :component="CheckOutlined" color="#18a058" />
+          </template>
+        </n-button>
+      </n-gi>
       <!--n-gi :span="8">
         <n-button strong secondary round type="info" @click="handleTest()">
           {{ archiveText }}
@@ -80,8 +93,10 @@ export default defineComponent({
       dayText: i18n.day,
       archiveText: i18n.archive,
       showLunarCalendarText: i18n.showLunarCalendar,
+      selectLocaleText: i18n.selectLocale,
       archiveTime: ref(7),
       selectedDay: ref(1),
+      selectedLocale: ref(1),
       calDavClient: CalDavClient,
 
       firstDaysOfWeek: [
@@ -95,6 +110,13 @@ export default defineComponent({
         }
       ],
 
+      localeOptions: i18n.localeOptions.map((locale,idx)=>{
+        return {
+          value: idx,
+          label: locale
+        }
+      }),
+
       isShowLunarCalendar: ref(true)
     };  
   },
@@ -108,6 +130,7 @@ export default defineComponent({
   mounted() {
     this.archiveTime = globalData.archiveTime;
     this.isShowLunarCalendar = globalData.showLunarCalendar;
+    this.selectedLocale = globalData.userLocale;
   },
 
   methods: {
@@ -129,6 +152,11 @@ export default defineComponent({
       EventAggregator.emit('updateShowLunarCalendar', this.isShowLunarCalendar);
       showMessage(i18n.hasUpdated, 6000, "info");
     },
+    handleUpdateLocale() {
+      EventAggregator.emit('updateLocale', this.selectLocale);
+      this.globalData.userLocale = this.selectedLocale;
+      showMessage(i18n.hasUpdated, 6000, "info");
+    },
 
     handleTest() {
       this.calDavClient = new CalDavClient("https://calendar.dingtalk.com/dav/users/u_oslxrjui", "u_oslxrjui", "ow5kp2zd");
diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json
index 938a228..aa4bbf9 100644
--- a/src/i18n/en_US.json
+++ b/src/i18n/en_US.json
@@ -62,5 +62,7 @@
   "firstDayOfWeek": "First day of week",
   "gregorianCalendar": "Gregorian calendar",
   "lunarCalendar": "Lunar calendar",
-  "showLunarCalendar": "Show chinese lunar calendar"
+  "showLunarCalendar": "Show chinese lunar calendar",
+  "selectLocale": "Select your locale",
+  "locales":["en-US","zh-CN"]
 }
\ No newline at end of file
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index 97d5ab6..cf78854 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -31,7 +31,8 @@ export const globalData = {
     scheduleStatusLogo: ['☕', '🏃‍♂️', '✅', '📦'],
     archiveTime: 7,
     selectedFirstDayOfWeek: 1,
-    showLunarCalendar: true
+    showLunarCalendar: true,
+    userLocale: 'zh-CN'
 }
 
 export enum smColor {

From 7bd55d7a0832b98868fd0beaa566dbcfa2b0f157 Mon Sep 17 00:00:00 2001
From: Rishabh Chakrabarti <Rishabh.Chakrabarti@ibm.com>
Date: Sun, 4 Aug 2024 05:31:52 +0530
Subject: [PATCH 2/6] Added i18n options

---
 i18n/en_US.json | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/i18n/en_US.json b/i18n/en_US.json
index 7887767..dd94853 100644
--- a/i18n/en_US.json
+++ b/i18n/en_US.json
@@ -3,7 +3,7 @@
   "calendar": "Calendar",
   "kanban": "Kanban",
   "scheduleManager": "Schedule manager",
-  "addScheduleCategory":"Add Schedule Category",
+  "addScheduleCategory": "Add Schedule Category",
   "scheduleCategory": "Category",
   "add": "Add",
   "inputScheduleCategoryName": "Schedule Category Name",
@@ -64,5 +64,8 @@
   "lunarCalendar": "Lunar calendar",
   "showLunarCalendar": "Show chinese lunar calendar",
   "selectLocale": "Select your locale",
-  "localeOptions":["en-US","zh-CN"]
+  "localeOptions": [
+    "en-US",
+    "zh-CN"
+  ]
 }
\ No newline at end of file

From 46a9469531ba1d32969456ab4fc4e9b6cc6c2fb2 Mon Sep 17 00:00:00 2001
From: Rishabh Chakrabarti <Rishabh.Chakrabarti@ibm.com>
Date: Sun, 4 Aug 2024 06:41:01 +0530
Subject: [PATCH 3/6] Added eventaggregator options

---
 i18n/zh_CN.json             |  1 +
 src/ScheduleManager.ts      | 22 +++++++++++++++++++---
 src/components/Settings.vue |  5 ++---
 src/i18n/zh_CN.json         | 11 ++++++++---
 4 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/i18n/zh_CN.json b/i18n/zh_CN.json
index 94c8fcd..3036fa3 100644
--- a/i18n/zh_CN.json
+++ b/i18n/zh_CN.json
@@ -63,6 +63,7 @@
   "gregorianCalendar": "公历",
   "lunarCalendar": "农历",
   "showLunarCalendar": "显示农历",
+  "selectLocale": "Select your locale",
   "localeOptions": [
     "zh-CN",
     "en-US"
diff --git a/src/ScheduleManager.ts b/src/ScheduleManager.ts
index 495eb4f..cc53510 100644
--- a/src/ScheduleManager.ts
+++ b/src/ScheduleManager.ts
@@ -94,11 +94,15 @@ export class ScheduleManager {
         EventAggregator.on('updateShowLunarCalendar', (p:any) => {
             this.setDocumentShowLunarCalendarProperty(p);
         })
+
+        EventAggregator.on('updateLocale', (p:any) => {
+            this.setDocumentUserLocale(p);
+        });
     }
 
     async createDocumentAndSetAttributes(notebookId: string, docProp: any) {
         await this.createDocument(notebookId, docProp);
-        await this.setDocumentProperty(this.docId, docProp.checked, docProp.color, 7, 1, true);
+        await this.setDocumentProperty(this.docId, docProp.checked, docProp.color, 7, 1, true,"zh-CN");
         let document = {
             id: this.docId,
             name: docProp.name,
@@ -150,7 +154,7 @@ export class ScheduleManager {
         });
     }
 
-    async setDocumentProperty(docId: string, checked: boolean, color: string, archiveTime: number, firstDayOfWeek: number, showLunarCalendar: boolean) {
+    async setDocumentProperty(docId: string, checked: boolean, color: string, archiveTime: number, firstDayOfWeek: number, showLunarCalendar: boolean,userLocale:string) {
         await fetchSyncPost("/api/attr/setBlockAttrs", {
             "id": docId,
             "attrs": {
@@ -159,7 +163,8 @@ export class ScheduleManager {
                 "custom-version": "1.1.0",
                 "custom-archiveTime": archiveTime.toString(),
                 "custom-firstDayOfWeek": firstDayOfWeek.toString(),
-                "custom-showLunarCalendar": showLunarCalendar ? "true" : "false"
+                "custom-showLunarCalendar": showLunarCalendar ? "true" : "false",
+                "custom-userLocale": userLocale.toString()
             }
         }).then(response => {
 
@@ -215,6 +220,17 @@ export class ScheduleManager {
         }
     }
 
+    async setDocumentUserLocale(locale: string) {
+        for(let document of this.documents) {
+            await fetchSyncPost("/api/attr/setBlockAttrs", {
+                "id": document.id,
+                "attrs": {
+                    "custom-userLocale": locale.toString()
+                }
+            });
+        }
+    }
+
     async setDocumentShowLunarCalendarProperty(showLunarCalendar: boolean) {
         for(let document of this.documents) {
             await fetchSyncPost("/api/attr/setBlockAttrs", {
diff --git a/src/components/Settings.vue b/src/components/Settings.vue
index 94c6a47..b413f91 100644
--- a/src/components/Settings.vue
+++ b/src/components/Settings.vue
@@ -96,7 +96,7 @@ export default defineComponent({
       selectLocaleText: i18n.selectLocale,
       archiveTime: ref(7),
       selectedDay: ref(1),
-      selectedLocale: ref(1),
+      selectedLocale: i18n.localeOptions[0],
       calDavClient: CalDavClient,
 
       firstDaysOfWeek: [
@@ -153,8 +153,7 @@ export default defineComponent({
       showMessage(i18n.hasUpdated, 6000, "info");
     },
     handleUpdateLocale() {
-      EventAggregator.emit('updateLocale', this.selectLocale);
-      this.globalData.userLocale = this.selectedLocale;
+      EventAggregator.emit('updateLocale', this.selectedLocale);
       showMessage(i18n.hasUpdated, 6000, "info");
     },
 
diff --git a/src/i18n/zh_CN.json b/src/i18n/zh_CN.json
index a261216..f031260 100644
--- a/src/i18n/zh_CN.json
+++ b/src/i18n/zh_CN.json
@@ -3,7 +3,7 @@
   "calendar": "日历",
   "kanban": "看板",
   "scheduleManager": "日程管理",
-  "addScheduleCategory":"添加日程分类",
+  "addScheduleCategory": "添加日程分类",
   "scheduleCategory": "日程分类",
   "inputScheduleCategoryName": "请输入日程分类名",
   "scheduleCategoryColorError": "日程分类颜色不能重复",
@@ -62,5 +62,10 @@
   "firstDayOfWeek": "一周开始",
   "gregorianCalendar": "公历",
   "lunarCalendar": "农历",
-  "showLunarCalendar": "显示农历"
-}
+  "showLunarCalendar": "显示农历",
+  "selectLocale": "Select your locale",
+  "locales": [
+    "zh-CN",
+    "en-US"
+  ]
+}
\ No newline at end of file

From adafc0c461bac5d95de0075f4242a83fd3781b08 Mon Sep 17 00:00:00 2001
From: Rishabh Chakrabarti <Rishabh.Chakrabarti@ibm.com>
Date: Sun, 4 Aug 2024 06:50:19 +0530
Subject: [PATCH 4/6] Added i18n case fixes

---
 i18n/en_US.json     | 4 ++--
 i18n/zh_CN.json     | 4 ++--
 src/i18n/en_US.json | 2 +-
 src/i18n/zh_CN.json | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/i18n/en_US.json b/i18n/en_US.json
index dd94853..69563bf 100644
--- a/i18n/en_US.json
+++ b/i18n/en_US.json
@@ -65,7 +65,7 @@
   "showLunarCalendar": "Show chinese lunar calendar",
   "selectLocale": "Select your locale",
   "localeOptions": [
-    "en-US",
-    "zh-CN"
+    "en-us",
+    "zh-cn"
   ]
 }
\ No newline at end of file
diff --git a/i18n/zh_CN.json b/i18n/zh_CN.json
index 3036fa3..8f400fe 100644
--- a/i18n/zh_CN.json
+++ b/i18n/zh_CN.json
@@ -65,7 +65,7 @@
   "showLunarCalendar": "显示农历",
   "selectLocale": "Select your locale",
   "localeOptions": [
-    "zh-CN",
-    "en-US"
+    "zh-cn",
+    "en-us"
   ]
 }
diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json
index aa4bbf9..f2c092b 100644
--- a/src/i18n/en_US.json
+++ b/src/i18n/en_US.json
@@ -64,5 +64,5 @@
   "lunarCalendar": "Lunar calendar",
   "showLunarCalendar": "Show chinese lunar calendar",
   "selectLocale": "Select your locale",
-  "locales":["en-US","zh-CN"]
+  "locales":["en-us","zh-cn"]
 }
\ No newline at end of file
diff --git a/src/i18n/zh_CN.json b/src/i18n/zh_CN.json
index f031260..ecdbe64 100644
--- a/src/i18n/zh_CN.json
+++ b/src/i18n/zh_CN.json
@@ -65,7 +65,7 @@
   "showLunarCalendar": "显示农历",
   "selectLocale": "Select your locale",
   "locales": [
-    "zh-CN",
-    "en-US"
+    "zh-cn",
+    "en-us"
   ]
 }
\ No newline at end of file

From aefaf5e0b3de724aa1070e0e450c09b2ea58e03e Mon Sep 17 00:00:00 2001
From: Rishabh Chakrabarti <Rishabh.Chakrabarti@ibm.com>
Date: Sun, 4 Aug 2024 07:13:20 +0530
Subject: [PATCH 5/6] Minor fixes

---
 src/ScheduleCategories.ts   | 1 -
 src/ScheduleManager.ts      | 2 +-
 src/components/Calendar.vue | 4 +++-
 src/i18n/en_US.json         | 2 +-
 src/i18n/zh_CN.json         | 2 +-
 src/utils/utils.ts          | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/ScheduleCategories.ts b/src/ScheduleCategories.ts
index 56f3f68..df2c67d 100644
--- a/src/ScheduleCategories.ts
+++ b/src/ScheduleCategories.ts
@@ -1,6 +1,5 @@
 import { ScheduleCategory } from "./ScheduleCategory";
 import { Schedule } from "./Schedule";
-import { el, tr } from "date-fns/locale";
 import { fcApi, globalData } from "./utils/utils";
 import EventAggregator from "./utils/EventAggregator";
 import { reactive } from "vue"
diff --git a/src/ScheduleManager.ts b/src/ScheduleManager.ts
index cc53510..a01ecf6 100644
--- a/src/ScheduleManager.ts
+++ b/src/ScheduleManager.ts
@@ -102,7 +102,7 @@ export class ScheduleManager {
 
     async createDocumentAndSetAttributes(notebookId: string, docProp: any) {
         await this.createDocument(notebookId, docProp);
-        await this.setDocumentProperty(this.docId, docProp.checked, docProp.color, 7, 1, true,"zh-CN");
+        await this.setDocumentProperty(this.docId, docProp.checked, docProp.color, 7, 1, true,"zh-cn");
         let document = {
             id: this.docId,
             name: docProp.name,
diff --git a/src/components/Calendar.vue b/src/components/Calendar.vue
index 70b2cde..742cd2c 100644
--- a/src/components/Calendar.vue
+++ b/src/components/Calendar.vue
@@ -66,6 +66,7 @@
     },
 
     data() {
+      console.log(globalData)
       return {
         globalData,
         
@@ -73,7 +74,7 @@
           plugins: [dayGridPlugin, interactionPlugin, timeGridPlugin, listPlugin, rrulePlugin],
           initialView: 'dayGridMonth', // 默认为哪个视图（月： dayGridMonth，周：timeGridWeek，日：timeGridDay）
           firstDay: 1, // 设置一周中显示的第一天是哪天，周日是 0，周一是 1， 类推
-          locale: globalData.userLocale, // 切换语言，当前为中文
+          locale: i18n.localeOptions[0], // 切换语言，当前为中文
           eventColor: '#3BB2E3', // 全部日历日程背景色
           initialDate: moment().format('YYYY-MM-DD'), // 自定义设置背景颜色时，一定要初始化日期时间
           //aspectRatio: 1.65, // 设置日历单元格宽度与高度的比例
@@ -155,6 +156,7 @@
     mounted() {
       setFCApi(this.$refs.fullCalendar.getApi());
       this.calendarOptions.firstDay = globalData.selectedFirstDayOfWeek;
+      this.calendarOptions.locale = globalData.userLocale;
       EventAggregator.emit('readCategories');
       EventAggregator.on('resize', () => {
           setTimeout(() => {
diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json
index f2c092b..b9bd4d4 100644
--- a/src/i18n/en_US.json
+++ b/src/i18n/en_US.json
@@ -64,5 +64,5 @@
   "lunarCalendar": "Lunar calendar",
   "showLunarCalendar": "Show chinese lunar calendar",
   "selectLocale": "Select your locale",
-  "locales":["en-us","zh-cn"]
+  "localeOptions":["en-us","zh-cn"]
 }
\ No newline at end of file
diff --git a/src/i18n/zh_CN.json b/src/i18n/zh_CN.json
index ecdbe64..8657e27 100644
--- a/src/i18n/zh_CN.json
+++ b/src/i18n/zh_CN.json
@@ -64,7 +64,7 @@
   "lunarCalendar": "农历",
   "showLunarCalendar": "显示农历",
   "selectLocale": "Select your locale",
-  "locales": [
+  "localeOptions": [
     "zh-cn",
     "en-us"
   ]
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index cf78854..eab96c3 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -32,7 +32,7 @@ export const globalData = {
     archiveTime: 7,
     selectedFirstDayOfWeek: 1,
     showLunarCalendar: true,
-    userLocale: 'zh-CN'
+    userLocale: 'zh-cn'
 }
 
 export enum smColor {

From 4f64a3f9d5e345659d382cfb401681c0a130b1c8 Mon Sep 17 00:00:00 2001
From: Rishabh Chakrabarti <Rishabh.Chakrabarti@ibm.com>
Date: Sun, 4 Aug 2024 08:26:26 +0530
Subject: [PATCH 6/6] Tried fixing persistence

---
 i18n/en_US.json             |  7 ++-----
 i18n/zh_CN.json             |  4 ++--
 src/ScheduleManager.ts      | 10 +++++++---
 src/components/Calendar.vue |  4 ++--
 src/components/Settings.vue |  4 ++--
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/i18n/en_US.json b/i18n/en_US.json
index 69563bf..b9bd4d4 100644
--- a/i18n/en_US.json
+++ b/i18n/en_US.json
@@ -3,7 +3,7 @@
   "calendar": "Calendar",
   "kanban": "Kanban",
   "scheduleManager": "Schedule manager",
-  "addScheduleCategory": "Add Schedule Category",
+  "addScheduleCategory":"Add Schedule Category",
   "scheduleCategory": "Category",
   "add": "Add",
   "inputScheduleCategoryName": "Schedule Category Name",
@@ -64,8 +64,5 @@
   "lunarCalendar": "Lunar calendar",
   "showLunarCalendar": "Show chinese lunar calendar",
   "selectLocale": "Select your locale",
-  "localeOptions": [
-    "en-us",
-    "zh-cn"
-  ]
+  "localeOptions":["en-us","zh-cn"]
 }
\ No newline at end of file
diff --git a/i18n/zh_CN.json b/i18n/zh_CN.json
index 8f400fe..8657e27 100644
--- a/i18n/zh_CN.json
+++ b/i18n/zh_CN.json
@@ -3,7 +3,7 @@
   "calendar": "日历",
   "kanban": "看板",
   "scheduleManager": "日程管理",
-  "addScheduleCategory":"添加日程分类",
+  "addScheduleCategory": "添加日程分类",
   "scheduleCategory": "日程分类",
   "inputScheduleCategoryName": "请输入日程分类名",
   "scheduleCategoryColorError": "日程分类颜色不能重复",
@@ -68,4 +68,4 @@
     "zh-cn",
     "en-us"
   ]
-}
+}
\ No newline at end of file
diff --git a/src/ScheduleManager.ts b/src/ScheduleManager.ts
index a01ecf6..c0fecb2 100644
--- a/src/ScheduleManager.ts
+++ b/src/ScheduleManager.ts
@@ -102,7 +102,7 @@ export class ScheduleManager {
 
     async createDocumentAndSetAttributes(notebookId: string, docProp: any) {
         await this.createDocument(notebookId, docProp);
-        await this.setDocumentProperty(this.docId, docProp.checked, docProp.color, 7, 1, true,"zh-cn");
+        await this.setDocumentProperty(this.docId, docProp.checked, docProp.color, 7, 1, true,1);
         let document = {
             id: this.docId,
             name: docProp.name,
@@ -154,7 +154,7 @@ export class ScheduleManager {
         });
     }
 
-    async setDocumentProperty(docId: string, checked: boolean, color: string, archiveTime: number, firstDayOfWeek: number, showLunarCalendar: boolean,userLocale:string) {
+    async setDocumentProperty(docId: string, checked: boolean, color: string, archiveTime: number, firstDayOfWeek: number, showLunarCalendar: boolean,userLocale:number) {
         await fetchSyncPost("/api/attr/setBlockAttrs", {
             "id": docId,
             "attrs": {
@@ -221,6 +221,7 @@ export class ScheduleManager {
     }
 
     async setDocumentUserLocale(locale: string) {
+        console.log("Set Document User Locale", locale)
         for(let document of this.documents) {
             await fetchSyncPost("/api/attr/setBlockAttrs", {
                 "id": document.id,
@@ -262,15 +263,18 @@ export class ScheduleManager {
     async getDocumentsName() {
         for(let doc of this.documents) {
             await fetchSyncPost("/api/attr/getBlockAttrs", {"id":doc.id}).then(response => {
+                console.log("Get Document Name",response.data)
                 doc.name = response.data.title;
                 doc.checked = response.data["custom-checked"] === "true" ? true : false;
                 doc.color = response.data["custom-color"];
                 doc.archiveTime = response.data['custom-archiveTime'];
                 doc.firstDayOfWeek = response.data["custom-firstDayOfWeek"];
                 doc.showLunarCalendar = response.data["custom-showLunarCalendar"] == "true" ? true : false;
+                doc.userLocale = response.data["custom-userLocale"];
                 globalData.archiveTime = doc.archiveTime === undefined ? 7 : parseInt(doc.archiveTime, 10);
                 globalData.selectedFirstDayOfWeek = doc.firstDayOfWeek === undefined ? 0 : doc.firstDayOfWeek;
-                globalData.showLunarCalendar = doc.showLunarCalendar
+                globalData.showLunarCalendar = doc.showLunarCalendar;
+                globalData.userLocale = doc.userLocale;
             })
         }
     }
diff --git a/src/components/Calendar.vue b/src/components/Calendar.vue
index 742cd2c..80006da 100644
--- a/src/components/Calendar.vue
+++ b/src/components/Calendar.vue
@@ -66,7 +66,7 @@
     },
 
     data() {
-      console.log(globalData)
+      // console.log(globalData)
       return {
         globalData,
         
@@ -74,7 +74,7 @@
           plugins: [dayGridPlugin, interactionPlugin, timeGridPlugin, listPlugin, rrulePlugin],
           initialView: 'dayGridMonth', // 默认为哪个视图（月： dayGridMonth，周：timeGridWeek，日：timeGridDay）
           firstDay: 1, // 设置一周中显示的第一天是哪天，周日是 0，周一是 1， 类推
-          locale: i18n.localeOptions[0], // 切换语言，当前为中文
+          locale: globalData.userLocale, // 切换语言，当前为中文
           eventColor: '#3BB2E3', // 全部日历日程背景色
           initialDate: moment().format('YYYY-MM-DD'), // 自定义设置背景颜色时，一定要初始化日期时间
           //aspectRatio: 1.65, // 设置日历单元格宽度与高度的比例
diff --git a/src/components/Settings.vue b/src/components/Settings.vue
index b413f91..b11e11c 100644
--- a/src/components/Settings.vue
+++ b/src/components/Settings.vue
@@ -96,7 +96,7 @@ export default defineComponent({
       selectLocaleText: i18n.selectLocale,
       archiveTime: ref(7),
       selectedDay: ref(1),
-      selectedLocale: i18n.localeOptions[0],
+      selectedLocale: ref(0),
       calDavClient: CalDavClient,
 
       firstDaysOfWeek: [
@@ -130,7 +130,7 @@ export default defineComponent({
   mounted() {
     this.archiveTime = globalData.archiveTime;
     this.isShowLunarCalendar = globalData.showLunarCalendar;
-    this.selectedLocale = globalData.userLocale;
+    // this.selectedLocale = globalData.userLocale;
   },
 
   methods: {