From 4a341b381ed52cb6b909c0859f2d7c53e197aa27 Mon Sep 17 00:00:00 2001
From: Ashish Tank <ashish.tank1@gmail.com>
Date: Thu, 31 Dec 2020 18:58:21 +0100
Subject: [PATCH] Added support for variables in nunjucks templates for
 translate filter

---
 CHANGELOG.md                        | 2 ++
 js/module.js                        | 4 ++--
 modules/default/weather/current.njk | 5 ++++-
 modules/default/weather/weather.js  | 5 ++++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index baa69dfb..241b3323 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ _This release is scheduled to be released on 2021-01-01._
 - Added SMHI as a provider to Weather module.
 - Added Hindi & Gujarati translation.
 - Added optional support for DEGREE position in Feels like translation
+- Added support for variables in nunjucks templates for translate filter
 - Chuvash translation.
 - Calendar: new options "limitDays" and "coloredEvents".
 - Added new option "limitDays" - limit the number of discreet days displayed.
@@ -63,6 +64,7 @@ _This release is scheduled to be released on 2021-01-01._
 - update node-ical version again, 0.12.7, change RRULE fix (#2371, #2379), node-ical now throws error (which we catch)
 - update simple-git version to 2.31 unhandled promise rejection (#2383)
 - Translator variables can have falsy values (e.g. empty string)
+- Fix issue with weather module with DEGREE label in FEELS like
 
 ## [2.13.0] - 2020-10-01
 
diff --git a/js/module.js b/js/module.js
index d52eb02b..e4304a19 100644
--- a/js/module.js
+++ b/js/module.js
@@ -175,8 +175,8 @@ var Module = Class.extend({
 			lstripBlocks: true
 		});
 
-		this._nunjucksEnvironment.addFilter("translate", function (str) {
-			return self.translate(str);
+		this._nunjucksEnvironment.addFilter("translate", function (str, variables) {
+			return self.translate(str, variables);
 		});
 
 		return this._nunjucksEnvironment;
diff --git a/modules/default/weather/current.njk b/modules/default/weather/current.njk
index 240dcdc5..2e0ed6d7 100755
--- a/modules/default/weather/current.njk
+++ b/modules/default/weather/current.njk
@@ -69,7 +69,10 @@
         <div class="normal medium">
             {% if config.showFeelsLike %}
                 <span class="dimmed">
-                    {{ "FEELS" | translate }} {{ current.feelsLike() | roundValue | unit("temperature") | decimalSymbol }}
+                    {{ "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 %}
diff --git a/modules/default/weather/weather.js b/modules/default/weather/weather.js
index 73ee0e16..09c4f29a 100644
--- a/modules/default/weather/weather.js
+++ b/modules/default/weather/weather.js
@@ -52,7 +52,8 @@ Module.register("weather", {
 		onlyTemp: false,
 		showPrecipitationAmount: false,
 		colored: false,
-		showFeelsLike: true
+		showFeelsLike: true,
+		feelsLikeWithDegree: false
 	},
 
 	// Module properties.
@@ -88,6 +89,8 @@ 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();