Merge pull request #2427 from dannoh/Issue-TranslateEncodedHtml

Issue translate encoded html

CHANGELOG.md

@@ -35,6 +35,7 @@ _This release is scheduled to be released on 2021-04-01._
 - Fix Issue with weather forecast icons due to fixed day start and end time (#2221)
 - Fix empty directory for each module's main javascript file in the inspector
 - Fix Issue with weather forecast icons unit tests with different timezones (#2221)
+- Fix issue with unencoded characters in translated strings when using nunjuck template (`Loading …` as an example)
 
 ## [2.14.0] - 2021-01-01
 

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;

modules/default/weather/current.njk

@@ -81,7 +81,7 @@
     {% endif %}
 {% else %}
     <div class="dimmed light small">
-        {{ "LOADING" | translate | safe }}
+        {{ "LOADING" | translate }}
     </div>
 {% endif %}
 

modules/default/weather/forecast.njk

@@ -35,7 +35,7 @@
     </table>
 {% else %}
     <div class="dimmed light small">
-        {{ "LOADING" | translate | safe }}
+        {{ "LOADING" | translate }}
     </div>
 {% endif %}
 

modules/default/weather/hourly.njk

@@ -24,7 +24,7 @@
     </table>
 {% else %}
     <div class="dimmed light small">
-        {{ "LOADING" | translate | safe }}
+        {{ "LOADING" | translate }}
     </div>
 {% endif %}