cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-17 19:08:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #257 from cvium/fix_fallback_culture

Browse Source 
Load fallback culture before login
This commit is contained in:
Joshua M. Boniface 2019-04-20 14:56:15 -04:00 committed by GitHub
commit 9c85bcd2d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/globalize.js
View File

@ -127,12 +127,17 @@ define(['connectionManager', 'userSettings', 'events'], function (connectionMana
function loadStrings(options) { function loadStrings(options) {
var locale = getCurrentLocale(); var locale = getCurrentLocale();
var promises = [];
var optionsName;
if (typeof options === 'string') { if (typeof options === 'string') {
return ensureTranslation(allTranslations[options], locale); optionsName = options;
} else { } else {
optionsName = options.name;
register(options); 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(); var cacheParam = new Date().getTime();