Skip to content

Commit 21a7164

Browse files
Hopefully fixed crash with momentjs
1 parent ddcfb14 commit 21a7164

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ import App from '@/App';
99

1010
import 'moment/locale/de';
1111
import 'moment/locale/en-gb';
12+
import 'moment/locale/fr';
13+
import 'moment/locale/it';
1214
import 'react-native-get-random-values';
1315
import 'react-native-url-polyfill/auto';
1416
import '@/utils/rsplit';

src/App.tsx

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -273,10 +273,19 @@ const _App: FC = () => {
273273
setI18nLanguageMatchesSettings(false);
274274
i18n.changeLanguage(language);
275275

276-
if (language === 'en') {
277-
moment.locale('en-gb');
278-
} else {
279-
moment.locale(language);
276+
let momentLocale = '';
277+
278+
switch (language) {
279+
case 'en':
280+
momentLocale = 'en-gb';
281+
break;
282+
default:
283+
momentLocale = language;
284+
break;
285+
}
286+
287+
if (moment.locales().includes(momentLocale)) {
288+
moment.locale(momentLocale);
280289
}
281290
}, [i18n, language]);
282291

src/translations/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ if (!i18n.isInitialized) {
4444
debug: __DEV__,
4545
nonExplicitSupportedLngs: true,
4646
supportedLngs: supportedLanguages,
47+
returnEmptyString: false,
4748
});
4849
}
4950

0 commit comments

Comments
 (0)