From f01e7b7e204de2f9a78c7c793bccfb543b719cc1 Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Wed, 4 Jul 2018 11:32:04 +0200 Subject: [PATCH 01/41] Prepare for 2.5.0 --- CHANGELOG.md | 9 +++++++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c242e50..b0090f5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). --- +## [2.5.0] - Unreleased + +*This release is scheduled to be released on 2018-10-01.* + +### Added + +### Fixed + +### Updated ## [2.4.1] - 2018-07-04 diff --git a/package-lock.json b/package-lock.json index 6241a3d6..3376a2e3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "magicmirror", - "version": "2.4.1", + "version": "2.5.0-dev", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index b220bee6..2aae05eb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "magicmirror", - "version": "2.4.1", + "version": "2.5.0-dev", "description": "The open source modular smart mirror platform.", "main": "js/electron.js", "scripts": { From d12509957f754ad9977afc8027a2e0676c9fa5c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Cederstr=C3=B6m?= Date: Sat, 7 Jul 2018 16:35:07 +0200 Subject: [PATCH 02/41] Abillity to toggle article in fullscreen --- modules/default/newsfeed/README.md | 1 + modules/default/newsfeed/newsfeed.js | 34 ++++++++++++++++++---------- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/modules/default/newsfeed/README.md b/modules/default/newsfeed/README.md index 6c559578..f4888ebb 100644 --- a/modules/default/newsfeed/README.md +++ b/modules/default/newsfeed/README.md @@ -41,6 +41,7 @@ MagicMirror's [notification mechanism](https://github.com/MichMich/MagicMirror/t | `ARTICLE_PREVIOUS` | Shows the previous news title (hiding the summary or previously fully displayed article) | `ARTICLE_MORE_DETAILS` | When received the _first time_, shows the corresponding description of the currently displayed news title.
The module expects that the module's configuration option `showDescription` is set to `false` (default value).

When received a _second consecutive time_, shows the full news article in an IFRAME.
This requires that the news page can be embedded in an IFRAME, e.g. doesn't have the HTTP response header [X-Frame-Options](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options) set to e.g. `DENY`.

