From 774b86c7dc52cf00130a69981d257832f9c81fd6 Mon Sep 17 00:00:00 2001 From: Ashish Tank Date: Sun, 10 Jan 2021 17:37:10 +0100 Subject: [PATCH] Code cleanup for feels like translation --- CHANGELOG.md | 1 + modules/default/currentweather/currentweather.js | 10 +++------- modules/default/weather/current.njk | 5 +---- modules/default/weather/weather.js | 5 +---- translations/cv.json | 2 +- translations/da.json | 2 +- translations/de.json | 2 +- translations/en.json | 2 +- translations/es.json | 2 +- translations/fi.json | 2 +- translations/fr.json | 2 +- translations/he.json | 2 +- translations/hi.json | 8 ++++---- translations/hr.json | 2 +- translations/hu.json | 2 +- translations/it.json | 2 +- translations/lt.json | 2 +- translations/nb.json | 2 +- translations/nl.json | 2 +- translations/nn.json | 2 +- translations/pl.json | 2 +- translations/ps.json | 2 +- translations/pt-br.json | 2 +- translations/pt.json | 2 +- translations/ro.json | 2 +- translations/ru.json | 2 +- translations/sv.json | 2 +- translations/tlh.json | 2 +- translations/tr.json | 2 +- translations/uk.json | 2 +- translations/zh-cn.json | 2 +- 31 files changed, 36 insertions(+), 45 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a125c08b..f7c35cf1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ _This release is scheduled to be released on 2021-04-01._ - Updated markdown files. - Cleaned up old code on server side. - Convert `-0` to `0` when displaying temperature. +- Code cleanup for FEELS like and added {DEGREE} placeholder for FEELSLIKE for each language ### Removed diff --git a/modules/default/currentweather/currentweather.js b/modules/default/currentweather/currentweather.js index 0c12e65c..aa9ad43e 100644 --- a/modules/default/currentweather/currentweather.js +++ b/modules/default/currentweather/currentweather.js @@ -258,13 +258,9 @@ Module.register("currentweather", { var feelsLike = document.createElement("span"); feelsLike.className = "dimmed"; - var feelsLikeHtml = this.translate("FEELS"); - if (feelsLikeHtml.indexOf("{DEGREE}") > -1) { - feelsLikeHtml = this.translate("FEELS", { - DEGREE: this.feelsLike + degreeLabel - }); - } else feelsLikeHtml += " " + this.feelsLike + degreeLabel; - feelsLike.innerHTML = feelsLikeHtml; + feelsLike.innerHTML = this.translate("FEELS", { + DEGREE: this.feelsLike + degreeLabel + }); small.appendChild(feelsLike); wrapper.appendChild(small); diff --git a/modules/default/weather/current.njk b/modules/default/weather/current.njk index 2e0ed6d7..b8de8f80 100755 --- a/modules/default/weather/current.njk +++ b/modules/default/weather/current.njk @@ -69,10 +69,7 @@
{% if config.showFeelsLike %} - {{ "FEELS" | translate({DEGREE: current.feelsLike() | roundValue | unit("temperature") | decimalSymbol }) }} - {% if not config.feelsLikeWithDegree %} - {{ current.feelsLike() | roundValue | unit("temperature") | decimalSymbol }} - {% endif %} + {{ "FEELS" | translate({DEGREE: current.feelsLike() | roundValue | unit("temperature") | decimalSymbol }) }} {% endif %} {% if config.showPrecipitationAmount %} diff --git a/modules/default/weather/weather.js b/modules/default/weather/weather.js index 75876a98..83ab9f18 100644 --- a/modules/default/weather/weather.js +++ b/modules/default/weather/weather.js @@ -52,8 +52,7 @@ Module.register("weather", { onlyTemp: false, showPrecipitationAmount: false, colored: false, - showFeelsLike: true, - feelsLikeWithDegree: false + showFeelsLike: true }, // Module properties. @@ -89,8 +88,6 @@ Module.register("weather", { // Let the weather provider know we are starting. this.weatherProvider.start(); - this.config.feelsLikeWithDegree = this.translate("FEELS").indexOf("{DEGREE}") > -1; - // Add custom filters this.addFilters(); diff --git a/translations/cv.json b/translations/cv.json index ef8bab15..9a941fc0 100644 --- a/translations/cv.json +++ b/translations/cv.json @@ -25,7 +25,7 @@ "WNW": "АҪА", "NW": "ҪА", "NNW": "ҪҪА", - "FEELS": "Туйӑннӑ", + "FEELS": "Туйӑннӑ {DEGREE}", "UPDATE_NOTIFICATION": "MagicMirror² валли ҫӗнетӳ пур.", "UPDATE_NOTIFICATION_MODULE": "{MODULE_NAME} модуль валли ҫӗнетӳ пур.", diff --git a/translations/da.json b/translations/da.json index d9522a59..a13a9fae 100644 --- a/translations/da.json +++ b/translations/da.json @@ -6,7 +6,7 @@ "DAYAFTERTOMORROW": "I overmorgen", "RUNNING": "Slutter om", "EMPTY": "Ingen kommende begivenheder.", - "FEELS": "Føles som", + "FEELS": "Føles som {DEGREE}", "WEEK": "Uge {weekNumber}", "N": "N", diff --git a/translations/de.json b/translations/de.json index 127cc126..d023cec8 100644 --- a/translations/de.json +++ b/translations/de.json @@ -33,5 +33,5 @@ "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" + "FEELS": "Gefühlt {DEGREE}" } diff --git a/translations/en.json b/translations/en.json index 151ba6c9..bdd784d5 100644 --- a/translations/en.json +++ b/translations/en.json @@ -33,6 +33,6 @@ "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 like", + "FEELS": "Feels like {DEGREE}", "PRECIP": "PoP" } diff --git a/translations/es.json b/translations/es.json index 2c68705d..a4f322f5 100644 --- a/translations/es.json +++ b/translations/es.json @@ -33,6 +33,6 @@ "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", + "FEELS": "Sensación térmica de {DEGREE}", "PRECIP": "Precipitación" } diff --git a/translations/fi.json b/translations/fi.json index 6686acc5..a2cf0f16 100644 --- a/translations/fi.json +++ b/translations/fi.json @@ -31,6 +31,6 @@ "UPDATE_INFO_SINGLE": "Nykyasennus on {COMMIT_COUNT} muutoksen jäljessä {BRANCH_NAME} haaraan nähden.", "UPDATE_INFO_MULTIPLE": "Nykyasennus on {COMMIT_COUNT} muutosta jäljessä {BRANCH_NAME} haaraan nähden.", - "FEELS": "Tuntuu kuin", + "FEELS": "Tuntuu kuin {DEGREE}", "PRECIP": "Sateen todennäköisyys" } diff --git a/translations/fr.json b/translations/fr.json index 267c6f89..c3607ad4 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -33,5 +33,5 @@ "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" + "FEELS": "Ressenti {DEGREE}" } diff --git a/translations/he.json b/translations/he.json index 5e1f5f8b..f956795c 100644 --- a/translations/he.json +++ b/translations/he.json @@ -31,6 +31,6 @@ "UPDATE_INFO_SINGLE": "ההתקנה הנוכחית נמצאת מאחור הענף {BRANCH_NAME} ב-{COMMIT_COUNT} מופע", "UPDATE_INFO_MULTIPLE": "ההתקנה הנוכחית נמצאת מאחור הענף {BRANCH_NAME} ב-{COMMIT_COUNT} מופעים", - "FEELS": "מרגיש כמו", + "FEELS": "מרגיש כמו {DEGREE}", "PRECIP": "משקעים" } diff --git a/translations/hi.json b/translations/hi.json index 86f7c94d..393f3c87 100644 --- a/translations/hi.json +++ b/translations/hi.json @@ -14,13 +14,13 @@ "NE": "उपु", "ENE": "पुउपु", "E": "पु", - "ESE": "पुSपु", + "ESE": "पुदपु", "SE": "दपु", "SSE": "ददपु", "S": "द", - "SSW": "ददW", - "SW": "दW", - "WSW": "WदW", + "SSW": "ददप", + "SW": "दप", + "WSW": "पदप", "W": "प", "WNW": "पउप", "NW": "उप", diff --git a/translations/hr.json b/translations/hr.json index 02ffec1e..f18366cf 100644 --- a/translations/hr.json +++ b/translations/hr.json @@ -31,5 +31,5 @@ "UPDATE_INFO_SINGLE": "Instalirana verzija {COMMIT_COUNT} commit kasni za branch-om {BRANCH_NAME}.", "UPDATE_INFO_MULTIPLE": "Instalirana verzija {COMMIT_COUNT} commit-ova kasni za branch-om {BRANCH_NAME}.", - "FEELS": "Osjećaj" + "FEELS": "Osjećaj {DEGREE}" } diff --git a/translations/hu.json b/translations/hu.json index e0d8b7ae..88ccb546 100644 --- a/translations/hu.json +++ b/translations/hu.json @@ -31,5 +31,5 @@ "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" + "FEELS": "Érzet {DEGREE}" } diff --git a/translations/it.json b/translations/it.json index e1a5b806..c1c00614 100644 --- a/translations/it.json +++ b/translations/it.json @@ -31,5 +31,5 @@ "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}.", - "FEELS": "Percepiti" + "FEELS": "Percepiti {DEGREE}" } diff --git a/translations/lt.json b/translations/lt.json index 0ab64c3c..7e44043d 100644 --- a/translations/lt.json +++ b/translations/lt.json @@ -31,6 +31,6 @@ "UPDATE_INFO_SINGLE": "Šis įdiegimas atsilieka {COMMIT_COUNT} įsipareigojimu {BRANCH_NAME} šakoje.", "UPDATE_INFO_MULTIPLE": "Šis įdiegimas atsilieka {COMMIT_COUNT} įsipareigojimais {BRANCH_NAME} šakoje.", - "FEELS": "Jutiminė temp.", + "FEELS": "Jutiminė temp. {DEGREE}", "PRECIP": "Krituliai" } diff --git a/translations/nb.json b/translations/nb.json index f8844ab7..17fc63df 100644 --- a/translations/nb.json +++ b/translations/nb.json @@ -31,5 +31,5 @@ "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" + "FEELS": "Føles som {DEGREE}" } diff --git a/translations/nl.json b/translations/nl.json index 7845ba9e..cbdeea6e 100644 --- a/translations/nl.json +++ b/translations/nl.json @@ -28,5 +28,5 @@ "UPDATE_NOTIFICATION_MODULE": "Update beschikbaar voor {MODULE_NAME} module.", "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": "Voelt als" + "FEELS": "Voelt als {DEGREE}" } diff --git a/translations/nn.json b/translations/nn.json index 6a5e10f7..d2c82b94 100644 --- a/translations/nn.json +++ b/translations/nn.json @@ -29,5 +29,5 @@ "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" + "FEELS": "Kjenst som {DEGREE}" } diff --git a/translations/pl.json b/translations/pl.json index b81a6dad..92265111 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -31,6 +31,6 @@ "UPDATE_INFO_SINGLE": "Zainstalowana wersja odbiega o {COMMIT_COUNT} commit od gałęzi {BRANCH_NAME}.", "UPDATE_INFO_MULTIPLE": "Zainstalowana wersja odbiega o {COMMIT_COUNT} commitów od gałęzi {BRANCH_NAME}.", - "FEELS": "Odczuwalna", + "FEELS": "Odczuwalna {DEGREE}", "PRECIP": "Szansa opadów" } diff --git a/translations/ps.json b/translations/ps.json index f3f8a638..690ecfc0 100644 --- a/translations/ps.json +++ b/translations/ps.json @@ -33,5 +33,5 @@ "UPDATE_INFO_SINGLE": "اوسنی برخه {COMMIT_COUNT} د {BRANCH_NAME} څخه وروسته پاته ده", "UPDATE_INFO_MULTIPLE": "اوسنی برخه {COMMIT_COUNT} د {BRANCH_NAME} څخه وروسته پاته ده", - "FEELS": "حس کېږی" + "FEELS": "حس کېږی {DEGREE}" } diff --git a/translations/pt-br.json b/translations/pt-br.json index 480dca4c..c9edbde9 100644 --- a/translations/pt-br.json +++ b/translations/pt-br.json @@ -28,6 +28,6 @@ "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}.", - "FEELS": "Percebida", + "FEELS": "Percebida {DEGREE}", "PRECIP": "PoP" } diff --git a/translations/pt.json b/translations/pt.json index be73a964..76574742 100644 --- a/translations/pt.json +++ b/translations/pt.json @@ -30,5 +30,5 @@ "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}.", - "FEELS": "Sentida" + "FEELS": "Sentida {DEGREE}" } diff --git a/translations/ro.json b/translations/ro.json index 60742f36..78ef76bc 100644 --- a/translations/ro.json +++ b/translations/ro.json @@ -31,5 +31,5 @@ "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}.", - "FEELS": "Se simte ca fiind" + "FEELS": "Se simte ca fiind {DEGREE}" } diff --git a/translations/ru.json b/translations/ru.json index 0512e14b..b9e52ed1 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -25,7 +25,7 @@ "WNW": "ЗСЗ", "NW": "СЗ", "NNW": "ССЗ", - "FEELS": "По ощущению", + "FEELS": "По ощущению {DEGREE}", "UPDATE_NOTIFICATION": "Есть обновление для MagicMirror².", "UPDATE_NOTIFICATION_MODULE": "Есть обновление для {MODULE_NAME} модуля.", diff --git a/translations/sv.json b/translations/sv.json index 72bc894b..0d1c6746 100644 --- a/translations/sv.json +++ b/translations/sv.json @@ -31,5 +31,5 @@ "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" + "FEELS": "Känns som {DEGREE}" } diff --git a/translations/tlh.json b/translations/tlh.json index b573cf1a..56aef3cf 100644 --- a/translations/tlh.json +++ b/translations/tlh.json @@ -31,5 +31,5 @@ "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": "jem" + "FEELS": "jem {DEGREE}" } diff --git a/translations/tr.json b/translations/tr.json index 6cf8035d..14ee8065 100644 --- a/translations/tr.json +++ b/translations/tr.json @@ -31,6 +31,6 @@ "UPDATE_INFO_SINGLE": "Sahip olduğunuz kurulum {BRANCH_NAME} branchinden {COMMIT_COUNT} commit geridedir.", "UPDATE_INFO_MULTIPLE": "Sahip olduğunuz kurulum {BRANCH_NAME} branchinden {COMMIT_COUNT} commit geridedir.", - "FEELS": "Hissedilen", + "FEELS": "Hissedilen {DEGREE}", "PRECIP": "Yağış" } diff --git a/translations/uk.json b/translations/uk.json index 6ff57263..88bbc87b 100644 --- a/translations/uk.json +++ b/translations/uk.json @@ -31,6 +31,6 @@ "UPDATE_INFO_SINGLE": "Поточна версія на {COMMIT_COUNT} комміт позаду від гілки {BRANCH_NAME}.", "UPDATE_INFO_MULTIPLE": "Поточна інсталяція на {COMMIT_COUNT} комітів позаду від гілки {BRANCH_NAME}.", - "FEELS": "Відчувається як", + "FEELS": "Відчувається як {DEGREE}", "PRECIP": "Опади" } diff --git a/translations/zh-cn.json b/translations/zh-cn.json index 10d43283..1371ecf8 100644 --- a/translations/zh-cn.json +++ b/translations/zh-cn.json @@ -31,5 +31,5 @@ "UPDATE_INFO_SINGLE": "当前已安装版本比{BRANCH_NAME}分支落后{COMMIT_COUNT}次代码更新。", "UPDATE_INFO_MULTIPLE": "当前已安装版本比{BRANCH_NAME}分支落后{COMMIT_COUNT}次代码更新。", - "FEELS": "体感" + "FEELS": "体感 {DEGREE}" }