From b588edb243b540d2d10b219bf4ec894f746a305d Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 19 Mar 2021 13:51:03 +1100 Subject: [PATCH 1/2] fix update of locale moment --- preload.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/preload.js b/preload.js index 71b1f1e4d..2f250136d 100644 --- a/preload.js +++ b/preload.js @@ -387,21 +387,25 @@ window.seedNodeList = JSON.parse(config.seedNodeList); const { OnionPaths } = require('./ts/session/onions'); -const { locale } = config; -window.i18n = i18n.setup(locale, localeMessages); -// moment does not support es-419 correctly (and cause white screen on app start) -const localeForMoment = locale === 'es-419' ? 'es' : locale; +const { locale: localFromEnv } = config; +window.i18n = i18n.setup(localFromEnv, localeMessages); +// moment does not support es-419 correctly (and cause white screen on app start) window.moment = require('moment'); -window.moment.updateLocale(localeForMoment, { +// 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 on the updateLocale below + +const localeSetForMoment = window.moment.locale(localFromEnv); +window.moment.updateLocale(localeSetForMoment, { relativeTime: { s: window.i18n('timestamp_s'), m: window.i18n('timestamp_m'), h: window.i18n('timestamp_h'), }, }); -window.moment.locale(localeForMoment); window.OnionPaths = OnionPaths; From 8c7c76a5c6bced1ce7abe1b41ed03087f1a8133b Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 19 Mar 2021 16:37:37 +1100 Subject: [PATCH 2/2] bump to v1.5.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ff3427d1a..ade85f544 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "session-desktop", "productName": "Session", "description": "Private messaging from your desktop", - "version": "1.5.0", + "version": "1.5.1", "license": "GPL-3.0", "author": { "name": "Loki Project",