Code cleanup for feels like translation

2025-06-27 19:53:36 +00:00 · 2021-01-10 17:37:10 +01:00 · 2021-01-10 17:37:10 +01:00 · 774b86c7dc
commit 774b86c7dc
parent 3eda8af671
31 changed files with 36 additions and 45 deletions
--- 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

--- 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);
--- a/modules/default/weather/current.njk
+++ b/modules/default/weather/current.njk
@ -70,9 +70,6 @@
            {% if config.showFeelsLike %}
                <span class="dimmed">
                    {{ "FEELS" | translate({DEGREE: current.feelsLike() | roundValue | unit("temperature") | decimalSymbol }) }}
-					{% if not config.feelsLikeWithDegree %}
-					{{ current.feelsLike() | roundValue | unit("temperature") | decimalSymbol }}
-					{% endif %}
                </span>
            {% endif %}
            {% if config.showPrecipitationAmount %}
--- 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();

--- 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} модуль валли ҫӗнетӳ пур.",
--- 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",
--- 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}"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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}"
 }
--- 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": "משקעים"
 }
--- 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": "उप",
--- 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}"
 }
--- 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}"
 }
--- 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}"
 }
--- 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"
 }
--- 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}"
 }
--- 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}"
 }
--- 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}"
 }
--- 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"
 }
--- 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}"
 }
--- 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"
 }
--- 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}"
 }
--- 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}"
 }
--- 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} модуля.",
--- 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}"
 }
--- 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}"
 }
--- 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ğış"
 }
--- 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": "Опади"
 }
--- 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}"
 }