Skip to content
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

Jump to bottom

feat: allow '{n}' as placeholder for translated strings #5581

Merged
merged 2 commits into from
Jun 6, 2024
Merged

feat: allow '{n}' as placeholder for translated strings #5581

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
09175fa
feat: allow '{n}' as placeholder for translated strings
akoreman Jun 5, 2024
ba06cd5
test: update test
akoreman Jun 6, 2024
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
4 changes: 3 additions & 1 deletion src/config_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ module.exports = {
var nls = config.nls;
config.setMessages({
foo: "hello world of $1",
test_key: "hello world for test key"
test_key: "hello world for test key",
test_with_curly_brackets: "hello world $0 of {1} and $2 to the {3} degree"
});
assert.equal(nls("untranslated_key","bar $1"), "bar $1");
assert.equal(nls("untranslated_key", "bar"), "bar");
Expand All @@ -62,6 +63,7 @@ module.exports = {
assert.equal(nls("untranslated_key", "$0B is $1$$", [0.11, 22]), "0.11B is 22$");
assert.equal(nls("untranslated_key_but_translated_default_string", "foo", {1: "goo"}), "hello world of goo");
assert.equal(nls("test_key", "this text should not appear"), "hello world for test key");
assert.equal(nls("test_with_curly_brackets", "hello world $0 of {1} and $2 to the {3} degree", ["foo", "bar", "yay", "third"]), "hello world foo of bar and yay to the third degree");
},
"test: define options" : function() {
var o = {};
Expand Down
12 changes: 9 additions & 3 deletions src/lib/app_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,15 @@ class AppConfig {

var translated = messages[key] || messages[defaultString] || defaultString;
if (params) {
translated = translated.replace(/\$(\$|[\d]+)/g, function(_, name) {
if (name == "$") return "$";
return params[name];
// We support both $n or {n} as placeholder indicators in the provided translated strings
// Replace $n with the nth element in params
translated = translated.replace(/\$(\$|[\d]+)/g, function(_, dollarMatch) {
if (dollarMatch == "$") return "$";
return params[dollarMatch];
});
// Replace {n} with the nth element in params
translated = translated.replace(/\{([^\}]+)\}/g, function(_, curlyBracketMatch) {
return params[curlyBracketMatch];
});
}
return translated;
Expand Down
Loading