EVOgeek/Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3665 from NoelDeMartin/MOBILE-4288

Browse Source 
MOBILE-4288 multilang: Use fallback language
This commit is contained in:
Dani Palou 2023-05-10 07:29:45 +02:00 committed by GitHub
commit 7519691c98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/addons/filter/multilang/services/handlers/multilang.ts
View File

@ -58,15 +58,13 @@ export class AddonFilterMultilangHandlerService extends CoreFilterDefaultHandler
}
// Find language to use.
let language: string | undefined = await CoreLang.getCurrentLanguage();
if (!languages.has(language)) {
language = CoreLang.getParentLanguage();
}
if (!language) {
language = firstLanguage;
}
const language = [
await CoreLang.getCurrentLanguage(),
CoreLang.getParentLanguage(),
CoreLang.getFallbackLanguage(),
firstLanguage,
]
.find(candidate => candidate && languages.has(candidate));
if (!language) {
return text;

21
src/core/services/tests/lang.test.ts
View File

@ -122,7 +122,7 @@ describe('Lang', () => {
`, 'Japanese text');
});
it('filters multilang text using unknown language', async () => {
it('filters multilang text using the fallback language', async () => {
currentLanguage = 'ca';
parentLanguage = undefined;
@ -131,7 +131,7 @@ describe('Lang', () => {
<span class="multilang" lang="en">English</span>
<span class="multilang" lang="ja">Japanese</span>
text
`, 'Spanish text');
`, 'English text');
await expectMultilangFilter(`
{mlang es}Spanish{mlang}
@ -141,6 +141,23 @@ describe('Lang', () => {
`, 'text');
});
it('filters multilang text using the first language', async () => {
currentLanguage = 'ca';
parentLanguage = undefined;
await expectMultilangFilter(`
<span class="multilang" lang="es">Spanish</span>
<span class="multilang" lang="ja">Japanese</span>
text
`, 'Spanish text');
await expectMultilangFilter(`
{mlang es}Spanish{mlang}
{mlang ja}Japanese{mlang}
text
`, 'text');
});
/**
* Test multilang filter (normalizing whitespace).
*/