Fix timezone for tab title

bluecaret · Jul 29, 2023 · 21ac3ae · 21ac3ae
1 parent 1a7ec41
commit 21ac3ae
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/components/NewTab.vue b/src/components/NewTab.vue
@@ -70,7 +70,7 @@ const widgetNullCheck = (layer, widgetType, widget) => {
 }
 
 watch(
-  () => [store.config.global.tabTitle.type, store.currentTime],
+  () => [store.config.global.tabTitle.type, store.config.global.tabTitle.timezone, store.currentTime],
   () => {
     setTabTitle()
   }
@@ -80,7 +80,10 @@ const setTabTitle = () => {
   if (store.config.global.tabTitle.type === 'custom') {
     document.title = store.config.global.tabTitle.custom
   } else if (store.config.global.tabTitle.type === 'datetime') {
-    document.title = DateTime.fromJSDate(store.currentTime).toFormat(store.config.global.tabTitle.datetime)
+    document.title = DateTime.fromJSDate(store.currentTime)
+      .setLocale(store.config.global.lang)
+      .setZone(store.config.global.tabTitle.timezone ? store.config.global.tabTitle.timezone : 'default')
+      .toFormat(store.config.global.tabTitle.datetime)
   } else {
     document.title = 'New Tab'
   }

diff --git a/src/components/widgets/DigitalClockWidget.vue b/src/components/widgets/DigitalClockWidget.vue
@@ -84,7 +84,7 @@ const getFormattedTime = computed(() => {
   if (props.widget.timezone) {
     tz = props.widget.timezone !== 'local' ? props.widget.timezone : 'default'
   }
-  return DateTime.fromJSDate(store.currentTime).setZone(tz)
+  return DateTime.fromJSDate(store.currentTime).setLocale(store.config.global.lang).setZone(tz)
 })
 
 const getRelativeTime = computed(() => {