mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-06-01 13:46:35 +02:00
Code Issues Projects Releases Wiki Activity

MDL-69788 lang: fallback to all translations if misconfigured.

Browse Source 
If given translation list contains only invalid entries, fallback
to returning the complete list of available language translations.
This commit is contained in:
Paul Holden 2020-10-15 23:31:31 +01:00
parent 149fdcf075
commit 59ec5b1851
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/classes/string_manager_standard.php
View File

@ -533,7 +533,13 @@ class core_string_manager_standard implements core_string_manager {
$languages[$langcode] = !empty($this->transaliases[$langcode]) ? $this->transaliases[$langcode] : $langname;
}
}
return $languages;
// If there are no valid enabled translations, then return all languages.
if (!empty($languages)) {
return $languages;
} else {
return $cachedlist;
}
}
// Get all languages available in system.
@ -584,7 +590,12 @@ class core_string_manager_standard implements core_string_manager {
}
}
return $languages;
// If there are no valid enabled translations, then return all languages.
if (!empty($languages)) {
return $languages;
} else {
return $cachedlist;
}
}
/**

7
lib/tests/string_manager_standard_test.php
View File

@ -140,6 +140,13 @@ class core_string_manager_standard_testcase extends advanced_testcase {
$this->assertEquals(['en' => 'En'], $stringman->get_list_of_translations());
// Set invalid config, ensure original list is returned.
set_config('langlist', 'xx');
$this->assertEquals(['en' => 'English ‎(en)‎'], get_string_manager(true)->get_list_of_translations());
set_config('langlist', 'xx,en|En');
$this->assertEquals(['en' => 'En'], get_string_manager(true)->get_list_of_translations());
set_config('langlist', '');
get_string_manager(true);
}