L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-65236 core: allow to alias languages in the lang selector

Browse Source
This commit is contained in:
Marina Glancy
2019-04-08 14:14:23 +02:00
parent 9d4f4f0051
commit 41653114b5
4 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/classes/string_manager_standard.php
+8 -4
View File
@@ -45,6 +45,8 @@ class core_string_manager_standard implements core_string_manager {
protected $countgetstring = 0;
/** @var bool use disk cache */
protected $translist;
/** @var array language aliases to use in the language selector */
protected $transaliases = [];
/** @var cache stores list of available translations */
protected $menucache;
/** @var array list of cached deprecated strings */
@@ -56,12 +58,14 @@ class core_string_manager_standard implements core_string_manager {
* @param string $otherroot location of downloaded lang packs - usually $CFG->dataroot/lang
* @param string $localroot usually the same as $otherroot
* @param array $translist limit list of visible translations
* @param array $transaliases aliases to use for the languages in the language selector
*/
public function __construct($otherroot, $localroot, $translist) {
public function __construct($otherroot, $localroot, $translist, $transaliases = []) {
$this->otherroot = $otherroot;
$this->localroot = $localroot;
if ($translist) {
$this->translist = array_combine($translist, $translist);
$this->transaliases = $transaliases;
} else {
$this->translist = array();
}
@@ -521,8 +525,8 @@ class core_string_manager_standard implements core_string_manager {
}
// Return only enabled translations.
foreach ($cachedlist as $langcode => $langname) {
if (isset($this->translist[$langcode])) {
$languages[$langcode] = $langname;
if (array_key_exists($langcode, $this->translist)) {
$languages[$langcode] = !empty($this->transaliases[$langcode]) ? $this->transaliases[$langcode] : $langname;
}
}
return $languages;
@@ -572,7 +576,7 @@ class core_string_manager_standard implements core_string_manager {
$languages = array();
foreach ($cachedlist as $langcode => $langname) {
if (isset($this->translist[$langcode])) {
$languages[$langcode] = $langname;
$languages[$langcode] = !empty($this->transaliases[$langcode]) ? $this->transaliases[$langcode] : $langname;
}
}