Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion app/assets/javascripts/locales/i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -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]";
Expand Down
12 changes: 11 additions & 1 deletion test/javascripts/lib/i18n-test.js.es6
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ QUnit.module("lib:i18n", {
days: {
one: "%{count} day",
other: "%{count} days"
}
},
dollar_sign: "Hi {{description}}"
}
}
};
Expand Down Expand Up @@ -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 $& $&"
);
});