Skip to content
Snippets Groups Projects

Resolve "Error 404 on language files load"

Merged David Dorchies requested to merge 499-error-404-on-language-files-load into devel
2 files
+ 8
3
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -60,6 +60,11 @@ export class I18nService extends Observable implements Observer {
* @param code ISO 639-1 language code
*/
public async setLanguage(code: string) {
/** excluded calculators */
const childCalculatorType: CalculatorType[] = [
CalculatorType.Section, CalculatorType.Structure, CalculatorType.CloisonAval, CalculatorType.YAXN
];
// ensure 2-letter language code
code = code.substring(0, 2);
// is language supported ?
@@ -75,7 +80,7 @@ export class I18nService extends Observable implements Observer {
const promisesList: Promise<any>[] = [];
for (const ct in CalculatorType) {
const calcType = Number(ct);
if (!isNaN(calcType)) {
if (!isNaN(calcType) && !childCalculatorType.includes(calcType)) {
promisesList.push(this.loadLocalisation(calcType).catch((err) => { /* silent fail */ }));
}
}
@@ -118,7 +123,7 @@ export class I18nService extends Observable implements Observer {
}
} else {
return new Promise((resolve, reject) => {
resolve(); // does nothing but complies with Promise expectation
resolve(undefined); // does nothing but complies with Promise expectation
});
}
}
Loading