Merge pull request #176 from OpenDTU-App/173-fix-crash-for-french-and-italian

Author: CommanderRedYT

index.js

@@ -9,6 +9,8 @@ import App from '@/App';
 
 import 'moment/locale/de';
 import 'moment/locale/en-gb';
+import 'moment/locale/fr';
+import 'moment/locale/it';
 import 'react-native-get-random-values';
 import 'react-native-url-polyfill/auto';
 import '@/utils/rsplit';

src/App.tsx

@@ -273,10 +273,22 @@ const _App: FC = () => {
     setI18nLanguageMatchesSettings(false);
     i18n.changeLanguage(language);
 
-    if (language === 'en') {
-      moment.locale('en-gb');
+    let momentLocale = '';
+
+    switch (language) {
+      case 'en':
+        momentLocale = 'en-gb';
+        break;
+      default:
+        momentLocale = language;
+        break;
+    }
+
+    if (moment.locales().includes(momentLocale)) {
+      moment.locale(momentLocale);
     } else {
-      moment.locale(language);
+      log.error(`moment locale "${momentLocale}" not available`);
+      moment.locale('en-gb');
     }
   }, [i18n, language]);
 

src/translations/index.ts

@@ -44,6 +44,7 @@ if (!i18n.isInitialized) {
       debug: __DEV__,
       nonExplicitSupportedLngs: true,
       supportedLngs: supportedLanguages,
+      returnEmptyString: false,
     });
 }