From d888c21653d5cf1ffd4e7a3f44909046d8ee8f62 Mon Sep 17 00:00:00 2001
From: jycouet <jycouet@gmail.com>
Date: Wed, 10 Jan 2024 21:37:01 +0100
Subject: [PATCH] add fr translation & use the "week" to fit the weekstartOn

---
 .../src/lib/components/DateRangeField.svelte  |  9 ++++----
 packages/svelte-ux/src/lib/utils/date.ts      | 21 +++++++++++++++++--
 .../svelte-ux/src/lib/utils/dictionary.ts     |  2 ++
 packages/svelte-ux/src/lib/utils/locale.ts    |  2 ++
 packages/svelte-ux/src/routes/+layout.svelte  |  8 +++++++
 5 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/packages/svelte-ux/src/lib/components/DateRangeField.svelte b/packages/svelte-ux/src/lib/components/DateRangeField.svelte
index 88b85f11e..8b783fd17 100644
--- a/packages/svelte-ux/src/lib/components/DateRangeField.svelte
+++ b/packages/svelte-ux/src/lib/components/DateRangeField.svelte
@@ -14,8 +14,7 @@
   import { getSettings } from './settings';
 
   const dispatch = createEventDispatcher();
-  const settings = getSettings();
-  const { format } = settings;
+  const { format } = getSettings();
 
   const _defaultValue: DateRangeType = {
     from: null,
@@ -28,9 +27,9 @@
   export let center: boolean = false;
   export let periodTypes: PeriodType[] = [
     PeriodType.Day,
-    PeriodType.WeekSun,
-    PeriodType.BiWeek1Sun,
-    // PeriodType.BiWeek2Sun,
+    PeriodType.Week,
+    PeriodType.BiWeek1,
+    // PeriodType.BiWeek2,
     PeriodType.Month,
     PeriodType.Quarter,
     PeriodType.CalendarYear,
diff --git a/packages/svelte-ux/src/lib/utils/date.ts b/packages/svelte-ux/src/lib/utils/date.ts
index 5c41116d3..c50ab483c 100644
--- a/packages/svelte-ux/src/lib/utils/date.ts
+++ b/packages/svelte-ux/src/lib/utils/date.ts
@@ -64,8 +64,15 @@ export function getPeriodTypeNameWithLocale(settings: LocaleSettings, periodType
   } = settings;
 
   switch (periodType) {
+    case PeriodType.Custom:
+      return 'Custom';
+
     case PeriodType.Day:
-      return dico?.Day;
+      return dico.Day;
+    case PeriodType.DayTime:
+      return dico.DayTime;
+    case PeriodType.TimeOnly:
+      return dico.Time;
 
     case PeriodType.WeekSun:
       return `${dico.Week} (${getDayOfWeekName(DayOfWeek.Sunday, locale)})`;
@@ -81,6 +88,8 @@ export function getPeriodTypeNameWithLocale(settings: LocaleSettings, periodType
       return `${dico.Week} (${getDayOfWeekName(5, locale)})`;
     case PeriodType.WeekSat:
       return `${dico.Week} (${getDayOfWeekName(6, locale)})`;
+    case PeriodType.Week:
+      return dico.Week;
 
     case PeriodType.Month:
       return dico.Month;
@@ -107,6 +116,8 @@ export function getPeriodTypeNameWithLocale(settings: LocaleSettings, periodType
       return `${dico.BiWeek} (${getDayOfWeekName(5, locale)})`;
     case PeriodType.BiWeek1Sat:
       return `${dico.BiWeek} (${getDayOfWeekName(6, locale)})`;
+    case PeriodType.BiWeek1:
+      return dico.BiWeek;
 
     case PeriodType.BiWeek2Sun:
       return `${dico.BiWeek} 2 (${getDayOfWeekName(0, locale)})`;
@@ -122,12 +133,18 @@ export function getPeriodTypeNameWithLocale(settings: LocaleSettings, periodType
       return `${dico.BiWeek} 2 (${getDayOfWeekName(5, locale)})`;
     case PeriodType.BiWeek2Sat:
       return `${dico.BiWeek} 2 (${getDayOfWeekName(6, locale)})`;
+    case PeriodType.BiWeek2:
+      return `${dico.BiWeek} 2`;
 
     default:
-      return 'Unknown';
+      assertNever(periodType); // This will now report unhandled cases
   }
 }
 
+function assertNever(x: never): never {
+  throw new Error(`Unhandled enum case: ${x}`);
+}
+
 export function getPeriodTypeCode(periodType: PeriodType) {
   switch (periodType) {
     case PeriodType.Day:
diff --git a/packages/svelte-ux/src/lib/utils/dictionary.ts b/packages/svelte-ux/src/lib/utils/dictionary.ts
index ad59883e0..015c28d26 100644
--- a/packages/svelte-ux/src/lib/utils/dictionary.ts
+++ b/packages/svelte-ux/src/lib/utils/dictionary.ts
@@ -4,6 +4,8 @@ export type DictionaryMessagesOptions = {
 
   Date?: {
     Day?: string;
+    DayTime?: string;
+    Time?: string;
     Week?: string;
     BiWeek?: string;
     Month?: string;
diff --git a/packages/svelte-ux/src/lib/utils/locale.ts b/packages/svelte-ux/src/lib/utils/locale.ts
index 307a54cd7..610ad92f0 100644
--- a/packages/svelte-ux/src/lib/utils/locale.ts
+++ b/packages/svelte-ux/src/lib/utils/locale.ts
@@ -86,6 +86,8 @@ const defaultLocaleSettings: LocaleSettings = {
     Cancel: 'Cancel',
     Date: {
       Day: 'Day',
+      DayTime: 'Day Time',
+      Time: 'Time',
       Week: 'Week',
       BiWeek: 'Bi-Week',
       Month: 'Month',
diff --git a/packages/svelte-ux/src/routes/+layout.svelte b/packages/svelte-ux/src/routes/+layout.svelte
index fc8abe81b..35b68d5b0 100644
--- a/packages/svelte-ux/src/routes/+layout.svelte
+++ b/packages/svelte-ux/src/routes/+layout.svelte
@@ -52,6 +52,14 @@
           Cancel: 'Annuler',
           Date: {
             Day: 'Jour',
+            DayTime: 'Jour & Heure',
+            Time: 'Heure',
+            Week: 'Semaine',
+            Month: 'Mois',
+            Quarter: 'Trimestre',
+            CalendarYear: 'Année',
+            FiscalYearOct: 'Année fiscale (octobre)',
+            BiWeek: 'Bi-hebdomadaire',
           },
         },
       }),