From: Johan Cwiklinski <johan@x-tnd.be>
Date: Mon, 29 Nov 2021 11:27:56 +0000 (+0100)
Subject: Fix locales load from HTTP header
X-Git-Tag: 0.9.6^0
X-Git-Url: https://git.agnieray.net/?a=commitdiff_plain;h=16cee2a04c5bcd74fefd4a0a87e38c124ec215ec;p=galette.git

Fix locales load from HTTP header
---

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;
+                        }
                     }
                 }
             }