Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-26 02:18:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix fallback for pluralized strings (#7480)

Browse Source 
* fix fallback for pluralized cases

Signed-off-by: Kerry Archibald <kerrya@element.io>

* add test case for no pluralizer

Signed-off-by: Kerry Archibald <kerrya@element.io>
This commit is contained in:
Kerry 2022-01-07 16:20:24 +01:00 committed by GitHub
parent 309f7bb235
commit d4250918cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
__mocks__/browser-request.js
View File

@ -2,6 +2,7 @@ const en = require("../src/i18n/strings/en_EN");
const de = require("../src/i18n/strings/de_DE"); const de = require("../src/i18n/strings/de_DE");
const lv = { const lv = {
"Save": "Saglabāt", "Save": "Saglabāt",
"Uploading %(filename)s and %(count)s others|one": "Качване на %(filename)s и %(count)s друг",
}; };
// Mock the browser-request for the languageHandler tests to return // Mock the browser-request for the languageHandler tests to return

3
src/languageHandler.tsx
View File

@ -85,7 +85,7 @@ export function _td(s: string): string { // eslint-disable-line @typescript-esli
const translateWithFallback = (text: string, options?: object): { translated?: string, isFallback?: boolean } => { const translateWithFallback = (text: string, options?: object): { translated?: string, isFallback?: boolean } => {
const translated = counterpart.translate(text, options); const translated = counterpart.translate(text, options);
if (/^missing translation:/.test(translated)) { if (/^missing translation:/.test(translated)) {
const fallbackTranslated = counterpart.translate(text, { ...options, fallbackLocale: FALLBACK_LOCALE }); const fallbackTranslated = counterpart.translate(text, { ...options, locale: FALLBACK_LOCALE });
return { translated: fallbackTranslated, isFallback: true }; return { translated: fallbackTranslated, isFallback: true };
} }
return { translated }; return { translated };
@ -168,7 +168,6 @@ export function _t(text: string, variables: IVariables, tags: Tags): React.React
export function _t(text: string, variables?: IVariables, tags?: Tags): TranslatedString { export function _t(text: string, variables?: IVariables, tags?: Tags): TranslatedString {
// The translation returns text so there's no XSS vector here (no unsafe HTML, no code execution) // The translation returns text so there's no XSS vector here (no unsafe HTML, no code execution)
const { translated } = safeCounterpartTranslate(text, variables); const { translated } = safeCounterpartTranslate(text, variables);
const substituted = substitute(translated, variables, tags); const substituted = substitute(translated, variables, tags);
return annotateStrings(substituted, text); return annotateStrings(substituted, text);

22
test/i18n-test/languageHandler-test.tsx
View File

@ -20,6 +20,13 @@ describe('languageHandler', function() {
type TestCase = [string, string, Record<string, unknown>, Record<string, unknown>, TranslatedString]; type TestCase = [string, string, Record<string, unknown>, Record<string, unknown>, TranslatedString];
const testCasesEn: TestCase[] = [ const testCasesEn: TestCase[] = [
['translates a basic string', basicString, {}, undefined, 'Rooms'], ['translates a basic string', basicString, {}, undefined, 'Rooms'],
[
'handles plurals when count is 0',
plurals,
{ count: 0 },
undefined,
'and 0 others...',
],
[ [
'handles plurals when count is 1', 'handles plurals when count is 1',
plurals, plurals,
@ -123,8 +130,19 @@ describe('languageHandler', function() {
setMissingEntryGenerator(counterpartDefaultMissingEntryGen); setMissingEntryGenerator(counterpartDefaultMissingEntryGen);
}); });
const lvExistingPlural = 'Uploading %(filename)s and %(count)s others';
// lv does not have a pluralizer function
const noPluralizerCase = [
'handles plural strings when no pluralizer exists for language',
lvExistingPlural,
{ count: 1, filename: 'test.txt' },
undefined,
'Uploading test.txt and 1 other',
] as TestCase;
describe('_t', () => { describe('_t', () => {
it.each(testCasesEn)( it.each([...testCasesEn, noPluralizerCase])(
"%s and translates with fallback locale", "%s and translates with fallback locale",
async (_d, translationString, variables, tags, result) => { async (_d, translationString, variables, tags, result) => {
expect(_t(translationString, variables, tags)).toEqual(result); expect(_t(translationString, variables, tags)).toEqual(result);
@ -133,7 +151,7 @@ describe('languageHandler', function() {
}); });
describe('_tDom()', () => { describe('_tDom()', () => {
it.each(testCasesEn)( it.each([...testCasesEn, noPluralizerCase])(
"%s and translates with fallback locale, attributes fallback locale", "%s and translates with fallback locale, attributes fallback locale",
async (_d, translationString, variables, tags, result) => { async (_d, translationString, variables, tags, result) => {
expect(_tDom(translationString, variables, tags)).toEqual(<span lang="en">{ result }</span>); expect(_tDom(translationString, variables, tags)).toEqual(<span lang="en">{ result }</span>);