L10N patch.

Changelog excerpt:
- Slightly improved client-specified language overrides.

Author: Maikuolan

Diff for: Changelog.md

@@ -105,3 +105,5 @@ __*Why "v3.0.0" instead of "v1.0.0?"*__ Prior to phpMussel v3, the "phpMussel Co
 ### v3.3.5
 
 [2023.01.21; Maikuolan]: Better value definitions for `vt_suspicion_level`.
+
+[2023.02.14; Maikuolan]: Slightly improved client-specified language overrides.

Diff for: src/Loader.php

@@ -8,7 +8,7 @@
  * License: GNU/GPLv2
  * @see LICENSE.txt
  *
- * This file: The loader (last modified: 2022.12.26).
+ * This file: The loader (last modified: 2023.02.14).
  */
 
 namespace phpMussel\Core;
@@ -638,19 +638,28 @@ public function loadL10N(string $Path = ''): void
                 $this->ClientL10N = &$this->L10N;
             }
         } else {
-            $Accepted = preg_replace(['~^([^,]*).*$~', '~[^-A-Za-z]~'], ['\1', ''], $_SERVER['HTTP_ACCEPT_LANGUAGE']);
-            $Primary = '';
-            $IsSameAs = false;
-            if ($this->Configuration['core']['lang'] === $Accepted) {
-                $IsSameAs = true;
-            } elseif (is_readable($Path . $Accepted . '.yml')) {
-                $Primary = $this->readFile($Path . $Accepted . '.yml');
-            } else {
-                $Accepted = strtolower(preg_replace('~^([^-]*).*$~', '\1', $Accepted));
+            $Try = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
+            foreach ($Try as $Accepted) {
+                $Accepted = preg_replace(['~;.*$~', '~[^-A-Za-z]~'], '', $Accepted);
+                $ForAutoAssign = $Accepted;
+                $Primary = '';
+                $IsSameAs = false;
                 if ($this->Configuration['core']['lang'] === $Accepted) {
                     $IsSameAs = true;
-                } elseif (is_readable($Path . $Accepted . '.yml')) {
+                    break;
+                }
+                if (is_readable($Path . $Accepted . '.yml')) {
                     $Primary = $this->readFile($Path . $Accepted . '.yml');
+                    break;
+                }
+                $Accepted = strtolower(preg_replace('~-.*$~', '', $Accepted));
+                if ($this->Configuration['core']['lang'] === $Accepted) {
+                    $IsSameAs = true;
+                    break;
+                }
+                if (is_readable($Path . $Accepted . '.yml')) {
+                    $Primary = $this->readFile($Path . $Accepted . '.yml');
+                    break;
                 }
             }
 
@@ -659,25 +668,25 @@ public function loadL10N(string $Path = ''): void
                 if (!($this->ClientL10N instanceof \Maikuolan\Common\L10N)) {
                     $this->ClientL10N = &$this->L10N;
                 }
-            } elseif ($Primary) {
+            } elseif ($Primary !== '') {
                 $Arr = [];
-                if (!$this->ClientL10NAccepted) {
+                if ($this->ClientL10NAccepted === '') {
                     $this->ClientL10NAccepted = $Accepted;
                 }
                 $this->YAML->process($Primary, $Arr);
                 if ($this->ClientL10N instanceof \Maikuolan\Common\L10N && is_array($this->ClientL10N->Data)) {
                     $this->ClientL10N->Data = array_merge($this->ClientL10N->Data, $Arr);
                 } else {
                     $this->ClientL10N = new \Maikuolan\Common\L10N($Arr, $this->L10N);
-                    $this->ClientL10N->autoAssignRules($Accepted);
+                    $this->ClientL10N->autoAssignRules($ForAutoAssign);
                 }
             } elseif (!($this->ClientL10N instanceof \Maikuolan\Common\L10N)) {
                 $this->ClientL10N = new \Maikuolan\Common\L10N([], $this->L10N);
             }
         }
 
         /** Fallback for missing accepted client L10N choice. */
-        if (!$this->ClientL10NAccepted) {
+        if (!$this->ClientL10NAccepted === '') {
             $this->ClientL10NAccepted = $this->Configuration['core']['lang'];
         }
     }