Skip to content

Permit substituting a falsy value in translator variables #2393

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 2 commits into from
Dec 31, 2020
Merged

Permit substituting a falsy value in translator variables #2393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ea7de8
Permit substituting a falsy value in translator variables
MikeBishop Dec 31, 2020
c9fb389
CHANGELOG
MikeBishop Dec 31, 2020
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 @@ -58,6 +58,7 @@ _This release is scheduled to be released on 2021-01-01._
- update node-ical version again, 0.12.5, change RRULE fix (#2371, #2379)
- Added missing function call in module.show()
- remove undefined objects from modules array (#2382)
- Translator variables can have falsy values (e.g. empty string)

## [2.13.0] - 2020-10-01

Expand Down
2 changes: 1 addition & 1 deletion js/translator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ var Translator = (function () {
template = variables.fallback;
}
return template.replace(new RegExp("{([^}]+)}", "g"), function (_unused, varName) {
return variables[varName] || "{" + varName + "}";
return varName in variables ? variables[varName] : "{" + varName + "}";
});
}

Expand Down