From cfab7057fb0c9f3b6c58c149ffa8a5bdb9afd0ca Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 12 May 2022 12:10:45 +1000 Subject: [PATCH] fix moment locale globally --- ts/components/SessionInboxView.tsx | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ts/components/SessionInboxView.tsx b/ts/components/SessionInboxView.tsx index 7dbcef691..428ae27ce 100644 --- a/ts/components/SessionInboxView.tsx +++ b/ts/components/SessionInboxView.tsx @@ -27,6 +27,15 @@ import { SessionMainPanel } from './SessionMainPanel'; import { createStore } from '../state/createStore'; import { ExpirationTimerOptions } from '../util/expiringMessages'; +// moment does not support es-419 correctly (and cause white screen on app start) +import moment from 'moment'; + +// Default to the locale from env. It will be overriden if moment +// does not recognize it with what moment knows which is the closest. +// i.e. es-419 will return 'es'. +// We just need to use what we got from moment in getLocale on the updateLocale below +moment.locale((window.i18n as any).getLocale()); + // Workaround: A react component's required properties are filtering up through connect() // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/31363