Merge branch 'develop' into mm-install

CHANGELOG.md

@@ -11,13 +11,17 @@ _This release is scheduled to be released on 2022-10-01._
 
 ## Added
 
-- new scripts `install-mm` (and `install-mm:dev`) for simplifying mm installation (now: `npm run install-mm`) and adding params `--no-audit --no-fund --no-update-notifier` for less noise.
+- New scripts `install-mm` (and `install-mm:dev`) for simplifying mm installation (now: `npm run install-mm`) and adding params `--no-audit --no-fund --no-update-notifier` for less noise.
+- New `showTimeToday` option in calendar module shows time for current-day events even if `timeFormat` is `"relative"`
 
 ## Updated
 
+- Removed DAYAFTERTOMORROW from English
+
 ## Fixed
 
 - Broadcast all calendar events while still honoring global and per-calendar maximumEntries.
+- Respect rss ttl provided by newsfeed (#2883).
 
 ## [2.20.0] - 2022-07-02
 

modules/default/calendar/calendar.js

@@ -37,6 +37,7 @@ Module.register("calendar", {
 		hidePrivate: false,
 		hideOngoing: false,
 		hideTime: false,
+		showTimeToday: false,
 		colored: false,
 		coloredSymbolOnly: false,
 		customEvents: [], // Array of {keyword: "", symbol: "", color: ""} where Keyword is a regexp and symbol/color are to be applied for matched
@@ -368,7 +369,7 @@ Module.register("calendar", {
 						} else {
 							timeWrapper.innerHTML = this.capFirst(
 								moment(event.startDate, "x").calendar(null, {
-									sameDay: "[" + this.translate("TODAY") + "]",
+									sameDay: this.config.showTimeToday ? "LT" : "[" + this.translate("TODAY") + "]",
 									nextDay: "[" + this.translate("TOMORROW") + "]",
 									nextWeek: "dddd",
 									sameElse: event.fullDayEvent ? this.config.fullDayEventDateFormat : this.config.dateFormat

modules/default/newsfeed/newsfeedfetcher.js

@@ -78,6 +78,19 @@ const NewsfeedFetcher = function (url, reloadInterval, encoding, logFeedWarnings
 			scheduleTimer();
 		});
 
+		parser.on("ttl", (minutes) => {
+			try {
+				// 86400000 = 24 hours is mentioned in the docs as maximum value:
+				const ttlms = Math.min(minutes * 60 * 1000, 86400000);
+				if (ttlms > reloadInterval) {
+					reloadInterval = ttlms;
+					Log.info("Newsfeed-Fetcher: reloadInterval set to ttl=" + reloadInterval + " for url " + url);
+				}
+			} catch (error) {
+				Log.warn("Newsfeed-Fetcher: feed ttl is no valid integer=" + minutes + " for url " + url);
+			}
+		});
+
 		const nodeVersion = Number(process.version.match(/^v(\d+\.\d+)/)[1]);
 		const headers = {
 			"User-Agent": "Mozilla/5.0 (Node.js " + nodeVersion + ") MagicMirror/" + global.version,

tests/e2e/translations_spec.js

@@ -164,7 +164,7 @@ describe("Translations", function () {
 			dom.window.onload = function () {
 				const { Translator } = dom.window;
 
-				Translator.load(mmm, translations.en, false, function () {
+				Translator.load(mmm, translations.de, false, function () {
 					base = Object.keys(Translator.translations[mmm.name]).sort();
 					done();
 				});
@@ -175,8 +175,10 @@ describe("Translations", function () {
 			console.log(missing);
 		});
 
+		// Using German as the base rather than English, since
+		// at least one translated word doesn't exist in English.
 		for (let language in translations) {
-			if (language === "en") {
+			if (language === "de") {
 				continue;
 			}
 

translations/en.json

@@ -3,7 +3,6 @@
 
 	"TODAY": "Today",
 	"TOMORROW": "Tomorrow",
-	"DAYAFTERTOMORROW": "In 2 days",
 	"RUNNING": "Ends in",
 	"EMPTY": "No upcoming events.",
 	"WEEK": "Week {weekNumber}",