refactor: modify LocaleProvider and move dayjs langs to locales.ts

Bitnoise · Feb 9, 2024 · 97fadef · 97fadef
1 parent 48dcfb9
commit 97fadef
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/src/context/LocaleProvider/LocaleProvider.tsx b/src/context/LocaleProvider/LocaleProvider.tsx
@@ -1,8 +1,5 @@
 import { useCallback, useContext, useEffect, useState } from "react";
 import dayjs from "dayjs";
-import en from "dayjs/locale/en";
-import pl from "dayjs/locale/pl";
-import de from "dayjs/locale/de";
 import { LangCodes } from "@/types/global";
 import { localeContext } from "./localeContext";
 import { locales } from "./locales";
@@ -15,9 +12,11 @@ const LocaleProvider = ({ children, lang }: LocaleProviderProps) => {
     const locale = locales.find((l) => {
       return l.id === localLang;
     });
-    locale?.id === "en" && dayjs.locale({ ...en });
-    locale?.id === "pl" && dayjs.locale({ ...pl });
-    locale?.id === "de" && dayjs.locale({ ...de });
+
+    if (typeof locale?.dayjsTranslations === "object") {
+      dayjs.locale({ ...locale.dayjsTranslations });
+    }
+
     return locale || locales[0];
   }, [localLang]);
 

diff --git a/src/context/LocaleProvider/locales.ts b/src/context/LocaleProvider/locales.ts
@@ -1,3 +1,6 @@
+import enDayjsTranslations from "dayjs/locale/en";
+import plDayjsTranslations from "dayjs/locale/pl";
+import deDayjsTranslations from "dayjs/locale/de";
 import { en } from "@/locales/en";
 import { pl } from "@/locales/pl";
 import { de } from "@/locales/de";
@@ -8,18 +11,21 @@ export const locales: LocaleType[] = [
     id: "en",
     name: "ENGLISH",
     lang: en,
-    translateCode: "en-GB"
+    translateCode: "en-GB",
+    dayjsTranslations: enDayjsTranslations
   },
   {
     id: "pl",
     name: "POLISH",
     lang: pl,
-    translateCode: "pl-PL"
+    translateCode: "pl-PL",
+    dayjsTranslations: plDayjsTranslations
   },
   {
     id: "de",
     name: "GERMAN",
     lang: de,
-    translateCode: "de-DE"
+    translateCode: "de-DE",
+    dayjsTranslations: deDayjsTranslations
   }
 ];
diff --git a/src/context/LocaleProvider/types.ts b/src/context/LocaleProvider/types.ts
@@ -20,4 +20,5 @@ export type LocaleType = {
   name: string;
   lang: TranslationType;
   translateCode: string;
+  dayjsTranslations: string | ILocale | undefined;
 };