mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-06-28 20:22:53 +00:00
## [2.27.0] - 2024-04-01 Thanks to: @bugsounet, @crazyscot, @illimarkangur, @jkriegshauser, @khassel, @KristjanESPERANTO, @Paranoid93, @rejas, @sdetweil and @vppencilsharpener. This release marks the first release without Michael Teeuw (@michmich). A very special thanks to him for creating MagicMirror and leading the project for so many years. For more info, please read the following post: [A New Chapter for MagicMirror: The Community Takes the Lead](https://forum.magicmirror.builders/topic/18329/a-new-chapter-for-magicmirror-the-community-takes-the-lead). ### Added - Output of system information to the console for troubleshooting (#3328 and #3337), ignore errors under aarch64 (#3349) - [chore] Add `eslint-plugin-package-json` to lint the `package.json` files (#3368) - [weather] `showHumidity` config is now a string describing where to show this element. Supported values: "wind", "temp", "feelslike", "below", "none". (#3330) - electron-rebuild test suite for electron and 3rd party modules compatibility (#3392) - Create MM² icon and attach it to electron process (#3407) ### Updated - Update updatenotification (update_helper.js): Recode with pm2 library (#3332) - Removing lodash dependency by replacing merge by spread operator (#3339) - Use node prefix for build-in modules (#3340) - Rework logging colors (#3350) - Update pm2 to v5.3.1 with no allow-ghsas (#3364) - [chore] Update husky and let lint-staged fix ESLint issues - [chore] Update dependencies including electron to v29 (#3357) and node-ical - Update translations for estonian (#3371) - Update electron to v29 and update other dependencies - [calendar] fullDay events over several days now show the left days from the first day on and 'today' on the last day - Update layout of current weather indoor values ### Fixed - Correct apibase of weathergov weatherprovider to match documentation (#2926) - Worked around several issues in the RRULE library that were causing deleted calender events to still show, some initial and recurring events to not show, and some event times to be off an hour. (#3291) - Skip changelog requirement when running tests for dependency updates (#3320) - Display precipitation probability when it is 0% instead of blank/empty (#3345) - [newsfeed] Suppress unsightly animation cases when there are 0 or 1 active news items (#3336) - [newsfeed] Always compute the feed item URL using the same helper function (#3336) - Ignore all custom css files (#3359) - [newsfeed] Fix newsfeed stall issue introduced by #3336 (#3361) - Changed `log.debug` to `log.log` in `app.js` where logLevel is not set because config is not loaded at this time (#3353) - [calendar] deny fetch interval < 60000 and set 60000 in this case (prevent fetch loop failed) (#3382) - added message in case where config.js is missing the module.export line PR #3383 - Fixed an issue where recurring events could extend past their recurrence end date (#3393) - Don't display any `npm WARN <....>` on install (#3399) - Fixed move suncalc dependency to production from dev, as it is used by clock module - [compliments] Fix mirror not responding anymore when no compliments are to be shown (#3385) ### Deleted - Unneeded file headers (#3358) --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Michael Teeuw <michael@xonaymedia.nl> Co-authored-by: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Karsten Hassel <hassel@gmx.de> Co-authored-by: Ross Younger <crazyscot@gmail.com> Co-authored-by: Bugsounet - Cédric <github@bugsounet.fr> Co-authored-by: jkriegshauser <joshuakr@nvidia.com> Co-authored-by: illimarkangur <116028111+illimarkangur@users.noreply.github.com> Co-authored-by: sam detweiler <sdetweil@gmail.com> Co-authored-by: vppencilsharpener <tim.pray@gmail.com> Co-authored-by: Paranoid93 <6515818+Paranoid93@users.noreply.github.com>
140 lines
4.7 KiB
JavaScript
140 lines
4.7 KiB
JavaScript
/* global translations */
|
|
|
|
const Translator = (function () {
|
|
|
|
/**
|
|
* Load a JSON file via XHR.
|
|
* @param {string} file Path of the file we want to load.
|
|
* @returns {Promise<object>} the translations in the specified file
|
|
*/
|
|
async function loadJSON (file) {
|
|
const xhr = new XMLHttpRequest();
|
|
return new Promise(function (resolve) {
|
|
xhr.overrideMimeType("application/json");
|
|
xhr.open("GET", file, true);
|
|
xhr.onreadystatechange = function () {
|
|
if (xhr.readyState === 4 && xhr.status === 200) {
|
|
// needs error handler try/catch at least
|
|
let fileinfo = null;
|
|
try {
|
|
fileinfo = JSON.parse(xhr.responseText);
|
|
} catch (exception) {
|
|
// nothing here, but don't die
|
|
Log.error(` loading json file =${file} failed`);
|
|
}
|
|
resolve(fileinfo);
|
|
}
|
|
};
|
|
xhr.send(null);
|
|
});
|
|
}
|
|
|
|
return {
|
|
coreTranslations: {},
|
|
coreTranslationsFallback: {},
|
|
translations: {},
|
|
translationsFallback: {},
|
|
|
|
/**
|
|
* Load a translation for a given key for a given module.
|
|
* @param {Module} module The module to load the translation for.
|
|
* @param {string} key The key of the text to translate.
|
|
* @param {object} variables The variables to use within the translation template (optional)
|
|
* @returns {string} the translated key
|
|
*/
|
|
translate (module, key, variables = {}) {
|
|
|
|
/**
|
|
* Combines template and variables like:
|
|
* template: "Please wait for {timeToWait} before continuing with {work}."
|
|
* variables: {timeToWait: "2 hours", work: "painting"}
|
|
* to: "Please wait for 2 hours before continuing with painting."
|
|
* @param {string} template Text with placeholder
|
|
* @param {object} variables Variables for the placeholder
|
|
* @returns {string} the template filled with the variables
|
|
*/
|
|
function createStringFromTemplate (template, variables) {
|
|
if (Object.prototype.toString.call(template) !== "[object String]") {
|
|
return template;
|
|
}
|
|
let templateToUse = template;
|
|
if (variables.fallback && !template.match(new RegExp("{.+}"))) {
|
|
templateToUse = variables.fallback;
|
|
}
|
|
return templateToUse.replace(new RegExp("{([^}]+)}", "g"), function (_unused, varName) {
|
|
return varName in variables ? variables[varName] : `{${varName}}`;
|
|
});
|
|
}
|
|
|
|
if (this.translations[module.name] && key in this.translations[module.name]) {
|
|
// Log.log("Got translation for " + key + " from module translation: ");
|
|
return createStringFromTemplate(this.translations[module.name][key], variables);
|
|
}
|
|
|
|
if (key in this.coreTranslations) {
|
|
// Log.log("Got translation for " + key + " from core translation.");
|
|
return createStringFromTemplate(this.coreTranslations[key], variables);
|
|
}
|
|
|
|
if (this.translationsFallback[module.name] && key in this.translationsFallback[module.name]) {
|
|
// Log.log("Got translation for " + key + " from module translation fallback.");
|
|
return createStringFromTemplate(this.translationsFallback[module.name][key], variables);
|
|
}
|
|
|
|
if (key in this.coreTranslationsFallback) {
|
|
// Log.log("Got translation for " + key + " from core translation fallback.");
|
|
return createStringFromTemplate(this.coreTranslationsFallback[key], variables);
|
|
}
|
|
|
|
return key;
|
|
},
|
|
|
|
/**
|
|
* Load a translation file (json) and remember the data.
|
|
* @param {Module} module The module to load the translation file for.
|
|
* @param {string} file Path of the file we want to load.
|
|
* @param {boolean} isFallback Flag to indicate fallback translations.
|
|
*/
|
|
async load (module, file, isFallback) {
|
|
Log.log(`${module.name} - Load translation${isFallback ? " fallback" : ""}: ${file}`);
|
|
|
|
if (this.translationsFallback[module.name]) {
|
|
return;
|
|
}
|
|
|
|
const json = await loadJSON(module.file(file));
|
|
const property = isFallback ? "translationsFallback" : "translations";
|
|
this[property][module.name] = json;
|
|
},
|
|
|
|
/**
|
|
* Load the core translations.
|
|
* @param {string} lang The language identifier of the core language.
|
|
*/
|
|
async loadCoreTranslations (lang) {
|
|
if (lang in translations) {
|
|
Log.log(`Loading core translation file: ${translations[lang]}`);
|
|
this.coreTranslations = await loadJSON(translations[lang]);
|
|
} else {
|
|
Log.log("Configured language not found in core translations.");
|
|
}
|
|
|
|
await this.loadCoreTranslationsFallback();
|
|
},
|
|
|
|
/**
|
|
* Load the core translations' fallback.
|
|
* The first language defined in translations.js will be used.
|
|
*/
|
|
async loadCoreTranslationsFallback () {
|
|
let first = Object.keys(translations)[0];
|
|
if (first) {
|
|
Log.log(`Loading core translation fallback file: ${translations[first]}`);
|
|
this.coreTranslationsFallback = await loadJSON(translations[first]);
|
|
}
|
|
}
|
|
};
|
|
}());
|
|
|
|
window.Translator = Translator;
|