From e3e7619a55edec9d7b629c021ae4e607f5d1f9c6 Mon Sep 17 00:00:00 2001 From: Jared Hancock <jared@osticket.com> Date: Wed, 23 Jul 2014 23:53:07 -0500 Subject: [PATCH] i18n: Allow case-insensitive locale spec --- include/class.i18n.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/include/class.i18n.php b/include/class.i18n.php index 05914f780..34e873ef9 100644 --- a/include/class.i18n.php +++ b/include/class.i18n.php @@ -29,8 +29,10 @@ class Internationalization { if ($cfg && ($lang = $cfg->getSystemLanguage())) array_unshift($this->langs, $language); - if ($language) - array_unshift($this->langs, $language); + // Detect language filesystem path, case insensitively + if ($language && ($info = self::getLanguageInfo($language))) { + array_unshift($this->langs, $info['code']); + } } function getTemplate($path) { @@ -192,7 +194,7 @@ class Internationalization { static function getLanguageInfo($lang) { $langs = self::availableLanguages(); - return @$langs[$lang] ?: array(); + return @$langs[strtolower($lang)] ?: array(); } static function availableLanguages($base=I18N_DIR) { -- GitLab