github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 01:16:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Escape $ in translations before interpolating (#8100)

Browse Source 
The dollar sign (`$`) is a special replace pattern, and `$&` inserts the
matched string. Thus dollars signs need to be escaped with the special
pattern `$$`, which inserts a single `$`.
This commit is contained in:
Kyle Zhao 2019-09-16 10:52:49 -07:00 committed by Robin Ward
parent 7c494cc631
commit fb200e3055
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/locales/i18n.js
View File

@ -116,7 +116,15 @@ I18n.interpolate = function(message, options) {
for (var i = 0; placeholder = matches[i]; i++) {
name = placeholder.replace(this.PLACEHOLDER, "$1");
value = options[name];
if (typeof options[name] === "string") {
// The dollar sign (`$`) is a special replace pattern, and `$&` inserts
// the matched string. Thus dollars signs need to be escaped with the
// special pattern `$$`, which inserts a single `$`.
// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/replace#Specifying_a_string_as_a_parameter
value = options[name].replace(/\$/g, "$$$$");
} else {
value = options[name];
}
if (!this.isValidNode(options, name)) {
value = "[missing " + placeholder + " value]";

12
test/javascripts/lib/i18n-test.js.es6
View File

@ -60,7 +60,8 @@ QUnit.module("lib:i18n", {
days: {
one: "%{count} day",
other: "%{count} days"
}
},
dollar_sign: "Hi {{description}}"
}
}
};
@ -223,3 +224,12 @@ QUnit.test("fallback", assert => {
"falls back to English translations"
);
});
QUnit.test("Dollar signs are properly escaped", assert => {
assert.equal(
I18n.t("dollar_sign", {
description: "$& $&"
}),
"Hi $& $&"
);
});