OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

[i18n] only append tail if it is actually needed 

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/21833/head
Michael Telatynski 2019-08-22 18:31:02 +01:00
parent b5daba9026
commit 310457059b
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/languageHandler.js
View File

@ -177,6 +177,10 @@ export function replaceByRegexes(text, mapping) {
// If we insert any components we need to wrap the output in a span. React doesn't like just an array of components. // If we insert any components we need to wrap the output in a span. React doesn't like just an array of components.
let shouldWrapInSpan = false; let shouldWrapInSpan = false;
if (text === "You are now ignoring %(userId)s") {
debugger;
}
for (const regexpString in mapping) { for (const regexpString in mapping) {
// TODO: Cache regexps // TODO: Cache regexps
const regexp = new RegExp(regexpString, "g"); const regexp = new RegExp(regexpString, "g");
@ -233,11 +237,15 @@ export function replaceByRegexes(text, mapping) {
// add the text between prevMatch and this one // add the text between prevMatch and this one
// or the end of the string if prevMatch is the last match // or the end of the string if prevMatch is the last match
let tail;
if (match) { if (match) {
const startIndex = prevMatch.index + prevMatch[0].length; const startIndex = prevMatch.index + prevMatch[0].length;
parts.push(inputText.substr(startIndex, match.index - startIndex)); tail = inputText.substr(startIndex, match.index - startIndex);
} else { } else {
parts.push(inputText.substr(prevMatch.index + prevMatch[0].length)); tail = inputText.substr(prevMatch.index + prevMatch[0].length);
}
if (tail) {
parts.push(tail);
} }
} }

4
test/i18n-test/languageHandler-test.js
View File

@ -73,12 +73,12 @@ describe('languageHandler', function() {
it('multiple replacements of the same variable', function() { it('multiple replacements of the same variable', function() {
const text = '%(var1)s %(var1)s'; const text = '%(var1)s %(var1)s';
expect(languageHandler._t(text, { var1: 'val1' })).toBe('val1 val1'); expect(languageHandler.substitute(text, { var1: 'val1' })).toBe('val1 val1');
}); });
it('multiple replacements of the same tag', function() { it('multiple replacements of the same tag', function() {
const text = '<a>Click here</a> to join the discussion! <a>or here</a>'; const text = '<a>Click here</a> to join the discussion! <a>or here</a>';
expect(languageHandler._t(text, {}, { 'a': (sub) => `x${sub}x` })) expect(languageHandler.substitute(text, {}, { 'a': (sub) => `x${sub}x` }))
.toBe('xClick herex to join the discussion! xor herex'); .toBe('xClick herex to join the discussion! xor herex');
}); });
}); });