Fix platform dependent call on weekInfo

marcusolsson · Nov 20, 2024 · abbfef1 · abbfef1
1 parent 0086e76
commit abbfef1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/obsidianProjects.d.ts b/src/obsidianProjects.d.ts
@@ -1,14 +1,13 @@
 import type { DataFrame } from "./lib/dataframe/dataframe";
 
 declare global {
-  // eslint-disable-next-line @typescript-eslint/no-namespace
   namespace Intl {
     interface Locale {
-      weekInfo: {
-        firstDay: number;
-      };
+      weekInfo?: WeekInfo;
+      getWeekInfo?: () => WeekInfo;
     }
   }
+  type WeekInfo = { firstDay: number; weekend: number[]; minimalDays: number };
 }
 
 declare module "obsidian" {

diff --git a/src/ui/views/Calendar/calendar.ts b/src/ui/views/Calendar/calendar.ts
@@ -225,7 +225,15 @@ export function getFirstDayOfWeek(day: FirstDayOfWeek): number {
       return 0;
     case "monday":
       return 1;
-    case "default":
-      return getLocale("obsidian").weekInfo.firstDay;
+    case "default": {
+      const obLocale = getLocale("obsidian");
+      if (obLocale.weekInfo) {
+        return obLocale.weekInfo.firstDay ?? 0;
+      }
+      if (typeof obLocale.getWeekInfo === "function") {
+        return obLocale.getWeekInfo().firstDay ?? 0;
+      }
+      return 0;
+    }
   }
 }