When received the _next consecutive times_, reloads the page and scrolls down by `scrollLength` pixels to paginate through the article. | `ARTICLE_LESS_DETAILS` | Hides the summary or full news article and only displays the news title of the currently viewed news item. +| `ARTICLE_TOGGLE_FULL` | Toogles article in fullscreen. Note the payload of the sent notification event is ignored. diff --git a/modules/default/newsfeed/newsfeed.js b/modules/default/newsfeed/newsfeed.js index 60562248..1d141b95 100644 --- a/modules/default/newsfeed/newsfeed.js +++ b/modules/default/newsfeed/newsfeed.js @@ -366,19 +366,8 @@ Module.register("newsfeed",{ Log.info(this.name + " - scrolling down"); Log.info(this.name + " - ARTICLE_MORE_DETAILS, scroll position: " + this.config.scrollLength); } - // display full article else { - this.isShowingDescription = !this.isShowingDescription; - this.config.showFullArticle = !this.isShowingDescription; - // make bottom bar align to top to allow scrolling - if(this.config.showFullArticle == true){ - document.getElementsByClassName("region bottom bar")[0].style.bottom = "inherit"; - document.getElementsByClassName("region bottom bar")[0].style.top = "-90px"; - } - clearInterval(timer); - timer = null; - Log.info(this.name + " - showing " + this.isShowingDescription ? "article description" : "full article"); - this.updateDom(100); + this.showFullArticle(); } } else if(notification == "ARTICLE_SCROLL_UP"){ if(this.config.showFullArticle == true){ @@ -391,9 +380,30 @@ Module.register("newsfeed",{ this.resetDescrOrFullArticleAndTimer(); Log.info(this.name + " - showing only article titles again"); this.updateDom(100); + } else if (notification == "ARTICLE_TOGGLE_FULL"){ + if (this.config.showFullArticle){ + this.activeItem++; + this.resetDescrOrFullArticleAndTimer(); + } else { + this.showFullArticle(); + } } else { Log.info(this.name + " - unknown notification, ignoring: " + notification); } }, + showFullArticle: function() { + this.isShowingDescription = !this.isShowingDescription; + this.config.showFullArticle = !this.isShowingDescription; + // make bottom bar align to top to allow scrolling + if(this.config.showFullArticle == true){ + document.getElementsByClassName("region bottom bar")[0].style.bottom = "inherit"; + document.getElementsByClassName("region bottom bar")[0].style.top = "-90px"; + } + clearInterval(timer); + timer = null; + Log.info(this.name + " - showing " + this.isShowingDescription ? "article description" : "full article"); + this.updateDom(100); + } + }); From b5a7234cf31e7d8a1825f752203112bd580b1176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Cederstr=C3=B6m?= Date: Sat, 7 Jul 2018 17:26:17 +0200 Subject: [PATCH 03/41] Swedish translation for "FEELS" --- translations/sv.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/translations/sv.json b/translations/sv.json index 07ca0aa1..a8a5c4ea 100644 --- a/translations/sv.json +++ b/translations/sv.json @@ -28,5 +28,7 @@ "UPDATE_NOTIFICATION": "MagicMirror² uppdatering finns tillgänglig.", "UPDATE_NOTIFICATION_MODULE": "Uppdatering finns tillgänglig av {MODULE_NAME} modulen.", - "UPDATE_INFO": "Denna installation ligger {COMMIT_COUNT} steg bakom {BRANCH_NAME} grenen." + "UPDATE_INFO": "Denna installation ligger {COMMIT_COUNT} steg bakom {BRANCH_NAME} grenen.", + + "FEELS": "Känns som" } From 44e691e840d038a60dd6fbd050f2ade2d83a0139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Cederstr=C3=B6m?= Date: Sat, 7 Jul 2018 17:35:04 +0200 Subject: [PATCH 04/41] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b0090f5f..85d725b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Added +- Support for toggling news article in fullscreen + ### Fixed ### Updated From e87c2350b752caa0b47d1d974cc945ac4756ba11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Cederstr=C3=B6m?= Date: Sat, 7 Jul 2018 17:36:51 +0200 Subject: [PATCH 05/41] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b0090f5f..5d71bbf3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Updated +- Swedish translations + ## [2.4.1] - 2018-07-04 ### Fixed From 08fa511d170a79c9744271fc589b6c8d33e7bf13 Mon Sep 17 00:00:00 2001 From: Teddy Payet Date: Tue, 10 Jul 2018 15:03:54 +0200 Subject: [PATCH 06/41] Add some translations (mostly french). --- CHANGELOG.md | 3 +- modules/default/alert/translations/fr.json | 4 +++ modules/default/newsfeed/newsfeed.js | 32 +++++++++---------- modules/default/newsfeed/translations/de.json | 3 ++ modules/default/newsfeed/translations/en.json | 3 ++ modules/default/newsfeed/translations/es.json | 3 ++ modules/default/newsfeed/translations/fr.json | 3 ++ translations/fr.json | 8 +++-- 8 files changed, 39 insertions(+), 20 deletions(-) create mode 100644 modules/default/alert/translations/fr.json create mode 100644 modules/default/newsfeed/translations/de.json create mode 100644 modules/default/newsfeed/translations/en.json create mode 100644 modules/default/newsfeed/translations/es.json create mode 100644 modules/default/newsfeed/translations/fr.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 850ebce7..714260a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). *This release is scheduled to be released on 2018-10-01.* ### Added - +- French translate for "Feels" +- Translations for newsfeed module - Support for toggling news article in fullscreen ### Fixed diff --git a/modules/default/alert/translations/fr.json b/modules/default/alert/translations/fr.json new file mode 100644 index 00000000..c89417f2 --- /dev/null +++ b/modules/default/alert/translations/fr.json @@ -0,0 +1,4 @@ +{ + "sysTitle": "MagicMirror Notification", + "welcome": "Bienvenue, le démarrage a été un succès!" +} diff --git a/modules/default/newsfeed/newsfeed.js b/modules/default/newsfeed/newsfeed.js index 1d141b95..26c3cfdc 100644 --- a/modules/default/newsfeed/newsfeed.js +++ b/modules/default/newsfeed/newsfeed.js @@ -90,7 +90,7 @@ Module.register("newsfeed",{ if (this.config.feedUrl) { wrapper.className = "small bright"; - wrapper.innerHTML = "The configuration options for the newsfeed module have changed.
Please check the documentation."; + wrapper.innerHTML = this.translate("configuration_changed"); return wrapper; } @@ -123,21 +123,21 @@ Module.register("newsfeed",{ //Remove selected tags from the beginning of rss feed items (title or description) - if (this.config.removeStartTags == "title" || this.config.removeStartTags == "both") { + if (this.config.removeStartTags === "title" || this.config.removeStartTags === "both") { for (f=0; f= this.newsItems.length) { @@ -347,7 +347,7 @@ Module.register("newsfeed",{ this.resetDescrOrFullArticleAndTimer(); Log.info(this.name + " - going from article #" + before + " to #" + this.activeItem + " (of " + this.newsItems.length + ")"); this.updateDom(100); - } else if(notification == "ARTICLE_PREVIOUS"){ + } else if(notification === "ARTICLE_PREVIOUS"){ var before = this.activeItem; this.activeItem--; if (this.activeItem < 0) { @@ -358,9 +358,9 @@ Module.register("newsfeed",{ this.updateDom(100); } // if "more details" is received the first time: show article summary, on second time show full article - else if(notification == "ARTICLE_MORE_DETAILS"){ + else if(notification === "ARTICLE_MORE_DETAILS"){ // full article is already showing, so scrolling down - if(this.config.showFullArticle == true){ + if(this.config.showFullArticle === true){ this.scrollPosition += this.config.scrollLength; window.scrollTo(0, this.scrollPosition); Log.info(this.name + " - scrolling down"); @@ -369,18 +369,18 @@ Module.register("newsfeed",{ else { this.showFullArticle(); } - } else if(notification == "ARTICLE_SCROLL_UP"){ - if(this.config.showFullArticle == true){ + } else if(notification === "ARTICLE_SCROLL_UP"){ + if(this.config.showFullArticle === true){ this.scrollPosition -= this.config.scrollLength; window.scrollTo(0, this.scrollPosition); Log.info(this.name + " - scrolling up"); Log.info(this.name + " - ARTICLE_SCROLL_UP, scroll position: " + this.config.scrollLength); } - } else if(notification == "ARTICLE_LESS_DETAILS"){ + } else if(notification === "ARTICLE_LESS_DETAILS"){ this.resetDescrOrFullArticleAndTimer(); Log.info(this.name + " - showing only article titles again"); this.updateDom(100); - } else if (notification == "ARTICLE_TOGGLE_FULL"){ + } else if (notification === "ARTICLE_TOGGLE_FULL"){ if (this.config.showFullArticle){ this.activeItem++; this.resetDescrOrFullArticleAndTimer(); @@ -396,7 +396,7 @@ Module.register("newsfeed",{ this.isShowingDescription = !this.isShowingDescription; this.config.showFullArticle = !this.isShowingDescription; // make bottom bar align to top to allow scrolling - if(this.config.showFullArticle == true){ + if(this.config.showFullArticle === true){ document.getElementsByClassName("region bottom bar")[0].style.bottom = "inherit"; document.getElementsByClassName("region bottom bar")[0].style.top = "-90px"; } diff --git a/modules/default/newsfeed/translations/de.json b/modules/default/newsfeed/translations/de.json new file mode 100644 index 00000000..6143f68c --- /dev/null +++ b/modules/default/newsfeed/translations/de.json @@ -0,0 +1,3 @@ +{ + "configuration_changed": "Las opciones de configuración para el módulo de suministro de noticias han cambiado. \nVerifique la documentación." +} \ No newline at end of file diff --git a/modules/default/newsfeed/translations/en.json b/modules/default/newsfeed/translations/en.json new file mode 100644 index 00000000..23b6100d --- /dev/null +++ b/modules/default/newsfeed/translations/en.json @@ -0,0 +1,3 @@ +{ + "configuration_changed": "The configuration options for the newsfeed module have changed.\nPlease check the documentation." +} \ No newline at end of file diff --git a/modules/default/newsfeed/translations/es.json b/modules/default/newsfeed/translations/es.json new file mode 100644 index 00000000..9ec3ef7b --- /dev/null +++ b/modules/default/newsfeed/translations/es.json @@ -0,0 +1,3 @@ +{ + "configuration_changed": "Die Konfigurationsoptionen für das Newsfeed-Modul haben sich geändert. \nBitte überprüfen Sie die Dokumentation." +} \ No newline at end of file diff --git a/modules/default/newsfeed/translations/fr.json b/modules/default/newsfeed/translations/fr.json new file mode 100644 index 00000000..85c6b412 --- /dev/null +++ b/modules/default/newsfeed/translations/fr.json @@ -0,0 +1,3 @@ +{ + "configuration_changed": "Les options de configuration du module newsfeed ont changé. \nVeuillez consulter la documentation." +} \ No newline at end of file diff --git a/translations/fr.json b/translations/fr.json index 1f7f9f86..65195b8e 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -6,7 +6,7 @@ "DAYAFTERTOMORROW": "Après-demain", "RUNNING": "Se termine dans", "EMPTY": "Aucun RDV à venir.", - + "WEEK": "Semaine {weekNumber}", "N": "N", @@ -25,8 +25,10 @@ "WNW": "ONO", "NW": "NO", "NNW": "NNO", - + "UPDATE_NOTIFICATION": "Une mise à jour de MagicMirror² est disponible", "UPDATE_NOTIFICATION_MODULE": "Une mise à jour est disponible pour le module {MODULE_NAME} .", -"UPDATE_INFO": "L'installation actuelle est {COMMIT_COUNT} en retard sur la branche {BRANCH_NAME} ." + "UPDATE_INFO": "L'installation actuelle est {COMMIT_COUNT} en retard sur la branche {BRANCH_NAME} .", + + "FEELS": "Ressenti" } From 4aa3353a1d03a3caf740fb1e156929c8917fadfd Mon Sep 17 00:00:00 2001 From: Teddy Payet Date: Wed, 11 Jul 2018 01:45:16 +0200 Subject: [PATCH 07/41] =?UTF-8?q?Wrong=20mixup=E2=80=A6=20(cf=20german=20a?= =?UTF-8?q?nd=20spanish)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks fewieden. --- modules/default/newsfeed/translations/de.json | 2 +- modules/default/newsfeed/translations/es.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/default/newsfeed/translations/de.json b/modules/default/newsfeed/translations/de.json index 6143f68c..9ec3ef7b 100644 --- a/modules/default/newsfeed/translations/de.json +++ b/modules/default/newsfeed/translations/de.json @@ -1,3 +1,3 @@ { - "configuration_changed": "Las opciones de configuración para el módulo de suministro de noticias han cambiado. \nVerifique la documentación." + "configuration_changed": "Die Konfigurationsoptionen für das Newsfeed-Modul haben sich geändert. \nBitte überprüfen Sie die Dokumentation." } \ No newline at end of file diff --git a/modules/default/newsfeed/translations/es.json b/modules/default/newsfeed/translations/es.json index 9ec3ef7b..6143f68c 100644 --- a/modules/default/newsfeed/translations/es.json +++ b/modules/default/newsfeed/translations/es.json @@ -1,3 +1,3 @@ { - "configuration_changed": "Die Konfigurationsoptionen für das Newsfeed-Modul haben sich geändert. \nBitte überprüfen Sie die Dokumentation." + "configuration_changed": "Las opciones de configuración para el módulo de suministro de noticias han cambiado. \nVerifique la documentación." } \ No newline at end of file From 3350bf1ac652f05d7c1240e0656cc2036b9fa7e7 Mon Sep 17 00:00:00 2001 From: Teddy Payet Date: Wed, 11 Jul 2018 01:52:29 +0200 Subject: [PATCH 08/41] CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 714260a2..e266cd9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Support for toggling news article in fullscreen ### Fixed +- Mixup between german and spanish translation for newsfeed. ### Updated From 717c6555cb5ae13516ee1f3fb1c90c08a50b729d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Bal=C3=A1ssy?= Date: Fri, 13 Jul 2018 16:23:34 +0200 Subject: [PATCH 09/41] ADDED: Missing Hungarian localization for the "WEEK" resource key. --- translations/hu.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/translations/hu.json b/translations/hu.json index 6c0a1a28..78c69859 100644 --- a/translations/hu.json +++ b/translations/hu.json @@ -7,6 +7,8 @@ "RUNNING": "Vége lesz", "EMPTY": "Nincs közelgő esemény.", + "WEEK": "{weekNumber}. hét", + "N": "É", "NNE": "ÉÉK", "NE": "ÉK", From db21ced10498a7d2e2515527f7a6cbf59d73825f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Bal=C3=A1ssy?= Date: Fri, 13 Jul 2018 16:26:15 +0200 Subject: [PATCH 10/41] ADDED: Missing Hungarian localization for the "FEELS" resource key. --- translations/hu.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/translations/hu.json b/translations/hu.json index 78c69859..6b1b9067 100644 --- a/translations/hu.json +++ b/translations/hu.json @@ -28,5 +28,7 @@ "UPDATE_NOTIFICATION": "MagicMirror² elérhető egy frissítés!", "UPDATE_NOTIFICATION_MODULE": "A frissítés {MODULE_NAME} modul néven érhető el.", - "UPDATE_INFO": "A jelenlegi telepítés {COMMIT_COUNT} mögött {BRANCH_NAME} ágon található." + "UPDATE_INFO": "A jelenlegi telepítés {COMMIT_COUNT} mögött {BRANCH_NAME} ágon található.", + + "FEELS": "Érzet" } From 80bd32382fb7c8c839a0a6d67fc07a66096a3c50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Bal=C3=A1ssy?= Date: Fri, 13 Jul 2018 16:32:32 +0200 Subject: [PATCH 11/41] CHANGED: The Hungarian localization of the updatenotification module is changed to be more natural, because the existing messages felt like they were created with machine translation, and they were not only unnatural, but also misleading. --- translations/hu.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translations/hu.json b/translations/hu.json index 6b1b9067..b483ecd9 100644 --- a/translations/hu.json +++ b/translations/hu.json @@ -26,9 +26,9 @@ "NW": "ÉNy", "NNW": "ÉÉNy", - "UPDATE_NOTIFICATION": "MagicMirror² elérhető egy frissítés!", - "UPDATE_NOTIFICATION_MODULE": "A frissítés {MODULE_NAME} modul néven érhető el.", - "UPDATE_INFO": "A jelenlegi telepítés {COMMIT_COUNT} mögött {BRANCH_NAME} ágon található.", + "UPDATE_NOTIFICATION": "MagicMirror²-hoz frissítés érhető el.", + "UPDATE_NOTIFICATION_MODULE": "A {MODULE_NAME} modulhoz frissítés érhető el.", + "UPDATE_INFO": "A jelenlegi telepítés óta {COMMIT_COUNT} commit jelent meg a {BRANCH_NAME} ágon.", "FEELS": "Érzet" } From a7278f76a8c8c92dfbba44481ce40c0db78de912 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Bal=C3=A1ssy?= Date: Fri, 13 Jul 2018 16:42:47 +0200 Subject: [PATCH 12/41] UPDATED: The CHANGELOG.md file with description of the changes in the Hungarian localization. --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e266cd9b..0c9c90df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - French translate for "Feels" - Translations for newsfeed module - Support for toggling news article in fullscreen +- Hungarian translation for "Feels" and "Week" ### Fixed - Mixup between german and spanish translation for newsfeed. @@ -19,6 +20,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Updated - Swedish translations +- Hungarian translations for the updatenotification module ## [2.4.1] - 2018-07-04 From e6edf85fbe82ea09643ca8b52d726ddb7fc86842 Mon Sep 17 00:00:00 2001 From: jagoba Date: Sun, 15 Jul 2018 19:13:04 +0200 Subject: [PATCH 13/41] Added Spanish translation for "FEELS" --- CHANGELOG.md | 1 + translations/es.json | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c9c90df..e7079571 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Translations for newsfeed module - Support for toggling news article in fullscreen - Hungarian translation for "Feels" and "Week" +- Spanish translation for "Feels" ### Fixed - Mixup between german and spanish translation for newsfeed. diff --git a/translations/es.json b/translations/es.json index 44d08c2c..c2420494 100644 --- a/translations/es.json +++ b/translations/es.json @@ -28,5 +28,7 @@ "UPDATE_NOTIFICATION": "MagicMirror² actualización disponible.", "UPDATE_NOTIFICATION_MODULE": "Disponible una actualización para el módulo {MODULE_NAME}.", - "UPDATE_INFO": "Tu actual instalación está {COMMIT_COUNT} cambios detrás de la rama {BRANCH_NAME}." + "UPDATE_INFO": "Tu actual instalación está {COMMIT_COUNT} cambios detrás de la rama {BRANCH_NAME}.", + + "FEELS": "Sensación térmica de" } From 81432b54a344e8fdc73b5c6f948b005f9e8c45d4 Mon Sep 17 00:00:00 2001 From: Teddy Payet Date: Wed, 1 Aug 2018 09:37:27 +0200 Subject: [PATCH 14/41] Classes for alert module Use of classes instead of inline style. With those modifications, it will be easier to personnalize the alert with custom.css --- modules/default/alert/alert.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/modules/default/alert/alert.js b/modules/default/alert/alert.js index 85d6ef42..cc0ae302 100644 --- a/modules/default/alert/alert.js +++ b/modules/default/alert/alert.js @@ -38,13 +38,13 @@ Module.register("alert",{ if (this.config.effect == "slide") {this.config.effect = this.config.effect + "-" + this.config.position;} msg = ""; if (message.title) { - msg += "" + message.title + ""; + msg += "" + message.title + ""; } if (message.message){ if (msg != ""){ msg+= "
"; } - msg += "" + message.message + ""; + msg += "" + message.message + ""; } new NotificationFx({ @@ -63,9 +63,9 @@ Module.register("alert",{ params.imageUrl = null; image = ""; } else if (typeof params.imageFA === "undefined"){ - image = "
"; + image = "
"; } else if (typeof params.imageUrl === "undefined"){ - image = "
"; + image = "
"; } //Create overlay var overlay = document.createElement("div"); @@ -79,16 +79,16 @@ Module.register("alert",{ } //Display title and message only if they are provided in notification parameters - message =""; + var message = ""; if (params.title) { - message += "" + params.title + "" + message += "" + params.title + ""; } if (params.message) { - if (message != ""){ + if (message !== ""){ message += "
"; } - message += "" + params.message + ""; + message += "" + params.message + ""; } //Store alert in this.alerts @@ -121,16 +121,16 @@ Module.register("alert",{ setPosition: function(pos) { //Add css to body depending on the set position for notifications var sheet = document.createElement("style"); - if (pos == "center") {sheet.innerHTML = ".ns-box {margin-left: auto; margin-right: auto;text-align: center;}";} - if (pos == "right") {sheet.innerHTML = ".ns-box {margin-left: auto;text-align: right;}";} - if (pos == "left") {sheet.innerHTML = ".ns-box {margin-right: auto;text-align: left;}";} + if (pos === "center") {sheet.innerHTML = ".ns-box {margin-left: auto; margin-right: auto;text-align: center;}";} + if (pos === "right") {sheet.innerHTML = ".ns-box {margin-left: auto;text-align: right;}";} + if (pos === "left") {sheet.innerHTML = ".ns-box {margin-right: auto;text-align: left;}";} document.body.appendChild(sheet); }, notificationReceived: function(notification, payload, sender) { if (notification === "SHOW_ALERT") { if (typeof payload.type === "undefined") { payload.type = "alert"; } - if (payload.type == "alert") { + if (payload.type === "alert") { this.show_alert(payload, sender); } else if (payload.type = "notification") { this.show_notification(payload); @@ -143,7 +143,7 @@ Module.register("alert",{ this.alerts = {}; this.setPosition(this.config.position); if (this.config.welcome_message) { - if (this.config.welcome_message == true){ + if (this.config.welcome_message === true){ this.show_notification({title: this.translate("sysTitle"), message: this.translate("welcome")}); } else{ From 4a07272d7afd82a326f88bda9dfb687bbe1b28af Mon Sep 17 00:00:00 2001 From: Teddy Payet Date: Wed, 1 Aug 2018 09:42:23 +0200 Subject: [PATCH 15/41] Changelog.md updated --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e7079571..4b8c087c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Support for toggling news article in fullscreen - Hungarian translation for "Feels" and "Week" - Spanish translation for "Feels" +- Add classes instead of inline style to the message from the module Alert ### Fixed - Mixup between german and spanish translation for newsfeed. From ae86b75d89fa54692ac307c55597ef0080e9bfbf Mon Sep 17 00:00:00 2001 From: heskja Date: Fri, 3 Aug 2018 20:22:44 +0200 Subject: [PATCH 16/41] Update nb.json Added translation for "FEELS" --- translations/nb.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/translations/nb.json b/translations/nb.json index 0a0595ac..30f271c6 100644 --- a/translations/nb.json +++ b/translations/nb.json @@ -28,5 +28,7 @@ "UPDATE_NOTIFICATION": "MagicMirror²-oppdatering er tilgjengelig.", "UPDATE_NOTIFICATION_MODULE": "Oppdatering tilgjengelig for modulen {MODULE_NAME}.", - "UPDATE_INFO": "Nåværende installasjon er {COMMIT_COUNT} bak {BRANCH_NAME} grenen." + "UPDATE_INFO": "Nåværende installasjon er {COMMIT_COUNT} bak {BRANCH_NAME} grenen.", + + "FEELS": "Føles som" } From 20a9ac841df51eec1723de298d7953fbb1801c5a Mon Sep 17 00:00:00 2001 From: heskja Date: Fri, 3 Aug 2018 20:23:19 +0200 Subject: [PATCH 17/41] Update nn.json Added translation for "FEELS" --- translations/nn.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/translations/nn.json b/translations/nn.json index 3c33c597..5e321fea 100644 --- a/translations/nn.json +++ b/translations/nn.json @@ -26,5 +26,7 @@ "UPDATE_NOTIFICATION": "MagicMirror² oppdatering er tilgjengeleg.", "UPDATE_NOTIFICATION_MODULE": "Oppdatering tilgjengeleg for modulen {MODULE_NAME}.", - "UPDATE_INFO": "noverande installasjon er {COMMIT_COUNT} bak {BRANCH_NAME} greinen." + "UPDATE_INFO": "noverande installasjon er {COMMIT_COUNT} bak {BRANCH_NAME} greinen.", + + "FEELS": "Kjenst som" } From c9577bcdc50d7d62090fdd54ac169a69309acaaa Mon Sep 17 00:00:00 2001 From: Janne Kalliola Date: Sun, 5 Aug 2018 19:47:27 +0300 Subject: [PATCH 18/41] Added an if to use absolute dates with all events --- modules/default/calendar/calendar.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js index 0780fb5c..7a4c2206 100755 --- a/modules/default/calendar/calendar.js +++ b/modules/default/calendar/calendar.js @@ -295,8 +295,12 @@ Module.register("calendar", { // If event is within 6 hour, display 'in xxx' time format or moment.fromNow() timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow()); } else { - // Otherwise just say 'Today/Tomorrow at such-n-such time' - timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").calendar()); + if(this.config.timeFormat === "absolute") { + timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").format(this.config.dateFormat)); + } else { + // Otherwise just say 'Today/Tomorrow at such-n-such time' + timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").calendar()); + } } } else { /* Check to see if the user displays absolute or relative dates with their events From 7c5e8a66e4269561d28b5d0dcf48495c23876edb Mon Sep 17 00:00:00 2001 From: Janne Kalliola Date: Sun, 5 Aug 2018 19:49:26 +0300 Subject: [PATCH 19/41] Added also description of the change to changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b8c087c..67237d0c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Fixed - Mixup between german and spanish translation for newsfeed. +- Fixed close dates to be absolute, if no configured in the config.js - module Calendar ### Updated From 6598ae080fe06e01f110cad0d45429ec7c3c7e42 Mon Sep 17 00:00:00 2001 From: vincep5 Date: Tue, 7 Aug 2018 11:48:10 -0500 Subject: [PATCH 20/41] weatherforecast rainfall rounding --- CHANGELOG.md | 1 + modules/default/weatherforecast/weatherforecast.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b8c087c..5c6953d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Hungarian translation for "Feels" and "Week" - Spanish translation for "Feels" - Add classes instead of inline style to the message from the module Alert +- Fix for weatherforecast rainfall rounding [#1374](https://github.com/MichMich/MagicMirror/issues/1374) ### Fixed - Mixup between german and spanish translation for newsfeed. diff --git a/modules/default/weatherforecast/weatherforecast.js b/modules/default/weatherforecast/weatherforecast.js index c06f5f5b..19e004ff 100644 --- a/modules/default/weatherforecast/weatherforecast.js +++ b/modules/default/weatherforecast/weatherforecast.js @@ -177,7 +177,7 @@ Module.register("weatherforecast",{ rainCell.innerHTML = ""; } else { if(config.units !== "imperial") { - rainCell.innerHTML = forecast.rain + " mm"; + rainCell.innerHTML = parseFloat(forecast.rain).toFixed(1) + " mm"; } else { rainCell.innerHTML = (parseFloat(forecast.rain) / 25.4).toFixed(2) + " in"; } @@ -350,7 +350,7 @@ Module.register("weatherforecast",{ icon: this.config.iconTable[forecast.weather[0].icon], maxTemp: this.roundValue(forecast.temp.max), minTemp: this.roundValue(forecast.temp.min), - rain: this.roundValue(forecast.rain) + rain: forecast.rain }; this.forecast.push(forecastData); From a6965342e7bbc0016aa82d9f17ddaf8147c4fc19 Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Thu, 16 Aug 2018 12:00:06 +0200 Subject: [PATCH 21/41] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c6953d8..166f84b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Swedish translations - Hungarian translations for the updatenotification module +- Updated Norsk bokmål translation +- Updated Norsk nynorsk translation ## [2.4.1] - 2018-07-04 From d4ec4795c3ad2e8cdbf539917f85764082de8ce0 Mon Sep 17 00:00:00 2001 From: Elan Trybuch Date: Thu, 16 Aug 2018 11:45:34 -0400 Subject: [PATCH 22/41] Fix ES6 syntax bug on RaspberryPi Zero W Following this issue https://github.com/MichMich/MagicMirror/issues/694 it seems that the Midori Browser does not recoginize ES6 syntax. Further, the use of 'var' is seen throughout the calendar module excpet on line 439, where the error is reported --- modules/default/calendar/calendar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js index 0780fb5c..71a68efa 100755 --- a/modules/default/calendar/calendar.js +++ b/modules/default/calendar/calendar.js @@ -436,7 +436,7 @@ Module.register("calendar", { listContainsEvent: function(eventList, event){ - for(let evt of eventList){ + for(var evt of eventList){ if(evt.title === event.title && parseInt(evt.startDate) === parseInt(event.startDate)){ return true; } From 0ef4a86d426b23b9cf2fb224ea0da28178d27192 Mon Sep 17 00:00:00 2001 From: Elan Trybuch Date: Thu, 16 Aug 2018 11:51:10 -0400 Subject: [PATCH 23/41] Add patch note to CHANGELOG.md --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c242e50..891a4bd1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). --- +## [2.4.2] - 2018-08-16 + +### Fixed + +- Fix calendar parsing issue for Midori on RasperryPi Zero w, realted to issue #694. ## [2.4.1] - 2018-07-04 From 0b9d4f17ab70f4329ff3cd789f9b766d1bf7b7f6 Mon Sep 17 00:00:00 2001 From: Vincent Yang Date: Tue, 21 Aug 2018 01:04:58 -0700 Subject: [PATCH 24/41] Fix link for finding cities in OpenWeather --- config/config.js.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config.js.sample b/config/config.js.sample index a427a548..9ef8780b 100644 --- a/config/config.js.sample +++ b/config/config.js.sample @@ -59,7 +59,7 @@ var config = { position: "top_right", config: { location: "New York", - locationID: "", //ID from http://www.openweathermap.org/help/city_list.txt + locationID: "", //ID from http://bulk.openweathermap.org/sample/; unzip the gz file and find your city appid: "YOUR_OPENWEATHER_API_KEY" } }, From 217034c4a7930b53b9d9a2f0298fdb85b52c8a80 Mon Sep 17 00:00:00 2001 From: Vincent Yang Date: Tue, 21 Aug 2018 01:06:12 -0700 Subject: [PATCH 25/41] Update Changelog for weather city link --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c1d1f00b..728ec743 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Fixed -- Fix calendar parsing issue for Midori on RasperryPi Zero w, realted to issue #694. +- Fix calendar parsing issue for Midori on RasperryPi Zero w, related to issue #694. +- Fix weather city ID link in sample config ## [2.5.0] - Unreleased From 2b4000756343d1ff435be2ae8d37c2b1e2134dc1 Mon Sep 17 00:00:00 2001 From: el97 Date: Tue, 21 Aug 2018 15:29:20 +0200 Subject: [PATCH 26/41] Update sv.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Small changes. Added "FEELS": "Känns som". --- translations/sv.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/sv.json b/translations/sv.json index 07ca0aa1..c1ea7894 100644 --- a/translations/sv.json +++ b/translations/sv.json @@ -25,6 +25,7 @@ "WNW": "VNV", "NW": "NV", "NNW": "NNV", + "FEELS": "Känns som", "UPDATE_NOTIFICATION": "MagicMirror² uppdatering finns tillgänglig.", "UPDATE_NOTIFICATION_MODULE": "Uppdatering finns tillgänglig av {MODULE_NAME} modulen.", From fa1f35a89e1fb967c16511658fbf0ff21b43ac79 Mon Sep 17 00:00:00 2001 From: ccrlawrence Date: Sun, 26 Aug 2018 15:53:01 +0100 Subject: [PATCH 27/41] ClientOnly: Global variable name used in callback function. The global 'config' variable is used in the callback function, changed to local one. Unwanted behaviour when accessing server on docker or if using 0.0.0.0 or blank address in config file as it just passes this to electron to display. --- clientonly/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/clientonly/index.js b/clientonly/index.js index 28a45029..957ee114 100644 --- a/clientonly/index.js +++ b/clientonly/index.js @@ -62,13 +62,13 @@ // Only start the client if a non-local server was provided if (["localhost", "127.0.0.1", "::1", "::ffff:127.0.0.1", undefined].indexOf(config.address) === -1) { getServerConfig(`http://${config.address}:${config.port}/config/`) - .then(function (config) { + .then(function (configReturn) { // Pass along the server config via an environment variable var env = Object.create(process.env); var options = { env: env }; - config.address = config.address; - config.port = config.port; - env.config = JSON.stringify(config); + configReturn.address = config.address; + configReturn.port = config.port; + env.config = JSON.stringify(configReturn); // Spawn electron application const electron = require("electron"); From c9293327ce292664816846b74779a871abccf31c Mon Sep 17 00:00:00 2001 From: ccrlawrence Date: Sun, 26 Aug 2018 16:01:41 +0100 Subject: [PATCH 28/41] Update CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c242e50..f4c30462 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ This project adheres to [Semantic Versioning](http://semver.org/). --- +## [2.4.2] - 2018-08-26 + +### Fixed + +- Fixed issue with clientonly not updating with IP address and port provided on command line. + ## [2.4.1] - 2018-07-04 ### Fixed From 7ba88a83f047046c038322e3ea25c227a2b2e3a9 Mon Sep 17 00:00:00 2001 From: vlb Date: Tue, 28 Aug 2018 13:05:06 +0200 Subject: [PATCH 29/41] consider events lasting several full days as full day events --- modules/default/calendar/calendarfetcher.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/default/calendar/calendarfetcher.js b/modules/default/calendar/calendarfetcher.js index ccd1f6c8..e3b53b0b 100644 --- a/modules/default/calendar/calendarfetcher.js +++ b/modules/default/calendar/calendarfetcher.js @@ -273,8 +273,7 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri var start = event.start || 0; var startDate = new Date(start); var end = event.end || 0; - - if (end - start === 24 * 60 * 60 * 1000 && startDate.getHours() === 0 && startDate.getMinutes() === 0) { + if (end - start >= 24 * 60 * 60 * 1000 && startDate.getHours() === 0 && startDate.getMinutes() === 0) { // Is 24 hours, and starts on the middle of the night. return true; } From c4e8cc1641b1be02592e6254ed06ed49f78998ed Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Tue, 28 Aug 2018 15:33:53 +0200 Subject: [PATCH 30/41] Correct changelog entry. --- CHANGELOG.md | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 728ec743..bc2d1525 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,13 +5,6 @@ This project adheres to [Semantic Versioning](http://semver.org/). --- -## [2.5.1] - 2018-08-16 - -### Fixed - -- Fix calendar parsing issue for Midori on RasperryPi Zero w, related to issue #694. -- Fix weather city ID link in sample config - ## [2.5.0] - Unreleased *This release is scheduled to be released on 2018-10-01.* @@ -23,11 +16,13 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Hungarian translation for "Feels" and "Week" - Spanish translation for "Feels" - Add classes instead of inline style to the message from the module Alert -- Fix for weatherforecast rainfall rounding [#1374](https://github.com/MichMich/MagicMirror/issues/1374) ### Fixed - Mixup between german and spanish translation for newsfeed. - Fixed close dates to be absolute, if no configured in the config.js - module Calendar +- Fix for weatherforecast rainfall rounding [#1374](https://github.com/MichMich/MagicMirror/issues/1374) +- Fix calendar parsing issue for Midori on RasperryPi Zero w, related to issue #694. +- Fix weather city ID link in sample config ### Updated From c755c823facd697def2f7f2643b055108fe105be Mon Sep 17 00:00:00 2001 From: vlb Date: Tue, 28 Aug 2018 17:29:42 +0200 Subject: [PATCH 31/41] added support for events having a duration instead of an end --- CHANGELOG.md | 4 ++++ modules/default/calendar/calendarfetcher.js | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c242e50..c8cac15b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ This project adheres to [Semantic Versioning](http://semver.org/). --- +## Current - 2018-08-28 + +- Added support for events having a duration instead of an end. + ## [2.4.1] - 2018-07-04 ### Fixed diff --git a/modules/default/calendar/calendarfetcher.js b/modules/default/calendar/calendarfetcher.js index e3b53b0b..e8db5a95 100644 --- a/modules/default/calendar/calendarfetcher.js +++ b/modules/default/calendar/calendarfetcher.js @@ -90,6 +90,9 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri var endDate; if (typeof event.end !== "undefined") { endDate = eventDate(event, "end"); + } else if(typeof event.duration !== "undefined") { + dur=moment.duration(event.duration); + endDate = startDate.clone().add(dur); } else { if (!isFacebookBirthday) { endDate = startDate; @@ -273,7 +276,7 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri var start = event.start || 0; var startDate = new Date(start); var end = event.end || 0; - if (end - start >= 24 * 60 * 60 * 1000 && startDate.getHours() === 0 && startDate.getMinutes() === 0) { + if (((end - start) % (24 * 60 * 60 * 1000)) === 0 && startDate.getHours() === 0 && startDate.getMinutes() === 0) { // Is 24 hours, and starts on the middle of the night. return true; } From 7c579cf7b7af6b9f87a38b05ee78b432d0de5091 Mon Sep 17 00:00:00 2001 From: vlb Date: Tue, 28 Aug 2018 17:35:53 +0200 Subject: [PATCH 32/41] added support for showing end of events through config parameters showEnd and dateEndFormat --- modules/default/calendar/calendar.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js index 0780fb5c..d566e6c5 100755 --- a/modules/default/calendar/calendar.js +++ b/modules/default/calendar/calendar.js @@ -25,7 +25,9 @@ Module.register("calendar", { urgency: 7, timeFormat: "relative", dateFormat: "MMM Do", + dateEndFormat: "HH:mm", fullDayEventDateFormat: "MMM Do", + showEnd: true, getRelative: 6, fadePoint: 0.25, // Start on 1/4th of the list. hidePrivate: false, @@ -287,6 +289,10 @@ Module.register("calendar", { timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow()); } } + if(this.config.showEnd){ + timeWrapper.innerHTML += "-" ; + timeWrapper.innerHTML += this.capFirst(moment(event.endDate , "x").format(this.config.fullDayEventDateFormat)); + } } else { if (event.startDate >= new Date()) { if (event.startDate - now < 2 * oneDay) { @@ -325,6 +331,11 @@ Module.register("calendar", { }) ); } + if (this.config.showEnd) { + timeWrapper.innerHTML += "-"; + timeWrapper.innerHTML += this.capFirst(moment(event.endDate, "x").format(this.config.dateEndFormat)); + + } } //timeWrapper.innerHTML += ' - '+ moment(event.startDate,'x').format('lll'); //console.log(event); From 5c25dd5b6df3bfca7317dac9d21f06d32dda00d5 Mon Sep 17 00:00:00 2001 From: Vincent Le Bourlot Date: Tue, 28 Aug 2018 18:00:13 +0200 Subject: [PATCH 33/41] Update CHANGELOG.md --- CHANGELOG.md | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8cac15b..bcc063b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,9 +5,35 @@ This project adheres to [Semantic Versioning](http://semver.org/). --- -## Current - 2018-08-28 +## [2.5.0] - Unreleased -- Added support for events having a duration instead of an end. +*This release is scheduled to be released on 2018-10-01.* + +### Added +- French translate for "Feels" +- Translations for newsfeed module +- Support for toggling news article in fullscreen +- Hungarian translation for "Feels" and "Week" +- Spanish translation for "Feels" +- Add classes instead of inline style to the message from the module Alert +- Support for events having a duration instead of an end +- Support for showing end of events through config parameters showEnd and dateEndFormat + +### Fixed +- Mixup between german and spanish translation for newsfeed. +- Fixed close dates to be absolute, if no configured in the config.js - module Calendar +- Fix for weatherforecast rainfall rounding [#1374](https://github.com/MichMich/MagicMirror/issues/1374) +- Fix calendar parsing issue for Midori on RasperryPi Zero w, related to issue #694. +- Fix weather city ID link in sample config +- Fixed issue with clientonly not updating with IP address and port provided on command line. + +### Updated + +- Swedish translations +- Hungarian translations for the updatenotification module +- Updated Norsk bokmål translation +- Updated Norsk nynorsk translation +- Consider multi days event as full day events ## [2.4.1] - 2018-07-04 From 93617f62a2faa75bf45cb064308b81a5e3e81e1b Mon Sep 17 00:00:00 2001 From: matt08 Date: Fri, 31 Aug 2018 09:14:16 +0200 Subject: [PATCH 34/41] Updating "feels" translation --- translations/pl.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/translations/pl.json b/translations/pl.json index 06473ad2..464359a6 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -29,4 +29,6 @@ "UPDATE_NOTIFICATION": "Dostępna jest aktualizacja MagicMirror².", "UPDATE_NOTIFICATION_MODULE": "Dostępna jest aktualizacja modułu {MODULE_NAME}.", "UPDATE_INFO": "Zainstalowana wersja odbiega o {COMMIT_COUNT} commitów od gałęzi {BRANCH_NAME}." + + "FEELS": "Odczuwalna" } From c462a44973cb3f302769f7d8feedb4b60cdfffa0 Mon Sep 17 00:00:00 2001 From: matt08 Date: Fri, 31 Aug 2018 09:17:04 +0200 Subject: [PATCH 35/41] Polish translate for "Feels" --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bcc063b7..5e121423 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). *This release is scheduled to be released on 2018-10-01.* ### Added +- Polish translate for "Feels" - French translate for "Feels" - Translations for newsfeed module - Support for toggling news article in fullscreen From dd0334d30db1a3e85487c1565ce1fc7a8b1ad89b Mon Sep 17 00:00:00 2001 From: matt08 Date: Fri, 31 Aug 2018 09:24:18 +0200 Subject: [PATCH 36/41] Update pl.json --- translations/pl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/pl.json b/translations/pl.json index 464359a6..c07cd093 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -28,7 +28,7 @@ "UPDATE_NOTIFICATION": "Dostępna jest aktualizacja MagicMirror².", "UPDATE_NOTIFICATION_MODULE": "Dostępna jest aktualizacja modułu {MODULE_NAME}.", - "UPDATE_INFO": "Zainstalowana wersja odbiega o {COMMIT_COUNT} commitów od gałęzi {BRANCH_NAME}." + "UPDATE_INFO": "Zainstalowana wersja odbiega o {COMMIT_COUNT} commitów od gałęzi {BRANCH_NAME}.", "FEELS": "Odczuwalna" } From 35440822be1d305e7c38982992680be20ffeee04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Bal=C3=A1ssy?= Date: Sat, 18 Aug 2018 06:00:52 +0200 Subject: [PATCH 37/41] CHANGED: The COMMIT_COUNT placeholder in the UPDATE_INFO message of the UpdateNotification module does not contain the word "commit" or "commits" any more, so language files can independently localize them. --- modules/default/updatenotification/updatenotification.js | 2 +- tests/configs/data/TranslationTest.json | 2 +- tests/configs/data/en.json | 2 +- translations/af.json | 2 +- translations/bg.json | 2 +- translations/ca.json | 2 +- translations/cs.json | 2 +- translations/da.json | 2 +- translations/de.json | 2 +- translations/en.json | 2 +- translations/es.json | 2 +- translations/et.json | 2 +- translations/fr.json | 2 +- translations/hu.json | 2 +- translations/id.json | 2 +- translations/is.json | 2 +- translations/it.json | 2 +- translations/kr.json | 2 +- translations/nb.json | 2 +- translations/nl.json | 2 +- translations/nn.json | 2 +- translations/pl.json | 3 ++- translations/pt-br.json | 2 +- translations/pt.json | 2 +- translations/ru.json | 2 +- translations/sv.json | 2 +- translations/zh-cn.json | 2 +- 27 files changed, 28 insertions(+), 27 deletions(-) diff --git a/modules/default/updatenotification/updatenotification.js b/modules/default/updatenotification/updatenotification.js index b26517e5..d69f6288 100644 --- a/modules/default/updatenotification/updatenotification.js +++ b/modules/default/updatenotification/updatenotification.js @@ -59,7 +59,7 @@ Module.register("updatenotification", { message.appendChild(icon); var subtextHtml = this.translate("UPDATE_INFO", { - COMMIT_COUNT: this.status.behind + " " + ((this.status.behind == 1) ? "commit" : "commits"), + COMMIT_COUNT: this.status.behind, BRANCH_NAME: this.status.current }); diff --git a/tests/configs/data/TranslationTest.json b/tests/configs/data/TranslationTest.json index 5614b23c..53ffa825 100644 --- a/tests/configs/data/TranslationTest.json +++ b/tests/configs/data/TranslationTest.json @@ -28,5 +28,5 @@ "UPDATE_NOTIFICATION": "MagicMirror² update available.", "UPDATE_NOTIFICATION_MODULE": "Update available for MODULE_NAME module.", - "UPDATE_INFO": "The current installation is COMMIT_COUNT behind on the BRANCH_NAME branch." + "UPDATE_INFO": "The current installation is COMMIT_COUNT commit(s) behind on the BRANCH_NAME branch." } diff --git a/tests/configs/data/en.json b/tests/configs/data/en.json index 5614b23c..53ffa825 100644 --- a/tests/configs/data/en.json +++ b/tests/configs/data/en.json @@ -28,5 +28,5 @@ "UPDATE_NOTIFICATION": "MagicMirror² update available.", "UPDATE_NOTIFICATION_MODULE": "Update available for MODULE_NAME module.", - "UPDATE_INFO": "The current installation is COMMIT_COUNT behind on the BRANCH_NAME branch." + "UPDATE_INFO": "The current installation is COMMIT_COUNT commit(s) behind on the BRANCH_NAME branch." } diff --git a/translations/af.json b/translations/af.json index 68bebc8d..bef7b546 100644 --- a/translations/af.json +++ b/translations/af.json @@ -26,5 +26,5 @@ "UPDATE_NOTIFICATION": "MagicMirror² update beskikbaar.", "UPDATE_NOTIFICATION_MODULE": "Update beskikbaar vir {MODULE_NAME} module.", - "UPDATE_INFO": "Die huidige installasie is {COMMIT_COUNT} agter op die {BRANCH_NAME} branch." + "UPDATE_INFO": "Die huidige installasie is {COMMIT_COUNT} commit(s) agter op die {BRANCH_NAME} branch." } diff --git a/translations/bg.json b/translations/bg.json index 705c1396..322dc8b2 100644 --- a/translations/bg.json +++ b/translations/bg.json @@ -28,5 +28,5 @@ "UPDATE_NOTIFICATION": "Налична актуализация за MagicMirror².", "UPDATE_NOTIFICATION_MODULE": "Налична актуализация за {MODULE_NAME} модул.", - "UPDATE_INFO": "Текущата инсталация е изостанала с {COMMIT_COUNT} къмита на клон {BRANCH_NAME}." + "UPDATE_INFO": "Текущата инсталация е изостанала с {COMMIT_COUNT} commit(s) къмита на клон {BRANCH_NAME}." } diff --git a/translations/ca.json b/translations/ca.json index 76e4ad2c..674de8bf 100644 --- a/translations/ca.json +++ b/translations/ca.json @@ -28,5 +28,5 @@ "UPDATE_NOTIFICATION": "MagicMirror² actualizació disponible.", "UPDATE_NOTIFICATION_MODULE": "Disponible una actualizació per al mòdul {MODULE_NAME}.", - "UPDATE_INFO": "La teva instal·lació actual està {COMMIT_COUNT} canvis darrere de la branca {BRANCH_NAME}." + "UPDATE_INFO": "La teva instal·lació actual està {COMMIT_COUNT} commit(s) canvis darrere de la branca {BRANCH_NAME}." } diff --git a/translations/cs.json b/translations/cs.json index bec2e82c..39348e7e 100644 --- a/translations/cs.json +++ b/translations/cs.json @@ -28,5 +28,5 @@ "UPDATE_NOTIFICATION": "Dostupná aktualizace pro MagicMirror².", "UPDATE_NOTIFICATION_MODULE": "Dostupná aktualizace pro modul {MODULE_NAME}.", - "UPDATE_INFO": "Současná instalace je na větvi {BRANCH_NAME} pozadu o {COMMIT_COUNT}." + "UPDATE_INFO": "Současná instalace je na větvi {BRANCH_NAME} pozadu o {COMMIT_COUNT} commit(s)." } diff --git a/translations/da.json b/translations/da.json index fe31cba4..79877334 100644 --- a/translations/da.json +++ b/translations/da.json @@ -27,5 +27,5 @@ "UPDATE_NOTIFICATION": "MagicMirror² opdatering tilgængelig.", "UPDATE_NOTIFICATION_MODULE": "Opdatering tilgængelig for {MODULE_NAME} modulet.", - "UPDATE_INFO": "Den nuværende installation er {COMMIT_COUNT} bagud på {BRANCH_NAME} branch'en." + "UPDATE_INFO": "Den nuværende installation er {COMMIT_COUNT} commit(s) bagud på {BRANCH_NAME} branch'en." } diff --git a/translations/de.json b/translations/de.json index 050060cf..f6604bc5 100644 --- a/translations/de.json +++ b/translations/de.json @@ -28,7 +28,7 @@ "UPDATE_NOTIFICATION": "Aktualisierung für MagicMirror² verfügbar.", "UPDATE_NOTIFICATION_MODULE": "Aktualisierung für das {MODULE_NAME} Modul verfügbar.", - "UPDATE_INFO": "Die aktuelle Installation ist {COMMIT_COUNT} hinter dem {BRANCH_NAME} Branch.", + "UPDATE_INFO": "Die aktuelle Installation ist {COMMIT_COUNT} Commit(s) hinter dem {BRANCH_NAME} Branch.", "FEELS": "Gefühlt" } diff --git a/translations/en.json b/translations/en.json index 1cba9a89..563c5d30 100644 --- a/translations/en.json +++ b/translations/en.json @@ -28,7 +28,7 @@ "UPDATE_NOTIFICATION": "MagicMirror² update available.", "UPDATE_NOTIFICATION_MODULE": "Update available for {MODULE_NAME} module.", - "UPDATE_INFO": "The current installation is {COMMIT_COUNT} behind on the {BRANCH_NAME} branch.", + "UPDATE_INFO": "The current installation is {COMMIT_COUNT} commit(s) behind on the {BRANCH_NAME} branch.", "FEELS": "Feels" } diff --git a/translations/es.json b/translations/es.json index c2420494..9086ae79 100644 --- a/translations/es.json +++ b/translations/es.json @@ -28,7 +28,7 @@ "UPDATE_NOTIFICATION": "MagicMirror² actualización disponible.", "UPDATE_NOTIFICATION_MODULE": "Disponible una actualización para el módulo {MODULE_NAME}.", - "UPDATE_INFO": "Tu actual instalación está {COMMIT_COUNT} cambios detrás de la rama {BRANCH_NAME}.", + "UPDATE_INFO": "Tu actual instalación está {COMMIT_COUNT} commit(s) cambios detrás de la rama {BRANCH_NAME}.", "FEELS": "Sensación térmica de" } diff --git a/translations/et.json b/translations/et.json index f7ad1f0e..4283a048 100644 --- a/translations/et.json +++ b/translations/et.json @@ -26,5 +26,5 @@ "UPDATE_NOTIFICATION": "MagicMirror²´le uuendus saadaval.", "UPDATE_NOTIFICATION_MODULE": "Uuendus saadaval {MODULE_NAME} moodulile.", - "UPDATE_INFO": "Praegune paigaldus on {COMMIT_COUNT} tagapool {BRANCH_NAME} harul." + "UPDATE_INFO": "Praegune paigaldus on {COMMIT_COUNT} commit(s) tagapool {BRANCH_NAME} harul." } diff --git a/translations/fr.json b/translations/fr.json index 65195b8e..cdb70028 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -28,7 +28,7 @@ "UPDATE_NOTIFICATION": "Une mise à jour de MagicMirror² est disponible", "UPDATE_NOTIFICATION_MODULE": "Une mise à jour est disponible pour le module {MODULE_NAME} .", - "UPDATE_INFO": "L'installation actuelle est {COMMIT_COUNT} en retard sur la branche {BRANCH_NAME} .", + "UPDATE_INFO": "L'installation actuelle est {COMMIT_COUNT} commit(s) en retard sur la branche {BRANCH_NAME} .", "FEELS": "Ressenti" } diff --git a/translations/hu.json b/translations/hu.json index b483ecd9..3926f60c 100644 --- a/translations/hu.json +++ b/translations/hu.json @@ -28,7 +28,7 @@ "UPDATE_NOTIFICATION": "MagicMirror²-hoz frissítés érhető el.", "UPDATE_NOTIFICATION_MODULE": "A {MODULE_NAME} modulhoz frissítés érhető el.", - "UPDATE_INFO": "A jelenlegi telepítés óta {COMMIT_COUNT} commit jelent meg a {BRANCH_NAME} ágon.", + "UPDATE_INFO": "A jelenlegi telepítés óta {COMMIT_COUNT} új commit jelent meg a {BRANCH_NAME} ágon.", "FEELS": "Érzet" } diff --git a/translations/id.json b/translations/id.json index 9a4ed5d4..3aff52d9 100644 --- a/translations/id.json +++ b/translations/id.json @@ -28,5 +28,5 @@ "UPDATE_NOTIFICATION": "Memperbarui MagicMirror² tersedia.", "UPDATE_NOTIFICATION_MODULE": "Memperbarui tersedia untuk modul {MODULE_NAME}.", - "UPDATE_INFO": "Instalasi saat ini tertinggal {COMMIT_COUNT} pada cabang {BRANCH_NAME}." + "UPDATE_INFO": "Instalasi saat ini tertinggal {COMMIT_COUNT} commit(s) pada cabang {BRANCH_NAME}." } diff --git a/translations/is.json b/translations/is.json index b60c0ae4..69427ea8 100644 --- a/translations/is.json +++ b/translations/is.json @@ -26,5 +26,5 @@ "UPDATE_NOTIFICATION": "MagicMirror² uppfærsla í boði.", "UPDATE_NOTIFICATION_MODULE": "Uppfærsla í boði fyrir {MODULE_NAME} module.", - "UPDATE_INFO": "Núverandi kerfi er {COMMIT_COUNT} á eftir {BRANCH_NAME} branchinu." + "UPDATE_INFO": "Núverandi kerfi er {COMMIT_COUNT} commit(s) á eftir {BRANCH_NAME} branchinu." } diff --git a/translations/it.json b/translations/it.json index f903eb2e..b9146178 100644 --- a/translations/it.json +++ b/translations/it.json @@ -28,5 +28,5 @@ "UPDATE_NOTIFICATION": "E' disponibile un aggiornamento di MagicMirror².", "UPDATE_NOTIFICATION_MODULE": "E' disponibile un aggiornamento del modulo {MODULE_NAME}.", - "UPDATE_INFO": "L'installazione è {COMMIT_COUNT} indietro rispetto all'attuale branch {BRANCH_NAME}." + "UPDATE_INFO": "L'installazione è {COMMIT_COUNT} commit(s) indietro rispetto all'attuale branch {BRANCH_NAME}." } diff --git a/translations/kr.json b/translations/kr.json index 70df42f8..d3f0b37d 100644 --- a/translations/kr.json +++ b/translations/kr.json @@ -26,5 +26,5 @@ "UPDATE_NOTIFICATION": "새로운 MagicMirror² 업데이트가 있습니다.", "UPDATE_NOTIFICATION_MODULE": "{MODULE_NAME} 모듈에서 사용 가능한 업데이트 입니다.", - "UPDATE_INFO": "설치할 {COMMIT_COUNT} 는 {BRANCH_NAME} 분기에 해당됩니다." + "UPDATE_INFO": "설치할 {COMMIT_COUNT} commit(s) 는 {BRANCH_NAME} 분기에 해당됩니다." } diff --git a/translations/nb.json b/translations/nb.json index 30f271c6..25491468 100644 --- a/translations/nb.json +++ b/translations/nb.json @@ -28,7 +28,7 @@ "UPDATE_NOTIFICATION": "MagicMirror²-oppdatering er tilgjengelig.", "UPDATE_NOTIFICATION_MODULE": "Oppdatering tilgjengelig for modulen {MODULE_NAME}.", - "UPDATE_INFO": "Nåværende installasjon er {COMMIT_COUNT} bak {BRANCH_NAME} grenen.", + "UPDATE_INFO": "Nåværende installasjon er {COMMIT_COUNT} commit(s) bak {BRANCH_NAME} grenen.", "FEELS": "Føles som" } diff --git a/translations/nl.json b/translations/nl.json index e1497d39..d94ca100 100644 --- a/translations/nl.json +++ b/translations/nl.json @@ -26,7 +26,7 @@ "UPDATE_NOTIFICATION": "MagicMirror² update beschikbaar.", "UPDATE_NOTIFICATION_MODULE": "Update beschikbaar voor {MODULE_NAME} module.", - "UPDATE_INFO": "De huidige installatie loopt {COMMIT_COUNT} achter op de {BRANCH_NAME} branch.", + "UPDATE_INFO": "De huidige installatie loopt {COMMIT_COUNT} commit(s) achter op de {BRANCH_NAME} branch.", "FEELS": "Gevoelstemperatuur" } diff --git a/translations/nn.json b/translations/nn.json index 5e321fea..8ce32ad1 100644 --- a/translations/nn.json +++ b/translations/nn.json @@ -26,7 +26,7 @@ "UPDATE_NOTIFICATION": "MagicMirror² oppdatering er tilgjengeleg.", "UPDATE_NOTIFICATION_MODULE": "Oppdatering tilgjengeleg for modulen {MODULE_NAME}.", - "UPDATE_INFO": "noverande installasjon er {COMMIT_COUNT} bak {BRANCH_NAME} greinen.", + "UPDATE_INFO": "noverande installasjon er {COMMIT_COUNT} commit(s) bak {BRANCH_NAME} greinen.", "FEELS": "Kjenst som" } diff --git a/translations/pl.json b/translations/pl.json index c07cd093..e09ce081 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -28,7 +28,8 @@ "UPDATE_NOTIFICATION": "Dostępna jest aktualizacja MagicMirror².", "UPDATE_NOTIFICATION_MODULE": "Dostępna jest aktualizacja modułu {MODULE_NAME}.", - "UPDATE_INFO": "Zainstalowana wersja odbiega o {COMMIT_COUNT} commitów od gałęzi {BRANCH_NAME}.", + "UPDATE_INFO_SINGLE": "Zainstalowana wersja odbiega o {COMMIT_COUNT} commitw od gazi {BRANCH_NAME}.", + "UPDATE_INFO_MULTIPLE": "Zainstalowana wersja odbiega o {COMMIT_COUNT} commitw od gazi {BRANCH_NAME}.", "FEELS": "Odczuwalna" } diff --git a/translations/pt-br.json b/translations/pt-br.json index 47af03c8..28784ae2 100644 --- a/translations/pt-br.json +++ b/translations/pt-br.json @@ -25,5 +25,5 @@ "UPDATE_NOTIFICATION": "Nova atualização para MagicMirror disponível.", "UPDATE_NOTIFICATION_MODULE": "Atualização para o módulo {MODULE_NAME} disponível.", - "UPDATE_INFO": "Sua versão atual é a {COMMIT_COUNT} dentro do seguinte branch {BRANCH_NAME}." + "UPDATE_INFO": "Sua versão atual é a {COMMIT_COUNT} commit(s) dentro do seguinte branch {BRANCH_NAME}." } diff --git a/translations/pt.json b/translations/pt.json index daceb4b2..59bc045f 100644 --- a/translations/pt.json +++ b/translations/pt.json @@ -27,5 +27,5 @@ "UPDATE_NOTIFICATION": "Atualização do MagicMirror² disponível.", "UPDATE_NOTIFICATION_MODULE": "Atualização para o módulo {MODULE_NAME} disponível.", - "UPDATE_INFO": "A instalação atual está {COMMIT_COUNT} atrasada no branch {BRANCH_NAME}." + "UPDATE_INFO": "A instalação atual está {COMMIT_COUNT} commit(s) atrasada no branch {BRANCH_NAME}." } diff --git a/translations/ru.json b/translations/ru.json index e4fce93e..d40d1c2f 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -28,5 +28,5 @@ "UPDATE_NOTIFICATION": "Есть обновление для MagicMirror².", "UPDATE_NOTIFICATION_MODULE": "Есть обновление для {MODULE_NAME} модуля.", - "UPDATE_INFO": "Данная инсталляция позади {BRANCH_NAME} ветки на {COMMIT_COUNT} коммитов." + "UPDATE_INFO": "Данная инсталляция позади {BRANCH_NAME} commit(s) ветки на {COMMIT_COUNT} коммитов." } diff --git a/translations/sv.json b/translations/sv.json index 0bdb24e4..ed957755 100644 --- a/translations/sv.json +++ b/translations/sv.json @@ -29,7 +29,7 @@ "UPDATE_NOTIFICATION": "MagicMirror² uppdatering finns tillgänglig.", "UPDATE_NOTIFICATION_MODULE": "Uppdatering finns tillgänglig av {MODULE_NAME} modulen.", - "UPDATE_INFO": "Denna installation ligger {COMMIT_COUNT} steg bakom {BRANCH_NAME} grenen.", + "UPDATE_INFO": "Denna installation ligger {COMMIT_COUNT} commit(s) steg bakom {BRANCH_NAME} grenen.", "FEELS": "Känns som" } diff --git a/translations/zh-cn.json b/translations/zh-cn.json index 42ac8e65..920c3649 100644 --- a/translations/zh-cn.json +++ b/translations/zh-cn.json @@ -26,5 +26,5 @@ "UPDATE_NOTIFICATION": "MagicMirror² 有新的更新", "UPDATE_NOTIFICATION_MODULE": "模块 {MODULE_NAME} 可更新", - "UPDATE_INFO": "当前已安装版本为 {COMMIT_COUNT} 落后于分支 {BRANCH_NAME} " + "UPDATE_INFO": "当前已安装版本为 {COMMIT_COUNT} commit(s) 落后于分支 {BRANCH_NAME} " } From ddebc63488a8eafa3cea0e0e5948b65af8fc811b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Bal=C3=A1ssy?= Date: Sat, 18 Aug 2018 06:10:31 +0200 Subject: [PATCH 38/41] ADDED: CHANGELOG entry. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e121423..8a7df8f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Fixed - Mixup between german and spanish translation for newsfeed. - Fixed close dates to be absolute, if no configured in the config.js - module Calendar +- The word "commit" in the message of the UpdateNotification module can be localized. - Fix for weatherforecast rainfall rounding [#1374](https://github.com/MichMich/MagicMirror/issues/1374) - Fix calendar parsing issue for Midori on RasperryPi Zero w, related to issue #694. - Fix weather city ID link in sample config From b601f6a138e1f4ec101272bb90f108f0858f239d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Bal=C3=A1ssy?= Date: Thu, 30 Aug 2018 00:21:43 +0200 Subject: [PATCH 39/41] CHANGED: The UPDATE_INFO key in the localization file is changed to UPDATE_INFO_SINGLE and UPDATE_INFO_MULTIPLE to allow different localization for single and multiple commits. --- modules/default/updatenotification/updatenotification.js | 3 ++- tests/configs/data/TranslationTest.json | 3 ++- tests/configs/data/en.json | 3 ++- translations/af.json | 3 ++- translations/bg.json | 3 ++- translations/ca.json | 3 ++- translations/cs.json | 3 ++- translations/cy.json | 3 ++- translations/da.json | 3 ++- translations/de.json | 3 ++- translations/en.json | 3 ++- translations/es.json | 3 ++- translations/et.json | 3 ++- translations/fr.json | 3 ++- translations/hu.json | 3 ++- translations/id.json | 3 ++- translations/is.json | 3 ++- translations/it.json | 3 ++- translations/kr.json | 3 ++- translations/nb.json | 3 ++- translations/nl.json | 3 ++- translations/nn.json | 3 ++- translations/pt-br.json | 3 ++- translations/pt.json | 3 ++- translations/ro.json | 3 ++- translations/ru.json | 3 ++- translations/sv.json | 3 ++- translations/zh-cn.json | 3 ++- 28 files changed, 56 insertions(+), 28 deletions(-) diff --git a/modules/default/updatenotification/updatenotification.js b/modules/default/updatenotification/updatenotification.js index d69f6288..e3e55fc5 100644 --- a/modules/default/updatenotification/updatenotification.js +++ b/modules/default/updatenotification/updatenotification.js @@ -58,7 +58,8 @@ Module.register("updatenotification", { icon.innerHTML = " "; message.appendChild(icon); - var subtextHtml = this.translate("UPDATE_INFO", { + var updateInfoKeyName = this.status.behind == 1 ? "UPDATE_INFO_SINGLE" : "UPDATE_INFO_MULTIPLE"; + var subtextHtml = this.translate(updateInfoKeyName, { COMMIT_COUNT: this.status.behind, BRANCH_NAME: this.status.current }); diff --git a/tests/configs/data/TranslationTest.json b/tests/configs/data/TranslationTest.json index 53ffa825..bbb13845 100644 --- a/tests/configs/data/TranslationTest.json +++ b/tests/configs/data/TranslationTest.json @@ -28,5 +28,6 @@ "UPDATE_NOTIFICATION": "MagicMirror² update available.", "UPDATE_NOTIFICATION_MODULE": "Update available for MODULE_NAME module.", - "UPDATE_INFO": "The current installation is COMMIT_COUNT commit(s) behind on the BRANCH_NAME branch." + "UPDATE_INFO_SINGLE": "The current installation is COMMIT_COUNT commit behind on the BRANCH_NAME branch.", + "UPDATE_INFO_MULTIPLE": "The current installation is COMMIT_COUNT commits behind on the BRANCH_NAME branch." } diff --git a/tests/configs/data/en.json b/tests/configs/data/en.json index 53ffa825..bbb13845 100644 --- a/tests/configs/data/en.json +++ b/tests/configs/data/en.json @@ -28,5 +28,6 @@ "UPDATE_NOTIFICATION": "MagicMirror² update available.", "UPDATE_NOTIFICATION_MODULE": "Update available for MODULE_NAME module.", - "UPDATE_INFO": "The current installation is COMMIT_COUNT commit(s) behind on the BRANCH_NAME branch." + "UPDATE_INFO_SINGLE": "The current installation is COMMIT_COUNT commit behind on the BRANCH_NAME branch.", + "UPDATE_INFO_MULTIPLE": "The current installation is COMMIT_COUNT commits behind on the BRANCH_NAME branch." } diff --git a/translations/af.json b/translations/af.json index bef7b546..c0845649 100644 --- a/translations/af.json +++ b/translations/af.json @@ -26,5 +26,6 @@ "UPDATE_NOTIFICATION": "MagicMirror² update beskikbaar.", "UPDATE_NOTIFICATION_MODULE": "Update beskikbaar vir {MODULE_NAME} module.", - "UPDATE_INFO": "Die huidige installasie is {COMMIT_COUNT} commit(s) agter op die {BRANCH_NAME} branch." + "UPDATE_INFO_SINGLE": "Die huidige installasie is {COMMIT_COUNT} commit agter op die {BRANCH_NAME} branch.", + "UPDATE_INFO_MULTIPLE": "Die huidige installasie is {COMMIT_COUNT} commits agter op die {BRANCH_NAME} branch." } diff --git a/translations/bg.json b/translations/bg.json index 322dc8b2..786f8643 100644 --- a/translations/bg.json +++ b/translations/bg.json @@ -28,5 +28,6 @@ "UPDATE_NOTIFICATION": "Налична актуализация за MagicMirror².", "UPDATE_NOTIFICATION_MODULE": "Налична актуализация за {MODULE_NAME} модул.", - "UPDATE_INFO": "Текущата инсталация е изостанала с {COMMIT_COUNT} commit(s) къмита на клон {BRANCH_NAME}." + "UPDATE_INFO_SINGLE": "Текущата инсталация е изостанала с {COMMIT_COUNT} commit къмита на клон {BRANCH_NAME}.", + "UPDATE_INFO_MULTIPLE": "Текущата инсталация е изостанала с {COMMIT_COUNT} commits къмита на клон {BRANCH_NAME}." } diff --git a/translations/ca.json b/translations/ca.json index 674de8bf..91f871ca 100644 --- a/translations/ca.json +++ b/translations/ca.json @@ -28,5 +28,6 @@ "UPDATE_NOTIFICATION": "MagicMirror² actualizació disponible.", "UPDATE_NOTIFICATION_MODULE": "Disponible una actualizació per al mòdul {MODULE_NAME}.", - "UPDATE_INFO": "La teva instal·lació actual està {COMMIT_COUNT} commit(s) canvis darrere de la branca {BRANCH_NAME}." + "UPDATE_INFO_SINGLE": "La teva instal·lació actual està {COMMIT_COUNT} commit canvis darrere de la branca {BRANCH_NAME}.", + "UPDATE_INFO_MULTIPLE": "La teva instal·lació actual està {COMMIT_COUNT} commits canvis darrere de la branca {BRANCH_NAME}." } diff --git a/translations/cs.json b/translations/cs.json index 39348e7e..6ea3ddc1 100644 --- a/translations/cs.json +++ b/translations/cs.json @@ -28,5 +28,6 @@ "UPDATE_NOTIFICATION": "Dostupná aktualizace pro MagicMirror².", "UPDATE_NOTIFICATION_MODULE": "Dostupná aktualizace pro modul {MODULE_NAME}.", - "UPDATE_INFO": "Současná instalace je na větvi {BRANCH_NAME} pozadu o {COMMIT_COUNT} commit(s)." + "UPDATE_INFO_SINGLE": "Současná instalace je na větvi {BRANCH_NAME} pozadu o {COMMIT_COUNT} commit.", + "UPDATE_INFO_MULTIPLE": "Současná instalace je na větvi {BRANCH_NAME} pozadu o {COMMIT_COUNT} commits." } diff --git a/translations/cy.json b/translations/cy.json index 7ae28abb..ba5d62ea 100644 --- a/translations/cy.json +++ b/translations/cy.json @@ -28,5 +28,6 @@ "UPDATE_NOTIFICATION": "MagicMirror² mwy diweddar yn barod.", "UPDATE_NOTIFICATION_MODULE": "Mae diweddaraiad ar gyfer y modiwl {MODULE_NAME}.", - "UPDATE_INFO": "Mae'r fersiwn bresenol {COMMIT_COUNT} commit tu ôl i'r gangen {BRANCH_NAME}." + "UPDATE_INFO_SINGLE": "Mae'r fersiwn bresenol {COMMIT_COUNT} commit tu ôl i'r gangen {BRANCH_NAME}.", + "UPDATE_INFO_MULTIPLE": "Mae'r fersiwn bresenol {COMMIT_COUNT} commit tu ôl i'r gangen {BRANCH_NAME}." } diff --git a/translations/da.json b/translations/da.json index 79877334..4f4f50e7 100644 --- a/translations/da.json +++ b/translations/da.json @@ -27,5 +27,6 @@ "UPDATE_NOTIFICATION": "MagicMirror² opdatering tilgængelig.", "UPDATE_NOTIFICATION_MODULE": "Opdatering tilgængelig for {MODULE_NAME} modulet.", - "UPDATE_INFO": "Den nuværende installation er {COMMIT_COUNT} commit(s) bagud på {BRANCH_NAME} branch'en." + "UPDATE_INFO_SINGLE": "Den nuværende installation er {COMMIT_COUNT} commit bagud på {BRANCH_NAME} branch'en.", + "UPDATE_INFO_MULTIPLE": "Den nuværende installation er {COMMIT_COUNT} commits bagud på {BRANCH_NAME} branch'en." } diff --git a/translations/de.json b/translations/de.json index f6604bc5..57f06cde 100644 --- a/translations/de.json +++ b/translations/de.json @@ -28,7 +28,8 @@ "UPDATE_NOTIFICATION": "Aktualisierung für MagicMirror² verfügbar.", "UPDATE_NOTIFICATION_MODULE": "Aktualisierung für das {MODULE_NAME} Modul verfügbar.", - "UPDATE_INFO": "Die aktuelle Installation ist {COMMIT_COUNT} Commit(s) hinter dem {BRANCH_NAME} Branch.", + "UPDATE_INFO_SINGLE": "Die aktuelle Installation ist {COMMIT_COUNT} Commit hinter dem {BRANCH_NAME} Branch.", + "UPDATE_INFO_MULTIPLE": "Die aktuelle Installation ist {COMMIT_COUNT} Commits hinter dem {BRANCH_NAME} Branch.", "FEELS": "Gefühlt" } diff --git a/translations/en.json b/translations/en.json index 563c5d30..900bf630 100644 --- a/translations/en.json +++ b/translations/en.json @@ -28,7 +28,8 @@ "UPDATE_NOTIFICATION": "MagicMirror² update available.", "UPDATE_NOTIFICATION_MODULE": "Update available for {MODULE_NAME} module.", - "UPDATE_INFO": "The current installation is {COMMIT_COUNT} commit(s) behind on the {BRANCH_NAME} branch.", + "UPDATE_INFO_SINGLE": "The current installation is {COMMIT_COUNT} commit behind on the {BRANCH_NAME} branch.", + "UPDATE_INFO_MULTIPLE": "The current installation is {COMMIT_COUNT} commits behind on the {BRANCH_NAME} branch.", "FEELS": "Feels" } diff --git a/translations/es.json b/translations/es.json index 9086ae79..5e5fe96d 100644 --- a/translations/es.json +++ b/translations/es.json @@ -28,7 +28,8 @@ "UPDATE_NOTIFICATION": "MagicMirror² actualización disponible.", "UPDATE_NOTIFICATION_MODULE": "Disponible una actualización para el módulo {MODULE_NAME}.", - "UPDATE_INFO": "Tu actual instalación está {COMMIT_COUNT} commit(s) cambios detrás de la rama {BRANCH_NAME}.", + "UPDATE_INFO_SINGLE": "Tu actual instalación está {COMMIT_COUNT} commit cambios detrás de la rama {BRANCH_NAME}.", + "UPDATE_INFO_MULTIPLE": "Tu actual instalación está {COMMIT_COUNT} commits cambios detrás de la rama {BRANCH_NAME}.", "FEELS": "Sensación térmica de" } diff --git a/translations/et.json b/translations/et.json index 4283a048..bddd56ae 100644 --- a/translations/et.json +++ b/translations/et.json @@ -26,5 +26,6 @@ "UPDATE_NOTIFICATION": "MagicMirror²´le uuendus saadaval.", "UPDATE_NOTIFICATION_MODULE": "Uuendus saadaval {MODULE_NAME} moodulile.", - "UPDATE_INFO": "Praegune paigaldus on {COMMIT_COUNT} commit(s) tagapool {BRANCH_NAME} harul." + "UPDATE_INFO_SINGLE": "Praegune paigaldus on {COMMIT_COUNT} commit tagapool {BRANCH_NAME} harul.", + "UPDATE_INFO_MULTIPLE": "Praegune paigaldus on {COMMIT_COUNT} commits tagapool {BRANCH_NAME} harul." } diff --git a/translations/fr.json b/translations/fr.json index cdb70028..e2dd22e2 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -28,7 +28,8 @@ "UPDATE_NOTIFICATION": "Une mise à jour de MagicMirror² est disponible", "UPDATE_NOTIFICATION_MODULE": "Une mise à jour est disponible pour le module {MODULE_NAME} .", - "UPDATE_INFO": "L'installation actuelle est {COMMIT_COUNT} commit(s) en retard sur la branche {BRANCH_NAME} .", + "UPDATE_INFO_SINGLE": "L'installation actuelle est {COMMIT_COUNT} commit en retard sur la branche {BRANCH_NAME} .", + "UPDATE_INFO_MULTIPLE": "L'installation actuelle est {COMMIT_COUNT} commits en retard sur la branche {BRANCH_NAME} .", "FEELS": "Ressenti" } diff --git a/translations/hu.json b/translations/hu.json index 3926f60c..e0d8b7ae 100644 --- a/translations/hu.json +++ b/translations/hu.json @@ -28,7 +28,8 @@ "UPDATE_NOTIFICATION": "MagicMirror²-hoz frissítés érhető el.", "UPDATE_NOTIFICATION_MODULE": "A {MODULE_NAME} modulhoz frissítés érhető el.", - "UPDATE_INFO": "A jelenlegi telepítés óta {COMMIT_COUNT} új commit jelent meg a {BRANCH_NAME} ágon.", + "UPDATE_INFO_SINGLE": "A jelenlegi telepítés óta {COMMIT_COUNT} új commit jelent meg a {BRANCH_NAME} ágon.", + "UPDATE_INFO_MULTIPLE": "A jelenlegi telepítés óta {COMMIT_COUNT} új commit jelent meg a {BRANCH_NAME} ágon.", "FEELS": "Érzet" } diff --git a/translations/id.json b/translations/id.json index 3aff52d9..d6c91e5b 100644 --- a/translations/id.json +++ b/translations/id.json @@ -28,5 +28,6 @@ "UPDATE_NOTIFICATION": "Memperbarui MagicMirror² tersedia.", "UPDATE_NOTIFICATION_MODULE": "Memperbarui tersedia untuk modul {MODULE_NAME}.", - "UPDATE_INFO": "Instalasi saat ini tertinggal {COMMIT_COUNT} commit(s) pada cabang {BRANCH_NAME}." + "UPDATE_INFO_SINGLE": "Instalasi saat ini tertinggal {COMMIT_COUNT} commit pada cabang {BRANCH_NAME}.", + "UPDATE_INFO_MULTIPLE": "Instalasi saat ini tertinggal {COMMIT_COUNT} commits pada cabang {BRANCH_NAME}." } diff --git a/translations/is.json b/translations/is.json index 69427ea8..01a3406d 100644 --- a/translations/is.json +++ b/translations/is.json @@ -26,5 +26,6 @@ "UPDATE_NOTIFICATION": "MagicMirror² uppfærsla í boði.", "UPDATE_NOTIFICATION_MODULE": "Uppfærsla í boði fyrir {MODULE_NAME} module.", - "UPDATE_INFO": "Núverandi kerfi er {COMMIT_COUNT} commit(s) á eftir {BRANCH_NAME} branchinu." + "UPDATE_INFO_SINGLE": "Núverandi kerfi er {COMMIT_COUNT} commit á eftir {BRANCH_NAME} branchinu.", + "UPDATE_INFO_MULTIPLE": "Núverandi kerfi er {COMMIT_COUNT} commits á eftir {BRANCH_NAME} branchinu." } diff --git a/translations/it.json b/translations/it.json index b9146178..a5eaf2f2 100644 --- a/translations/it.json +++ b/translations/it.json @@ -28,5 +28,6 @@ "UPDATE_NOTIFICATION": "E' disponibile un aggiornamento di MagicMirror².", "UPDATE_NOTIFICATION_MODULE": "E' disponibile un aggiornamento del modulo {MODULE_NAME}.", - "UPDATE_INFO": "L'installazione è {COMMIT_COUNT} commit(s) indietro rispetto all'attuale branch {BRANCH_NAME}." + "UPDATE_INFO_SINGLE": "L'installazione è {COMMIT_COUNT} commit indietro rispetto all'attuale branch {BRANCH_NAME}.", + "UPDATE_INFO_MULTIPLE": "L'installazione è {COMMIT_COUNT} commits indietro rispetto all'attuale branch {BRANCH_NAME}." } diff --git a/translations/kr.json b/translations/kr.json index d3f0b37d..54ee8d20 100644 --- a/translations/kr.json +++ b/translations/kr.json @@ -26,5 +26,6 @@ "UPDATE_NOTIFICATION": "새로운 MagicMirror² 업데이트가 있습니다.", "UPDATE_NOTIFICATION_MODULE": "{MODULE_NAME} 모듈에서 사용 가능한 업데이트 입니다.", - "UPDATE_INFO": "설치할 {COMMIT_COUNT} commit(s) 는 {BRANCH_NAME} 분기에 해당됩니다." + "UPDATE_INFO_SINGLE": "설치할 {COMMIT_COUNT} commit 는 {BRANCH_NAME} 분기에 해당됩니다.", + "UPDATE_INFO_MULTIPLE": "설치할 {COMMIT_COUNT} commits 는 {BRANCH_NAME} 분기에 해당됩니다." } diff --git a/translations/nb.json b/translations/nb.json index 25491468..88027d89 100644 --- a/translations/nb.json +++ b/translations/nb.json @@ -28,7 +28,8 @@ "UPDATE_NOTIFICATION": "MagicMirror²-oppdatering er tilgjengelig.", "UPDATE_NOTIFICATION_MODULE": "Oppdatering tilgjengelig for modulen {MODULE_NAME}.", - "UPDATE_INFO": "Nåværende installasjon er {COMMIT_COUNT} commit(s) bak {BRANCH_NAME} grenen.", + "UPDATE_INFO_SINGLE": "Nåværende installasjon er {COMMIT_COUNT} commit bak {BRANCH_NAME} grenen.", + "UPDATE_INFO_MULTIPLE": "Nåværende installasjon er {COMMIT_COUNT} commits bak {BRANCH_NAME} grenen.", "FEELS": "Føles som" } diff --git a/translations/nl.json b/translations/nl.json index d94ca100..9a344eb3 100644 --- a/translations/nl.json +++ b/translations/nl.json @@ -26,7 +26,8 @@ "UPDATE_NOTIFICATION": "MagicMirror² update beschikbaar.", "UPDATE_NOTIFICATION_MODULE": "Update beschikbaar voor {MODULE_NAME} module.", - "UPDATE_INFO": "De huidige installatie loopt {COMMIT_COUNT} commit(s) achter op de {BRANCH_NAME} branch.", + "UPDATE_INFO_SINGLE": "De huidige installatie loopt {COMMIT_COUNT} commit achter op de {BRANCH_NAME} branch.", + "UPDATE_INFO_MULTIPLE": "De huidige installatie loopt {COMMIT_COUNT} commits achter op de {BRANCH_NAME} branch.", "FEELS": "Gevoelstemperatuur" } diff --git a/translations/nn.json b/translations/nn.json index 8ce32ad1..1fd14548 100644 --- a/translations/nn.json +++ b/translations/nn.json @@ -26,7 +26,8 @@ "UPDATE_NOTIFICATION": "MagicMirror² oppdatering er tilgjengeleg.", "UPDATE_NOTIFICATION_MODULE": "Oppdatering tilgjengeleg for modulen {MODULE_NAME}.", - "UPDATE_INFO": "noverande installasjon er {COMMIT_COUNT} commit(s) bak {BRANCH_NAME} greinen.", + "UPDATE_INFO_SINGLE": "noverande installasjon er {COMMIT_COUNT} commit bak {BRANCH_NAME} greinen.", + "UPDATE_INFO_MULTIPLE": "noverande installasjon er {COMMIT_COUNT} commits bak {BRANCH_NAME} greinen.", "FEELS": "Kjenst som" } diff --git a/translations/pt-br.json b/translations/pt-br.json index 28784ae2..898e4f1f 100644 --- a/translations/pt-br.json +++ b/translations/pt-br.json @@ -25,5 +25,6 @@ "UPDATE_NOTIFICATION": "Nova atualização para MagicMirror disponível.", "UPDATE_NOTIFICATION_MODULE": "Atualização para o módulo {MODULE_NAME} disponível.", - "UPDATE_INFO": "Sua versão atual é a {COMMIT_COUNT} commit(s) dentro do seguinte branch {BRANCH_NAME}." + "UPDATE_INFO_SINGLE": "Sua versão atual é a {COMMIT_COUNT} commit dentro do seguinte branch {BRANCH_NAME}.", + "UPDATE_INFO_MULTIPLE": "Sua versão atual é a {COMMIT_COUNT} commits dentro do seguinte branch {BRANCH_NAME}." } diff --git a/translations/pt.json b/translations/pt.json index 59bc045f..e01d028c 100644 --- a/translations/pt.json +++ b/translations/pt.json @@ -27,5 +27,6 @@ "UPDATE_NOTIFICATION": "Atualização do MagicMirror² disponível.", "UPDATE_NOTIFICATION_MODULE": "Atualização para o módulo {MODULE_NAME} disponível.", - "UPDATE_INFO": "A instalação atual está {COMMIT_COUNT} commit(s) atrasada no branch {BRANCH_NAME}." + "UPDATE_INFO_SINGLE": "A instalação atual está {COMMIT_COUNT} commit atrasada no branch {BRANCH_NAME}.", + "UPDATE_INFO_MULTIPLE": "A instalação atual está {COMMIT_COUNT} commits atrasada no branch {BRANCH_NAME}." } diff --git a/translations/ro.json b/translations/ro.json index acc7db8c..3584d69f 100644 --- a/translations/ro.json +++ b/translations/ro.json @@ -28,5 +28,6 @@ "UPDATE_NOTIFICATION": "Un update este disponibil pentru MagicMirror².", "UPDATE_NOTIFICATION_MODULE": "Un update este disponibil pentru modulul {MODULE_NAME}.", - "UPDATE_INFO": "Există {COMMIT_COUNT} commit-uri noi pe branch-ul {BRANCH_NAME}." + "UPDATE_INFO_SINGLE": "Există {COMMIT_COUNT} commit-uri noi pe branch-ul {BRANCH_NAME}.", + "UPDATE_INFO_MULTIPLE": "Există {COMMIT_COUNT} commit-uri noi pe branch-ul {BRANCH_NAME}." } diff --git a/translations/ru.json b/translations/ru.json index d40d1c2f..cf2e5c5f 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -28,5 +28,6 @@ "UPDATE_NOTIFICATION": "Есть обновление для MagicMirror².", "UPDATE_NOTIFICATION_MODULE": "Есть обновление для {MODULE_NAME} модуля.", - "UPDATE_INFO": "Данная инсталляция позади {BRANCH_NAME} commit(s) ветки на {COMMIT_COUNT} коммитов." + "UPDATE_INFO_SINGLE": "Данная инсталляция позади {BRANCH_NAME} commit ветки на {COMMIT_COUNT} коммитов.", + "UPDATE_INFO_MULTIPLE": "Данная инсталляция позади {BRANCH_NAME} commits ветки на {COMMIT_COUNT} коммитов." } diff --git a/translations/sv.json b/translations/sv.json index ed957755..e8f5d018 100644 --- a/translations/sv.json +++ b/translations/sv.json @@ -29,7 +29,8 @@ "UPDATE_NOTIFICATION": "MagicMirror² uppdatering finns tillgänglig.", "UPDATE_NOTIFICATION_MODULE": "Uppdatering finns tillgänglig av {MODULE_NAME} modulen.", - "UPDATE_INFO": "Denna installation ligger {COMMIT_COUNT} commit(s) steg bakom {BRANCH_NAME} grenen.", + "UPDATE_INFO_SINGLE": "Denna installation ligger {COMMIT_COUNT} commit steg bakom {BRANCH_NAME} grenen.", + "UPDATE_INFO_MULTIPLE": "Denna installation ligger {COMMIT_COUNT} commits steg bakom {BRANCH_NAME} grenen.", "FEELS": "Känns som" } diff --git a/translations/zh-cn.json b/translations/zh-cn.json index 920c3649..b879edb4 100644 --- a/translations/zh-cn.json +++ b/translations/zh-cn.json @@ -26,5 +26,6 @@ "UPDATE_NOTIFICATION": "MagicMirror² 有新的更新", "UPDATE_NOTIFICATION_MODULE": "模块 {MODULE_NAME} 可更新", - "UPDATE_INFO": "当前已安装版本为 {COMMIT_COUNT} commit(s) 落后于分支 {BRANCH_NAME} " + "UPDATE_INFO_SINGLE": "当前已安装版本为 {COMMIT_COUNT} commit 落后于分支 {BRANCH_NAME} ", + "UPDATE_INFO_MULTIPLE": "当前已安装版本为 {COMMIT_COUNT} commits 落后于分支 {BRANCH_NAME} " } From b06cf55c0bb595d5f93386c33e7e3a5a150a94de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Bal=C3=A1ssy?= Date: Wed, 5 Sep 2018 04:33:42 +0200 Subject: [PATCH 40/41] FIXED: Character encoding issue in pl.json occurred during rebase. --- translations/pl.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translations/pl.json b/translations/pl.json index e09ce081..617288e9 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -28,8 +28,8 @@ "UPDATE_NOTIFICATION": "Dostępna jest aktualizacja MagicMirror².", "UPDATE_NOTIFICATION_MODULE": "Dostępna jest aktualizacja modułu {MODULE_NAME}.", - "UPDATE_INFO_SINGLE": "Zainstalowana wersja odbiega o {COMMIT_COUNT} commitw od gazi {BRANCH_NAME}.", - "UPDATE_INFO_MULTIPLE": "Zainstalowana wersja odbiega o {COMMIT_COUNT} commitw od gazi {BRANCH_NAME}.", - + "UPDATE_INFO_SINGLE": "Zainstalowana wersja odbiega o {COMMIT_COUNT} commitów od gałęzi {BRANCH_NAME}.", + "UPDATE_INFO_MULTIPLE": "Zainstalowana wersja odbiega o {COMMIT_COUNT} commitów od gałęzi {BRANCH_NAME}.", + "FEELS": "Odczuwalna" } From ec44cb27619aa35dada2dfe546f389fbcc2a3241 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Bal=C3=A1ssy?= Date: Wed, 5 Sep 2018 04:39:39 +0200 Subject: [PATCH 41/41] CHANGED: The wording in CHANGELOG is modified to be more descriptive. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a7df8f5..571b97d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,7 +23,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Fixed - Mixup between german and spanish translation for newsfeed. - Fixed close dates to be absolute, if no configured in the config.js - module Calendar -- The word "commit" in the message of the UpdateNotification module can be localized. +- Fixed the UpdateNotification module message about new commits in the repository, so they can be correctly localized in singular and plural form. - Fix for weatherforecast rainfall rounding [#1374](https://github.com/MichMich/MagicMirror/issues/1374) - Fix calendar parsing issue for Midori on RasperryPi Zero w, related to issue #694. - Fix weather city ID link in sample config