From 5c1cd7467b3f9f9effb089584a377f912408f167 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 4 Feb 2021 09:27:40 +1100 Subject: [PATCH] fallback to es for moment when given locale is es-419 --- preload.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/preload.js b/preload.js index d59110f9d..5a6f99f17 100644 --- a/preload.js +++ b/preload.js @@ -394,14 +394,17 @@ const Attachments = require('./app/attachments'); const { locale } = config; window.i18n = i18n.setup(locale, localeMessages); -window.moment.updateLocale(locale, { +// moment does not support es-419 correctly (and cause white screen on app start) +const localeForMoment = locale === 'es-419' ? 'es' : locale; + +window.moment.updateLocale(localeForMoment, { relativeTime: { s: window.i18n('timestamp_s'), m: window.i18n('timestamp_m'), h: window.i18n('timestamp_h'), }, }); -window.moment.locale(locale); +window.moment.locale(localeForMoment); window.Signal = Signal.setup({ Attachments,