bn8/ldapsaisie
1
0
Fork 0
mirror of https://gitlab.easter-eggs.com/ee/ldapsaisie.git synced 2024-11-26 11:52:59 +01:00
Code Issues Projects Releases Wiki Activity

LSlang: fix handling locales that only existing in local directory

Browse source
This commit is contained in:
Benjamin Renard 2021-06-29 16:50:25 +02:00
parent 516cc12d1b
commit 0b850e8acb
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/includes/class/class.LSlang.php
View file

@ -149,7 +149,7 @@ class LSlang extends LSlog_staticLoggerClass {
$regex = '/^([a-zA-Z_]+)\.[a-zA-Z0-9\-]+$/'; $regex = '/^([a-zA-Z_]+)\.[a-zA-Z0-9\-]+$/';
} }
self :: log_trace("getLangList(".varDump($encoding).", $with_encoding) : regex='$regex'"); self :: log_trace("getLangList(".varDump($encoding).", $with_encoding) : regex='$regex'");
foreach(array(LS_I18N_DIR_PATH, LS_LOCAL_DIR.'/'.LS_I18N_DIR) as $lang_dir) { foreach(array(LS_I18N_DIR_PATH, LS_ROOT_DIR.'/'.LS_LOCAL_DIR.'/'.LS_I18N_DIR) as $lang_dir) {
if (!is_dir($lang_dir)) if (!is_dir($lang_dir))
continue; continue;
if ($handle = opendir($lang_dir)) { if ($handle = opendir($lang_dir)) {
@ -207,7 +207,7 @@ class LSlang extends LSlog_staticLoggerClass {
if ($locale == 'en_US.UTF8') { if ($locale == 'en_US.UTF8') {
return true; return true;
} }
foreach(array(LS_I18N_DIR_PATH, LS_LOCAL_DIR.'/'.LS_I18N_DIR) as $lang_dir) foreach(array(LS_I18N_DIR_PATH, LS_ROOT_DIR.'/'.LS_LOCAL_DIR.'/'.LS_I18N_DIR) as $lang_dir)
if (is_dir("$lang_dir/$locale")) if (is_dir("$lang_dir/$locale"))
return true; return true;
return false; return false;