From b520b4c37a38386420377b48a95de9a721624982 Mon Sep 17 00:00:00 2001
From: Dan Forsyth <dan@digitstech.ca>
Date: Wed, 20 Jan 2021 07:16:09 -0500
Subject: [PATCH 1/4] Marked all translated strings as safe before passing them
 to the nunjuck template

---
 js/module.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/module.js b/js/module.js
index 663413b6..14458f8a 100644
--- a/js/module.js
+++ b/js/module.js
@@ -176,7 +176,7 @@ var Module = Class.extend({
 		});
 
 		this._nunjucksEnvironment.addFilter("translate", function (str, variables) {
-			return self.translate(str, variables);
+			return nunjucks.runtime.markSafe(self.translate(str, variables));
 		});
 
 		return this._nunjucksEnvironment;

From 5152e0b114ce3c9d87aaecb440413cf229850136 Mon Sep 17 00:00:00 2001
From: Dan Forsyth <dan@digitstech.ca>
Date: Wed, 20 Jan 2021 07:36:26 -0500
Subject: [PATCH 2/4] Updated changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbebb44a..27a1d64a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ _This release is scheduled to be released on 2021-04-01._
 - Added default log levels to stop calendar log spamming.
 - Fix socket.io cors errors, see [breaking change since socket.io v3](https://socket.io/docs/v3/handling-cors/)
 - Fix Issue with weather forecast icons due to fixed day start and end time (#2221)
+- Fix issue with unencoded characters in translated strings when using nunjuck template (`Loading &hellip;` as an example)
 
 ## [2.14.0] - 2021-01-01
 

From ad9c2549bc40c70f552049ecaabe3ffbed1e1a3b Mon Sep 17 00:00:00 2001
From: Dan Forsyth <dan@digitstech.ca>
Date: Wed, 20 Jan 2021 13:47:32 -0500
Subject: [PATCH 3/4] Removed |safe from translates in the default module
 templates

---
 modules/default/weather/hourly.njk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/default/weather/hourly.njk b/modules/default/weather/hourly.njk
index e241b010..6fe17f6e 100644
--- a/modules/default/weather/hourly.njk
+++ b/modules/default/weather/hourly.njk
@@ -24,7 +24,7 @@
     </table>
 {% else %}
     <div class="dimmed light small">
-        {{ "LOADING" | translate | safe }}
+        {{ "LOADING" | translate }}
     </div>
 {% endif %}
 

From 33592b3c0ee21575ddefbfc8abb4278eade2079e Mon Sep 17 00:00:00 2001
From: Dan Forsyth <dan@digitstech.ca>
Date: Wed, 20 Jan 2021 14:06:00 -0500
Subject: [PATCH 4/4] Removed |safe from translates in the default module
 templates

---
 modules/default/weather/current.njk  | 2 +-
 modules/default/weather/forecast.njk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/default/weather/current.njk b/modules/default/weather/current.njk
index b8de8f80..e863eec4 100755
--- a/modules/default/weather/current.njk
+++ b/modules/default/weather/current.njk
@@ -81,7 +81,7 @@
     {% endif %}
 {% else %}
     <div class="dimmed light small">
-        {{ "LOADING" | translate | safe }}
+        {{ "LOADING" | translate }}
     </div>
 {% endif %}
 
diff --git a/modules/default/weather/forecast.njk b/modules/default/weather/forecast.njk
index 85ed0fef..a031d858 100644
--- a/modules/default/weather/forecast.njk
+++ b/modules/default/weather/forecast.njk
@@ -35,7 +35,7 @@
     </table>
 {% else %}
     <div class="dimmed light small">
-        {{ "LOADING" | translate | safe }}
+        {{ "LOADING" | translate }}
     </div>
 {% endif %}