@applica-software-guru/react-admin 1.5.331 → 1.5.332

package/src/i18n/createI18nProvider.tsx

@@ -20,6 +20,7 @@ type ICreateI18nProviderData = {
 };
 type ICreateJsonI18nProviderData = {
   path: string;
+  locales: Locale[];
   defaultLocale: string;
 };
 type IPolyglotOptions = {
@@ -100,18 +101,11 @@ function createI18nProvider(data: ICreateI18nProviderData): Promise<any> {
  * @returns {Promise<I18nProvider>} - The I18nProvider
  */
 function createJsonI18nProvider(data: ICreateJsonI18nProviderData): Promise<I18nProvider> {
-  const { defaultLocale, path } = data;
-  const defaultLanguages: Array<Locale> = [{ locale: defaultLocale, name: defaultLocale }];
+  const { locales, defaultLocale, path } = data;
   const headers = new Headers({ Accept: 'application/json', 'Content-Type': 'application/json' });
-  function getLanguages(): Promise<Locale> {
-    return fetch(`${path}/languages.json`, { headers: headers, method: 'get' })
-      .then((response) => response.json())
-      .catch(() => {
-        return Promise.resolve(defaultLanguages);
-      });
-  }
-  function getMessages(): Promise<ITranslations> {
-    return fetch(`${path}/messages.json`, { headers: headers, method: 'get' })
+
+  function getMessages(locale: Locale): Promise<ITranslations> {
+    return fetch(`${path}/${locale.locale}.json`, { headers: headers, method: 'get' })
       .then((response) => response.json())
       .then((response: Array<IMessage>): ITranslations => {
         return response.reduce(
@@ -126,15 +120,26 @@ function createJsonI18nProvider(data: ICreateJsonI18nProviderData): Promise<I18n
         );
       });
   }
-  return Promise.all([getLanguages(), getMessages()]).then((responses) => {
-    const [languages, messages] = responses;
-    function getMessages(locale: string): TranslationMessages {
-      return _.get(messages, locale, {}) as TranslationMessages;
-    }
-    return polyglotI18nProvider(getMessages, defaultLocale, languages, {
-      allowMissing: true
+  return Promise.all(locales.map(getMessages))
+    .then((responses: ITranslations[]) =>
+      _.reduce(
+        responses,
+        (acc, messages) =>
+          ({
+            ...acc,
+            ...messages
+          } as ITranslations),
+        {}
+      )
+    )
+    .then((messages) => {
+      function getMessages(locale: string): TranslationMessages {
+        return _.get(messages, locale, {}) as TranslationMessages;
+      }
+      return polyglotI18nProvider(getMessages, defaultLocale, locales, {
+        allowMissing: true
+      });
     });
-  });
 }
 
 export type { ICreateI18nProviderData };

package/src/playground/App.jsx

@@ -20,7 +20,17 @@ const dataProvider = new ApplicaDataProvider({
   attachmentsParser: createAttachmentsParser(),
   HttpErrorClass: HttpError
 });
-const i18nProvider = createI18nProvider({ apiUrl: API_URL, allowMissing: true, defaultLocale: 'it' });
+const useJson = false;
+const i18nProvider = useJson
+  ? createJsonI18nProvider({
+      path: '/i18n',
+      defaultLocale: 'it',
+      locales: [
+        { locale: 'it', name: 'Italiano' },
+        { locale: 'en', name: 'English' }
+      ]
+    })
+  : createI18nProvider({ apiUrl: API_URL, allowMissing: true, defaultLocale: 'it' });
 function App() {
   return (
     <ApplicaAdmin
@@ -44,6 +54,7 @@ function App() {
       oauth={{
         google: { clientId: 'YOUR_CLIENT_ID' }
       }}
+      enableLocaleSwitcher
     >
       <CustomRoutes>
         <Route path="/custom-page" element={<CustomPage />} />

package/dist/i18n/languages.json

@@ -1 +0,0 @@
-[{ "locale": "en", "name": "English" }]

package/public/i18n/languages.json

@@ -1 +0,0 @@
-[{ "locale": "en", "name": "English" }]