From fba91329f16f80f61f1e8a42d3816fc74f3161a3 Mon Sep 17 00:00:00 2001 From: Ashish Tank Date: Thu, 31 Dec 2020 16:28:00 +0100 Subject: [PATCH] Added support optional support for DEGREE position in FEELS translation --- CHANGELOG.md | 1 + modules/default/currentweather/currentweather.js | 8 +++++++- translations/gu.json | 2 +- translations/hi.json | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eef2f82d..76307bd8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ _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 0a43b23e..918ed460 100644 --- a/modules/default/currentweather/currentweather.js +++ b/modules/default/currentweather/currentweather.js @@ -258,7 +258,13 @@ Module.register("currentweather", { var feelsLike = document.createElement("span"); feelsLike.className = "dimmed"; - feelsLike.innerHTML = this.translate("FEELS") + " " + this.feelsLike + degreeLabel; + 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; small.appendChild(feelsLike); wrapper.appendChild(small); diff --git a/translations/gu.json b/translations/gu.json index 7d10459e..f3cf38be 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": "જેવી લાગે છે", + "FEELS": "{DEGREE} જેવું લાગશે", "PRECIP": "PoP" } diff --git a/translations/hi.json b/translations/hi.json index 2a7c9b80..86f7c94d 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": "की तरह लगना", + "FEELS": "{DEGREE} की तरह लगना", "PRECIP": "PoP" }