Merge pull request #257 from cvium/fix_fallback_culture

Load fallback culture before login
2019-04-20 14:56:15 -04:00
parent 874b51234e bdbc5682db
commit 9c85bcd2d0
1 changed files with 7 additions and 2 deletions
@@ -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();