Some refactor

Author: Georgi2704

frontend/apps/example/messages/en-GB.json

@@ -1,13 +1,13 @@
 {
   "footer": {
-    "cancel": "Cancel",
+    "cancel": "Cancel CUSTOM",
     "send": "Send CUSTOM",
-    "reset": "Reset",
-    "notModifiedYet": "The form has not been modified yet",
-    "notFilledYet": "The form has not been filled in yet"
+    "reset": "Reset CUSTOM",
+    "notModifiedYet": "The form has not been modified yet CUSTOM",
+    "notFilledYet": "The form has not been filled in yet CUSTOM"
   },
   "renderForm": {
-    "loading": "Form is loading...",
-    "successfullySent": "Your submission has been successfully received"
+    "loading": "Form is loading... CUSTOM",
+    "successfullySent": "Your submission has been successfully received CUSTOM"
   }
 }

frontend/apps/example/messages/nl-NL.json

@@ -1,13 +1,13 @@
 {
   "footer": {
-    "cancel": "Annuleren",
+    "cancel": "Annuleren CUSTOM",
     "send": "Verzenden CUSTOM",
-    "reset": "Resetten",
-    "notModifiedYet": "Het formulier is nog niet aangepast",
-    "notFilledYet": "Het formulier is nog niet ingevuld"
+    "reset": "Resetten CUSTOM",
+    "notModifiedYet": "Het formulier is nog niet aangepast CUSTOM",
+    "notFilledYet": "Het formulier is nog niet ingevuld CUSTOM"
 },
   "renderForm" : {
-    "loading": "Formulier wordt geladen...",
-    "successfullySent": "'Je inzending is succesvol ontvangen'"
+    "loading": "Formulier wordt geladen... CUSTOM",
+    "successfullySent": "Je inzending is succesvol ontvangen CUSTOM"
   }
 }

frontend/apps/example/src/app/[locale]/page.tsx

@@ -123,11 +123,16 @@ export default function Home() {
                     labelProvider: pydanticLabelProvider,
                     customDataProvider: pydanticCustomDataProvider,
                     componentMatcher: componentMatcher,
+<<<<<<< HEAD
 <<<<<<< HEAD
                     translations: NLnl,
 =======
                     translations : useGetTranslationMessages(validLocale)
 >>>>>>> 6b4540b (Cleanup)
+=======
+                    translations : useGetTranslationMessages(validLocale), //Comment this line for default translations
+                    locale: validLocale
+>>>>>>> 07848e9 (Some refactor)
                 }}
             />
         </div>

frontend/packages/pydantic-forms/src/PydanticForm.tsx

@@ -14,7 +14,7 @@ import type {
     PydanticFormInitialContextProps,
     PydanticFormMetaData,
 } from '@/types';
-import {TranslationsProvider} from "@/core/translations/translationsProvider";
+import {TranslationsProvider} from "@/messages/translationsProvider";
 
 export interface PydanticFormProps
     extends Omit<PydanticFormInitialContextProps, 'formKey' | 'children'> {
@@ -27,7 +27,7 @@ export const PydanticForm = ({
     metaData,
     ...contextProps
 }: PydanticFormProps) => (
-    <TranslationsProvider translations={contextProps.config.translations}>
+    <TranslationsProvider translations={contextProps.config.translations} locale={contextProps.config.locale}>
         <PydanticFormContextProvider
             {...contextProps}
             formKey={id}

frontend/packages/pydantic-forms/src/components/render/RenderForm.tsx

@@ -69,10 +69,6 @@ const RenderForm = (contextProps: PydanticFormContextProps) => {
         customComponentMatcher,
     );
 
-    console.log('pydanticFormComponents', pydanticFormComponents);
-    console.log("pydanticFormSchema", pydanticFormSchema)
-    console.log("customComponentMatcher", customComponentMatcher)
-
     return (
         <form action={''} onSubmit={submitForm}>
             {title !== false &&

frontend/packages/pydantic-forms/src/core/PydanticFormContextProvider.tsx

@@ -42,8 +42,6 @@ import {
 import { getHashForArray } from '@/utils';
 
 import translation from './translations/nl.json';
-import {TranslationsProvider} from "@/core/translations/translationsProvider";
-
 // lng and resources key depend on your locale.
 i18next.init({
     lng: 'nl',

frontend/packages/pydantic-forms/src/core/translations/translationsProvider.tsx

@@ -1,21 +1,13 @@
 {
   "footer": {
-    "cancel": "Default Cancel",
-    "send": "Default Send",
-    "reset": "Default Reset",
-    "notModifiedYet": "Default Het formulier is nog niet aangepast",
-    "notFilledYet": "Default Het formulier is nog niet ingevuld",
-    "yola": {
-      "poweredBy": "Default Powered by"
-    },
-    "hola": {
-      "dolla": {
-        "poweredBy": "Default Powered by"
-      }
-    }
+    "cancel": "Cancel",
+    "send": "Send",
+    "reset": "Reset",
+    "notModifiedYet": "The form has not been modified yet",
+    "notFilledYet": "The form has not been filled in yet"
   },
-  "renderForm" : {
-    "loading": "Default Formulier wordt geladen...",
-    "successfullySent": "'Je inzending is succesvol ontvangen'"
+  "renderForm": {
+    "loading": "Form is loading...",
+    "successfullySent": "Your submission has been successfully received"
   }
 }

frontend/packages/pydantic-forms/src/i18n/request.ts

@@ -12,27 +12,29 @@ export enum Locale {
     nlNL = 'nl-NL',
 }
 
+const DEFAULT_TIMEZONE = 'Europe/Amsterdam';
+
 interface TranslationsProviderProps {
     translations: TranslationsJSON | undefined;
+    locale?: string;
     children: ReactNode;
 }
 
 export const TranslationsProvider = ({
     translations,
+    locale = Locale.enGB,
     children,
 }: TranslationsProviderProps) => {
 
-    const locale: Locale = Locale.nlNL; // TODO: get locale from router
     const getCustomMessages = (translations: TranslationsJSON | undefined) => {
         return translations;
     }
-    const getLocalMessages = (locale: Locale) => {
+    const getLocalMessages = (locale: string) => {
         switch (locale) {
             case Locale.enGB:
                 return enGB;
             case Locale.nlNL:
                 return nlNL;
-
             default:
                 return enGB;
         }
@@ -59,6 +61,7 @@ export const TranslationsProvider = ({
         <NextIntlClientProvider
             locale={locale || Locale.enGB}
             messages={messages}
+            timeZone={DEFAULT_TIMEZONE}
             onError={onError}
         >
             {children}