From b5db89661a6e581fb385234c2567acc85b5f42c5 Mon Sep 17 00:00:00 2001 From: Claus Vium Date: Sat, 20 Apr 2019 20:44:42 +0200 Subject: [PATCH] Fix fallback culture before login --- src/components/globalize.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/globalize.js b/src/components/globalize.js index 32b6412a42..c41e885842 100644 --- a/src/components/globalize.js +++ b/src/components/globalize.js @@ -127,12 +127,17 @@ define(['connectionManager', 'userSettings', 'events'], function (connectionMana function loadStrings(options) { var locale = getCurrentLocale(); + var promises = []; + var optionsName;; if (typeof options === 'string') { - return ensureTranslation(allTranslations[options], locale); + optionsName = options; } else { + optionsName = options.name; register(options); - return ensureTranslation(allTranslations[options.name], locale); } + promises.push(ensureTranslation(allTranslations[optionsName], locale)); + promises.push(ensureTranslation(allTranslations[optionsName], fallbackCulture)); + return Promise.all(promises); } var cacheParam = new Date().getTime();