Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 08:36:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: #9206, fix double escaped arguments

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2021-01-17 20:22:46 -05:00
parent f5fcd232f6
commit 1590cdf19f
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/src/modules/translator.js
View File

@@ -286,6 +286,9 @@
var out = translated;
translatedArgs.forEach(function (arg, i) {
var escaped = arg.replace(/%(?=\d)/g, '%').replace(/\\,/g, ',');
// fix double escaped translation keys, see https://github.com/NodeBB/NodeBB/issues/9206
escaped = escaped.replace(/[/g, '[')
.replace(/]/g, ']');
out = out.replace(new RegExp('%' + (i + 1), 'g'), escaped);
});
return out;

10
test/translator.js
View File

@@ -135,6 +135,16 @@ describe('new Translator(language)', function () {
});
});
it('should translate escaped translation arguments properly', function () {
// https://github.com/NodeBB/NodeBB/issues/9206
var translator = Translator.create('en-GB');
var key = '[[notifications:upvoted_your_post_in, test1, error: Error: [[error:group-name-too-long]] on NodeBB Upgrade]]';
return translator.translate(key).then(function (translated) {
assert.strictEqual(translated, '<strong>test1</strong> has upvoted your post in <strong>error: Error: &lsqb;&lsqb;error:group-name-too-long&rsqb;&rsqb; on NodeBB Upgrade</strong>.');
});
});
it('should properly escape and ignore % and \\, in arguments', function () {
var translator = Translator.create('en-GB');