kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-21 12:55:22 +00:00
Code Issues Projects Releases Wiki Activity

remove callback hell

Browse Source
This commit is contained in:
Felix Wiedenbach
2021-01-29 22:34:12 +01:00
parent db24f20289
commit 308774c2a6
2 changed files with 26 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
js/module.js
View File

@@ -318,24 +318,24 @@ var Module = Class.extend({
const languages = Object.keys(translations);
const fallbackLanguage = languages[0];
if (languages.length > 0) {
const translationFile = translations[language];
const translationsFallbackFile = translations[fallbackLanguage];
if (translationFile) {
Translator.load(this, translationFile, false, () => {
if (translationFile !== translationsFallbackFile) {
Translator.load(this, translationsFallbackFile, true, callback);
} else {
callback();
}
});
} else {
Translator.load(this, translationsFallbackFile, true, callback);
}
} else {
callback();
if (languages.length === 0) {
return callback();
}
const translationFile = translations[language];
const translationsFallbackFile = translations[fallbackLanguage];
if (!translationFile) {
return Translator.load(this, translationsFallbackFile, true, callback);
}
Translator.load(this, translationFile, false, () => {
if (translationFile !== translationsFallbackFile) {
Translator.load(this, translationsFallbackFile, true, callback);
} else {
callback();
}
});
},
/**