verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 62 Releases Wiki Activity

Bug solved: Modules are not loaded when language is not recognized

This commit is contained in:
Juan Ferrer Toribio 2018-02-10 11:41:29 +01:00
parent b45ab59076
commit 8852bfd4bb
2 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
client/core/src/config.js
View File

@ -5,17 +5,29 @@ export function config($translateProvider, $translatePartialLoaderProvider) {
$translatePartialLoaderProvider.addPart('core'); $translatePartialLoaderProvider.addPart('core');
let conf = {urlTemplate: '/static/locale/{part}/{lang}.json'}; let conf = {urlTemplate: '/static/locale/{part}/{lang}.json'};
let fallbackLang = 'es';
let langs = ['en', 'es']; let langs = ['en', 'es'];
let localLangs = { let langAliases = {
en_US: 'en', en_US: 'en',
en_UK: 'en', en_UK: 'en',
es_ES: 'es', es_ES: 'es',
es_AR: 'es' es_AR: 'es'
}; };
$translateProvider $translateProvider
.useSanitizeValueStrategy('escape') .useSanitizeValueStrategy('escape')
.useLoader('$translatePartialLoader', conf) .useLoader('$translatePartialLoader', conf)
.registerAvailableLanguageKeys(langs, localLangs) .registerAvailableLanguageKeys(langs, langAliases)
.determinePreferredLanguage(); // FIXME: Circular dependency due to vnInterceptor
// .fallbackLanguage(fallbackLang)
.determinePreferredLanguage(() => {
let locale = $translateProvider.resolveClientLocale();
if (langs.indexOf(locale) !== -1)
return locale;
if (langAliases[locale])
return langAliases[locale];
return fallbackLang;
});
} }
module.config(config); module.config(config);

20
client/core/src/lib/moduleLoader.js
View File

@ -10,10 +10,15 @@ export function factory($http, $window, $ocLazyLoad, $translatePartialLoader, $t
load(moduleName, validations) { load(moduleName, validations) {
let loaded = this._loaded; let loaded = this._loaded;
if (loaded[moduleName]) if (loaded[moduleName] === true)
return Promise.resolve(true);
if (loaded[moduleName] instanceof Promise)
return loaded[moduleName]; return loaded[moduleName];
if (loaded[moduleName] === false)
return Promise.reject(
new Error(`Module dependency loop detected: ${moduleName}`));
loaded[moduleName] = Promise.resolve(true); loaded[moduleName] = false;
let deps = splitingRegister.getDependencies(moduleName); let deps = splitingRegister.getDependencies(moduleName);
let depPromises = []; let depPromises = [];
@ -29,13 +34,18 @@ export function factory($http, $window, $ocLazyLoad, $translatePartialLoader, $t
// FIXME: https://github.com/angular-translate/angular-translate/pull/1674 // FIXME: https://github.com/angular-translate/angular-translate/pull/1674
$translatePartialLoader.addPart(moduleName); $translatePartialLoader.addPart(moduleName);
promises.push($translate.refresh()); promises.push(new Promise(resolve => {
$translate.refresh().then(
() => resolve(),
() => resolve()
);
}));
if (validations) if (validations)
promises.push(new Promise(resolve => { promises.push(new Promise(resolve => {
$http.get(`/${moduleName}/validations`).then( $http.get(`/${moduleName}/validations`).then(
json => this.onValidationsReady(json, resolve), json => this.onValidationsReady(json, resolve),
json => resolve() () => resolve()
); );
})); }));
@ -45,7 +55,7 @@ export function factory($http, $window, $ocLazyLoad, $translatePartialLoader, $t
Promise.all(promises) Promise.all(promises)
.then(() => { .then(() => {
this._loaded[moduleName] = true; loaded[moduleName] = true;
resolve($ocLazyLoad.load({name: moduleName})); resolve($ocLazyLoad.load({name: moduleName}));
}) })
.catch(reject); .catch(reject);