Skip to content

Issue translate encoded html #2427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MichMich merged 7 commits into from
Jan 21, 2021
Merged

Issue translate encoded html #2427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
10dc315
Merge pull request #2400 from MichMich/develop
MichMich Jan 1, 2021
b520b4c
Marked all translated strings as safe before passing them to the nunj…
dannoh Jan 20, 2021
ca48663
Merge remote-tracking branch 'origin/develop' into Issue-TranslateEnc…
dannoh Jan 20, 2021
5152e0b
Updated changelog
dannoh Jan 20, 2021
ad9c254
Removed |safe from translates in the default module templates
dannoh Jan 20, 2021
33592b3
Removed |safe from translates in the default module templates
dannoh Jan 20, 2021
78190d9
Merge branch 'develop' into Issue-TranslateEncodedHtml
MichMich Jan 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion js/module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion modules/default/weather/current.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
{% endif %}
{% else %}
<div class="dimmed light small">
{{ "LOADING" | translate | safe }}
{{ "LOADING" | translate }}
</div>
{% endif %}

Expand Down
2 changes: 1 addition & 1 deletion modules/default/weather/forecast.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</table>
{% else %}
<div class="dimmed light small">
{{ "LOADING" | translate | safe }}
{{ "LOADING" | translate }}
</div>
{% endif %}

Expand Down
2 changes: 1 addition & 1 deletion modules/default/weather/hourly.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</table>
{% else %}
<div class="dimmed light small">
{{ "LOADING" | translate | safe }}
{{ "LOADING" | translate }}
</div>
{% endif %}

Expand Down