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" }