From d61a50d8cee4fdfc2ebf78171fd5ec6fc06d84b9 Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Thu, 31 Dec 2020 18:42:28 +0100 Subject: [PATCH] Revert "Added support for optional DEGREE position in "FEELS" label" --- CHANGELOG.md | 1 - modules/default/currentweather/currentweather.js | 8 +------- translations/gu.json | 2 +- translations/hi.json | 2 +- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index baa69dfb0f..f30b3e71fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,6 @@ _This release is scheduled to be released on 2021-01-01._ - Added Weatherbit as a provider to Weather module. - Added SMHI as a provider to Weather module. - Added Hindi & Gujarati translation. -- Added optional support for DEGREE position in Feels like translation - Chuvash translation. - Calendar: new options "limitDays" and "coloredEvents". - Added new option "limitDays" - limit the number of discreet days displayed. diff --git a/modules/default/currentweather/currentweather.js b/modules/default/currentweather/currentweather.js index 918ed46066..0a43b23e6b 100644 --- a/modules/default/currentweather/currentweather.js +++ b/modules/default/currentweather/currentweather.js @@ -258,13 +258,7 @@ 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") + " " + this.feelsLike + degreeLabel; small.appendChild(feelsLike); wrapper.appendChild(small); diff --git a/translations/gu.json b/translations/gu.json index f3cf38be4f..7d10459eeb 100644 --- a/translations/gu.json +++ b/translations/gu.json @@ -33,6 +33,6 @@ "UPDATE_INFO_SINGLE": "વર્તમાન ઇન્સ્ટોલેશન એ {BRANCH_NAME} શાખા ની {COMMIT_COUNT} કમીટ પાછળ છે. ", "UPDATE_INFO_MULTIPLE": "વર્તમાન ઇન્સ્ટોલેશન એ {BRANCH_NAME} શાખા ની {COMMIT_COUNT} કમીટ પાછળ છે. ", - "FEELS": "{DEGREE} જેવું લાગશે", + "FEELS": "જેવી લાગે છે", "PRECIP": "PoP" } diff --git a/translations/hi.json b/translations/hi.json index 86f7c94df8..2a7c9b80b2 100644 --- a/translations/hi.json +++ b/translations/hi.json @@ -33,6 +33,6 @@ "UPDATE_INFO_SINGLE": "वर्तमान स्थापना {COMMIT_COUNT} {BRANCH_NAME} शाखा के पीछे है।", "UPDATE_INFO_MULTIPLE": "वर्तमान स्थापना {COMMIT_COUNT} पीछे {BRANCH_NAME} शाखा पर है।", - "FEELS": "{DEGREE} की तरह लगना", + "FEELS": "की तरह लगना", "PRECIP": "PoP" }