From 16cee2a04c5bcd74fefd4a0a87e38c124ec215ec Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Mon, 29 Nov 2021 12:27:56 +0100 Subject: [PATCH] Fix locales load from HTTP header --- galette/lib/Galette/Core/I18n.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/galette/lib/Galette/Core/I18n.php b/galette/lib/Galette/Core/I18n.php index e37313fe8..bf82e8d16 100644 --- a/galette/lib/Galette/Core/I18n.php +++ b/galette/lib/Galette/Core/I18n.php @@ -100,9 +100,13 @@ class I18n arsort($preferred_locales); foreach (array_keys($preferred_locales) as $preferred_locale) { - if (array_key_exists(str_replace('-', '_', $preferred_locale), $this->langs)) { - $dlang = str_replace('-', '_', $preferred_locale); - break; + $short_locale = explode('_', $preferred_locale)[0]; + foreach (array_keys($this->langs) as $lang) { + $short_key = explode('_', $lang)[0]; + if ($short_key == $short_locale) { + $dlang = $lang; + break; + } } } } -- 2.39.2