github-mirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-28 09:42:21 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/add-error-to-callback

Browse source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Felix Wiedenbach 2021-02-13 08:43:23 +01:00
commit 652e1a528f
14 changed files with 475 additions and 648 deletions
Download patch file Download diff file Expand all files Collapse all files

6
js/module.js
View file

@ -319,14 +319,16 @@ var Module = Class.extend({
const fallbackLanguage = languages[0];
if (languages.length === 0) {
return callback();
callback();
return;
}
const translationFile = translations[language];
const translationsFallbackFile = translations[fallbackLanguage];
if (!translationFile) {
return Translator.load(this, translationsFallbackFile, true, callback);
Translator.load(this, translationsFallbackFile, true, callback);
return;
}
Translator.load(this, translationFile, false, () => {