mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-06-27 11:50:00 +00:00
## [2.26.0] - 01-01-2024 Thanks to: @bnitkin, @bugsounet, @dependabot, @jkriegshauser, @kaennchenstruggle, @KristjanESPERANTO and @Ybbet. Special thanks to @khassel, @rejas and @sdetweil for taking over most (if not all) of the work on this release as project collaborators. This version would not be there without their effort. Thank you guys! You are awesome! This release also marks the latest release by Michael Teeuw. 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 - Added update notification updater (for 3rd party modules) - Added node 21 to the test matrix - Added transform object to calendar:customEvents - Added ESLint rules for jest (including jest/expect-expect and jest/no-done-callback) ### Removed - Removed Codecov workflow (not working anymore, other workflow required) (#3107) - Removed titleReplace from calendar, replaced + extended by customEvents (backward compatibility included) (#3249) - Removed failing unit test (#3254) - Removed some unused variables ### Updated - Update electron to v27 and update other dependencies as well as github actions - Update newsfeed: Use `html-to-text` instead of regex for transform description - Review ESLint config (#3269) - Updated dependencies - Clock module: optionally display current moon phase in addition to rise/set times - electron is now per default started without gpu, if needed it must be enabled with new env var `ELECTRON_ENABLE_GPU=1` on startup (#3226) - Replace prettier by stylistic in ESLint config to lint JavaScript (and disable some rules for `config/config.js*` files) - Update node-ical to v0.17.1 and fix tests ### Fixed - Avoid fade out/in on updateDom when many calendars are used - Fix the option eventClass on customEvents. - Fix yr API version in locationforecast and sunrise call (#3227) - Fix cloneObject() function to respect RegExp (#3237) - Fix newsfeed module for feeds using "a10:updated" tag (#3238) - Fix issue template (#3167) - Fix #3256 filter out bad results from rrule.between - Fix calendar events sometimes not respecting deleted events (#3250) - Fix electron loadurl locally on Windows when address "0.0.0.0" (#2550) - Fix updatanotification (update_helper.js): catch error if reponse is not an JSON format (check PM2) - Fix missing typeof in calendar module - Fix style issues after prettier update - Fix calendar test (#3291) by moving "Exdate check" from e2e to electron to run on a Thursday - Fix calendar config params `fetchInterval` and `excludedEvents` were never used from single calendar config (#3297) - Fix MM_PORT variable not used in electron and allow full path for MM_CONFIG_FILE variable (#3302) --------- Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Karsten Hassel <hassel@gmx.de> Co-authored-by: Malte Hallström <46646495+SkySails@users.noreply.github.com> Co-authored-by: Veeck <github@veeck.de> Co-authored-by: veeck <michael@veeck.de> Co-authored-by: dWoolridge <dwoolridge@charter.net> Co-authored-by: Johan <jojjepersson@yahoo.se> Co-authored-by: Dario Mratovich <dario_mratovich@hotmail.com> Co-authored-by: Dario Mratovich <dario.mratovich@outlook.com> Co-authored-by: Magnus <34011212+MagMar94@users.noreply.github.com> Co-authored-by: Naveen <172697+naveensrinivasan@users.noreply.github.com> Co-authored-by: buxxi <buxxi@omfilm.net> Co-authored-by: Thomas Hirschberger <47733292+Tom-Hirschberger@users.noreply.github.com> Co-authored-by: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com> Co-authored-by: Andrés Vanegas Jiménez <142350+angeldeejay@users.noreply.github.com> Co-authored-by: Dave Child <dave@addedbytes.com> Co-authored-by: grenagit <46225780+grenagit@users.noreply.github.com> Co-authored-by: Grena <grena@grenabox.fr> Co-authored-by: Magnus Marthinsen <magmar@online.no> Co-authored-by: Patrick <psieg@users.noreply.github.com> Co-authored-by: Piotr Rajnisz <56397164+rajniszp@users.noreply.github.com> Co-authored-by: Suthep Yonphimai <tomzt@users.noreply.github.com> Co-authored-by: CarJem Generations (Carter Wallace) <cwallacecs@gmail.com> Co-authored-by: Nicholas Fogal <nfogal.misc@gmail.com> Co-authored-by: JakeBinney <126349119+JakeBinney@users.noreply.github.com> Co-authored-by: OWL4C <124401812+OWL4C@users.noreply.github.com> Co-authored-by: Oscar Björkman <17575446+oscarb@users.noreply.github.com> Co-authored-by: Ismar Slomic <ismar@slomic.no> Co-authored-by: Jørgen Veum-Wahlberg <jorgen.wahlberg@amedia.no> Co-authored-by: Eddie Hung <6740044+eddiehung@users.noreply.github.com> Co-authored-by: Bugsounet - Cédric <github@bugsounet.fr> Co-authored-by: bugsounet <bugsounet@bugsounet.fr> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Knapoc <Knapoc@users.noreply.github.com> Co-authored-by: sam detweiler <sdetweil@gmail.com> Co-authored-by: veeck <michael.veeck@nebenan.de> Co-authored-by: Paranoid93 <6515818+Paranoid93@users.noreply.github.com> Co-authored-by: NolanKingdon <27908974+NolanKingdon@users.noreply.github.com> Co-authored-by: J. Kenzal Hunter <kenzal.hunter@gmail.com> Co-authored-by: Teddy <teddy.payet@gmail.com> Co-authored-by: TeddyStarinvest <teddy.payet@starinvest.com> Co-authored-by: martingron <61826403+martingron@users.noreply.github.com> Co-authored-by: dgoth <132394363+dgoth@users.noreply.github.com> Co-authored-by: kaennchenstruggle <54073894+kaennchenstruggle@users.noreply.github.com> Co-authored-by: jkriegshauser <jkriegshauser@gmail.com> Co-authored-by: Ben Nitkin <ben@nitkin.net>
146 lines
4.8 KiB
JavaScript
146 lines
4.8 KiB
JavaScript
/* global translations */
|
|
|
|
/* MagicMirror²
|
|
* Translator (l10n)
|
|
*
|
|
* By Christopher Fenner https://github.com/CFenner
|
|
* MIT Licensed.
|
|
*/
|
|
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;
|