mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-07-02 22:08:42 +00:00
## [2.32.0] - 2025-07-01 Thanks to: @bughaver, @bugsounet, @khassel, @KristjanESPERANTO, @plebcity, @rejas, @sdetweil. > ⚠️ This release needs nodejs version `v22.14.0 or higher` ### Added - [config] Allow to change module order for final renderer (or dynamically with CSS): Feature `order` in config (#3762) - [clock] Added option 'disableNextEvent' to hide next sun event (#3769) - [clock] Implement short syntax for clock week (#3775) ### Changed - [refactor] Simplify module loading process (#3766) - Use `node --run` instead of `npm run` (#3764) and adapt `start:dev` script (#3773) - [workflow] Run linter and spellcheck with LTS node version (#3767) - [workflow] Split "Run test" step into two steps for more clarity (#3767) - [linter] Review linter setup (#3783) - Fix command to lint markdown in `CONTRIBUTING.md` - Re-activate JSDoc linting and fix linting issues - Refactor ESLint config to use `defineConfig` and `globalIgnores` - Replace `eslint-plugin-import` with `eslint-plugin-import-x` - Switch Stylelint config to flat format and simplify Stylelint scripts - [workflow] Replace Node.js version v23 with v24 (#3770) - [refactor] Replace deprecated constants `fs.F_OK` and `fs.R_OK` (#3789) - [refactor] Replace `ansis` with built-in function `util.styleText` (#3793) - [core] Integrate stuff from `vendor` and `fonts` folders into main `package.json`, simplifies install and maintaining dependencies (#3795, #3805) - [l10n] Complete translations (with the help of translation tools) (#3794) - [refactor] Refactored `calendarfetcherutils` in Calendar module to handle timezones better (#3806) - Removed as many of the date conversions as possible - Use `moment-timezone` when calculating recurring events, this will fix problems from the past with offsets and DST not being handled properly - Added some tests to test the behavior of the refactored methods to make sure the correct event dates are returned - [linter] Enable ESLint rule `no-console` and replace `console` with `Log` in some files (#3810) - [tests] Review and refactor translation tests (#3792) ### Fixed - [fix] Handle spellcheck issues (#3783) - [calendar] fix fullday event rrule until with timezone offset (#3781) - [feat] Add rule `no-undef` in config file validation to fix #3785 (#3786) - [fonts] Fix `roboto.css` to avoid error message `Unknown descriptor 'var(' in @font-face rule.` in firefox console (#3787) - [tests] Fix and refactor e2e test `Same keys` in `translations_spec.js` (#3809) - [tests] Fix e2e tests newsfeed and calendar to exit without open handles (#3817) ### Updated - [core] Update dependencies including electron to v36 (#3774, #3788, #3811, #3804, #3815, #3823) - [core] Update package type to `commonjs` - [logger] Review factory code part: use `switch/case` instead of `if/else if` (#3812) --------- 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: Ross Younger <crazyscot@gmail.com> Co-authored-by: Veeck <github@veeck.de> 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: veeck <michael.veeck@nebenan.de> Co-authored-by: Paranoid93 <6515818+Paranoid93@users.noreply.github.com> Co-authored-by: Brian O'Connor <btoconnor@users.noreply.github.com> Co-authored-by: WallysWellies <59727507+WallysWellies@users.noreply.github.com> Co-authored-by: Jason Stieber <jrstieber@gmail.com> Co-authored-by: jargordon <50050429+jargordon@users.noreply.github.com> Co-authored-by: Daniel <32464403+dkallen78@users.noreply.github.com> Co-authored-by: Ryan Williams <65094007+ryan-d-williams@users.noreply.github.com> Co-authored-by: Panagiotis Skias <panagiotis.skias@gmail.com> Co-authored-by: Marc Landis <dirk.rettschlag@gmail.com> Co-authored-by: HeikoGr <20295490+HeikoGr@users.noreply.github.com> Co-authored-by: Pedro Lamas <pedrolamas@gmail.com> Co-authored-by: veeck <gitkraken@veeck.de> Co-authored-by: Magnus <34011212+MagMar94@users.noreply.github.com> Co-authored-by: Ikko Eltociear Ashimine <eltociear@gmail.com> Co-authored-by: DevIncomin <56730075+Developer-Incoming@users.noreply.github.com> Co-authored-by: Nathan <n8nyoung@gmail.com> Co-authored-by: mixasgr <mixasgr@users.noreply.github.com> Co-authored-by: Savvas Adamtziloglou <savvas-gr@greeklug.gr> Co-authored-by: Konstantinos <geraki@gmail.com> Co-authored-by: OWL4C <124401812+OWL4C@users.noreply.github.com> Co-authored-by: BugHaver <43462320+bughaver@users.noreply.github.com> Co-authored-by: BugHaver <43462320+lsaadeh@users.noreply.github.com> Co-authored-by: Koen Konst <koenspero@gmail.com> Co-authored-by: Koen Konst <c.h.konst@avisi.nl>
294 lines
9.4 KiB
JavaScript
294 lines
9.4 KiB
JavaScript
const fs = require("node:fs");
|
|
const path = require("node:path");
|
|
const helmet = require("helmet");
|
|
const { JSDOM } = require("jsdom");
|
|
const express = require("express");
|
|
|
|
describe("Translator", () => {
|
|
let server;
|
|
const sockets = new Set();
|
|
const translatorJsPath = path.join(__dirname, "..", "..", "..", "js", "translator.js");
|
|
const translatorJsScriptContent = fs.readFileSync(translatorJsPath, "utf8");
|
|
const translationTestData = JSON.parse(fs.readFileSync(path.join(__dirname, "..", "..", "..", "tests", "mocks", "translation_test.json"), "utf8"));
|
|
|
|
beforeAll(() => {
|
|
const app = express();
|
|
app.use(helmet());
|
|
app.use((req, res, next) => {
|
|
res.header("Access-Control-Allow-Origin", "*");
|
|
next();
|
|
});
|
|
app.use("/translations", express.static(path.join(__dirname, "..", "..", "..", "tests", "mocks")));
|
|
|
|
server = app.listen(3000);
|
|
|
|
server.on("connection", (socket) => {
|
|
sockets.add(socket);
|
|
});
|
|
});
|
|
|
|
afterAll(async () => {
|
|
for (const socket of sockets) {
|
|
socket.destroy();
|
|
sockets.delete(socket);
|
|
}
|
|
|
|
await server.close();
|
|
});
|
|
|
|
describe("translate", () => {
|
|
const translations = {
|
|
"MMM-Module": {
|
|
Hello: "Hallo",
|
|
"Hello {username}": "Hallo {username}"
|
|
}
|
|
};
|
|
|
|
const coreTranslations = {
|
|
Hello: "XXX",
|
|
"Hello {username}": "XXX",
|
|
FOO: "Foo",
|
|
"BAR {something}": "Bar {something}"
|
|
};
|
|
|
|
const translationsFallback = {
|
|
"MMM-Module": {
|
|
Hello: "XXX",
|
|
"Hello {username}": "XXX",
|
|
FOO: "XXX",
|
|
"BAR {something}": "XXX",
|
|
"A key": "A translation"
|
|
}
|
|
};
|
|
|
|
const coreTranslationsFallback = {
|
|
FOO: "XXX",
|
|
"BAR {something}": "XXX",
|
|
Hello: "XXX",
|
|
"Hello {username}": "XXX",
|
|
"A key": "XXX",
|
|
Fallback: "core fallback"
|
|
};
|
|
|
|
/**
|
|
* @param {object} Translator the global Translator object
|
|
*/
|
|
const setTranslations = (Translator) => {
|
|
Translator.translations = translations;
|
|
Translator.coreTranslations = coreTranslations;
|
|
Translator.translationsFallback = translationsFallback;
|
|
Translator.coreTranslationsFallback = coreTranslationsFallback;
|
|
};
|
|
|
|
it("should return custom module translation", async () => {
|
|
const dom = new JSDOM("", { runScripts: "outside-only" });
|
|
dom.window.eval(translatorJsScriptContent);
|
|
|
|
await new Promise((resolve) => dom.window.onload = resolve);
|
|
|
|
const { Translator } = dom.window;
|
|
setTranslations(Translator);
|
|
|
|
let translation = Translator.translate({ name: "MMM-Module" }, "Hello");
|
|
expect(translation).toBe("Hallo");
|
|
|
|
translation = Translator.translate({ name: "MMM-Module" }, "Hello {username}", { username: "fewieden" });
|
|
expect(translation).toBe("Hallo fewieden");
|
|
});
|
|
|
|
it("should return core translation", async () => {
|
|
const dom = new JSDOM("", { runScripts: "outside-only" });
|
|
dom.window.eval(translatorJsScriptContent);
|
|
|
|
await new Promise((resolve) => dom.window.onload = resolve);
|
|
|
|
const { Translator } = dom.window;
|
|
setTranslations(Translator);
|
|
let translation = Translator.translate({ name: "MMM-Module" }, "FOO");
|
|
expect(translation).toBe("Foo");
|
|
translation = Translator.translate({ name: "MMM-Module" }, "BAR {something}", { something: "Lorem Ipsum" });
|
|
expect(translation).toBe("Bar Lorem Ipsum");
|
|
});
|
|
|
|
it("should return custom module translation fallback", async () => {
|
|
const dom = new JSDOM("", { runScripts: "outside-only" });
|
|
dom.window.eval(translatorJsScriptContent);
|
|
|
|
await new Promise((resolve) => dom.window.onload = resolve);
|
|
|
|
const { Translator } = dom.window;
|
|
setTranslations(Translator);
|
|
const translation = Translator.translate({ name: "MMM-Module" }, "A key");
|
|
expect(translation).toBe("A translation");
|
|
});
|
|
|
|
it("should return core translation fallback", async () => {
|
|
const dom = new JSDOM("", { runScripts: "outside-only" });
|
|
dom.window.eval(translatorJsScriptContent);
|
|
|
|
await new Promise((resolve) => dom.window.onload = resolve);
|
|
|
|
const { Translator } = dom.window;
|
|
setTranslations(Translator);
|
|
const translation = Translator.translate({ name: "MMM-Module" }, "Fallback");
|
|
expect(translation).toBe("core fallback");
|
|
});
|
|
|
|
it("should return translation with placeholder for missing variables", async () => {
|
|
const dom = new JSDOM("", { runScripts: "outside-only" });
|
|
dom.window.eval(translatorJsScriptContent);
|
|
|
|
await new Promise((resolve) => dom.window.onload = resolve);
|
|
|
|
const { Translator } = dom.window;
|
|
setTranslations(Translator);
|
|
const translation = Translator.translate({ name: "MMM-Module" }, "Hello {username}");
|
|
expect(translation).toBe("Hallo {username}");
|
|
});
|
|
|
|
it("should return key if no translation was found", async () => {
|
|
const dom = new JSDOM("", { runScripts: "outside-only" });
|
|
dom.window.eval(translatorJsScriptContent);
|
|
|
|
await new Promise((resolve) => dom.window.onload = resolve);
|
|
|
|
const { Translator } = dom.window;
|
|
setTranslations(Translator);
|
|
const translation = Translator.translate({ name: "MMM-Module" }, "MISSING");
|
|
expect(translation).toBe("MISSING");
|
|
});
|
|
});
|
|
|
|
describe("load", () => {
|
|
const mmm = {
|
|
name: "TranslationTest",
|
|
file (file) {
|
|
return `http://localhost:3000/translations/${file}`;
|
|
}
|
|
};
|
|
|
|
it("should load translations", async () => {
|
|
const dom = new JSDOM("", { runScripts: "outside-only" });
|
|
dom.window.eval(translatorJsScriptContent);
|
|
dom.window.Log = { log: jest.fn() };
|
|
await new Promise((resolve) => dom.window.onload = resolve);
|
|
|
|
const { Translator } = dom.window;
|
|
const file = "translation_test.json";
|
|
|
|
await Translator.load(mmm, file, false);
|
|
const json = JSON.parse(fs.readFileSync(path.join(__dirname, "..", "..", "..", "tests", "mocks", file), "utf8"));
|
|
expect(Translator.translations[mmm.name]).toEqual(json);
|
|
});
|
|
|
|
it("should load translation fallbacks", async () => {
|
|
const dom = new JSDOM("", { runScripts: "outside-only" });
|
|
dom.window.eval(translatorJsScriptContent);
|
|
|
|
await new Promise((resolve) => dom.window.onload = resolve);
|
|
|
|
const { Translator } = dom.window;
|
|
const file = "translation_test.json";
|
|
|
|
dom.window.Log = { log: jest.fn() };
|
|
await Translator.load(mmm, file, true);
|
|
const json = JSON.parse(fs.readFileSync(path.join(__dirname, "..", "..", "..", "tests", "mocks", file), "utf8"));
|
|
expect(Translator.translationsFallback[mmm.name]).toEqual(json);
|
|
});
|
|
|
|
it("should not load translations, if module fallback exists", async () => {
|
|
const dom = new JSDOM("", { runScripts: "outside-only" });
|
|
dom.window.eval(translatorJsScriptContent);
|
|
await new Promise((resolve) => dom.window.onload = resolve);
|
|
|
|
const { Translator } = dom.window;
|
|
const file = "translation_test.json";
|
|
|
|
|
|
dom.window.Log = { log: jest.fn() };
|
|
Translator.translationsFallback[mmm.name] = {
|
|
Hello: "Hallo"
|
|
};
|
|
|
|
await Translator.load(mmm, file, false);
|
|
expect(Translator.translations[mmm.name]).toBeUndefined();
|
|
expect(Translator.translationsFallback[mmm.name]).toEqual({
|
|
Hello: "Hallo"
|
|
});
|
|
});
|
|
});
|
|
|
|
describe("loadCoreTranslations", () => {
|
|
it("should load core translations and fallback", async () => {
|
|
const dom = new JSDOM("", { runScripts: "outside-only" });
|
|
dom.window.eval(translatorJsScriptContent);
|
|
dom.window.translations = { en: "http://localhost:3000/translations/translation_test.json" };
|
|
dom.window.Log = { log: jest.fn() };
|
|
await new Promise((resolve) => dom.window.onload = resolve);
|
|
|
|
const { Translator } = dom.window;
|
|
await Translator.loadCoreTranslations("en");
|
|
|
|
const en = translationTestData;
|
|
|
|
await new Promise((resolve) => setTimeout(resolve, 500));
|
|
|
|
expect(Translator.coreTranslations).toEqual(en);
|
|
expect(Translator.coreTranslationsFallback).toEqual(en);
|
|
});
|
|
|
|
it("should load core fallback if language cannot be found", async () => {
|
|
const dom = new JSDOM("", { runScripts: "outside-only" });
|
|
dom.window.eval(translatorJsScriptContent);
|
|
dom.window.translations = { en: "http://localhost:3000/translations/translation_test.json" };
|
|
dom.window.Log = { log: jest.fn() };
|
|
await new Promise((resolve) => dom.window.onload = resolve);
|
|
|
|
const { Translator } = dom.window;
|
|
await Translator.loadCoreTranslations("MISSINGLANG");
|
|
|
|
const en = translationTestData;
|
|
|
|
await new Promise((resolve) => setTimeout(resolve, 500));
|
|
|
|
expect(Translator.coreTranslations).toEqual({});
|
|
expect(Translator.coreTranslationsFallback).toEqual(en);
|
|
});
|
|
});
|
|
|
|
describe("loadCoreTranslationsFallback", () => {
|
|
it("should load core translations fallback", async () => {
|
|
const dom = new JSDOM("", { runScripts: "outside-only" });
|
|
dom.window.eval(translatorJsScriptContent);
|
|
dom.window.translations = { en: "http://localhost:3000/translations/translation_test.json" };
|
|
dom.window.Log = { log: jest.fn() };
|
|
await new Promise((resolve) => dom.window.onload = resolve);
|
|
|
|
const { Translator } = dom.window;
|
|
await Translator.loadCoreTranslationsFallback();
|
|
|
|
const en = translationTestData;
|
|
|
|
await new Promise((resolve) => setTimeout(resolve, 500));
|
|
|
|
expect(Translator.coreTranslationsFallback).toEqual(en);
|
|
});
|
|
|
|
it("should load core fallback if language cannot be found", async () => {
|
|
const dom = new JSDOM("", { runScripts: "outside-only" });
|
|
dom.window.eval(translatorJsScriptContent);
|
|
dom.window.translations = {};
|
|
dom.window.Log = { log: jest.fn() };
|
|
|
|
await new Promise((resolve) => dom.window.onload = resolve);
|
|
|
|
const { Translator } = dom.window;
|
|
await Translator.loadCoreTranslations();
|
|
|
|
await new Promise((resolve) => setTimeout(resolve, 500));
|
|
|
|
expect(Translator.coreTranslationsFallback).toEqual({});
|
|
});
|
|
});
|
|
});
|