From 0b850e8acbddc2b85584169cdcadabfc3a70de97 Mon Sep 17 00:00:00 2001 From: Benjamin Renard Date: Tue, 29 Jun 2021 16:50:25 +0200 Subject: [PATCH] LSlang: fix handling locales that only existing in local directory --- src/includes/class/class.LSlang.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/includes/class/class.LSlang.php b/src/includes/class/class.LSlang.php index 52a79915..06d039ec 100644 --- a/src/includes/class/class.LSlang.php +++ b/src/includes/class/class.LSlang.php @@ -149,7 +149,7 @@ class LSlang extends LSlog_staticLoggerClass { $regex = '/^([a-zA-Z_]+)\.[a-zA-Z0-9\-]+$/'; } 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)) continue; if ($handle = opendir($lang_dir)) { @@ -207,7 +207,7 @@ class LSlang extends LSlog_staticLoggerClass { if ($locale == 'en_US.UTF8') { 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")) return true; return false;