Bug-fix.

Changelog excerpt:
- If the client-specified language was the same as the configured language,
  the client-specified preferred variant would be ignored, even if it
  wasn't the same as the configured preferred variant; Fixed.

Author: Maikuolan

Changelog.md

@@ -155,3 +155,5 @@ __*Why "v3.0.0" instead of "v1.0.0?"*__ Prior to phpMussel v3, the "phpMussel Co
 ### v3.5.2
 
 [2024.07.02; Maikuolan]: Refactored the `loadL10N` method. Merged zh and zh-TW L10N, and dropped region designations (e.g., CN, TW) in favour of script designations (e.g., Hans, Hant).
+
+[2024.07.13; Bug-fix; Maikuolan]: If the client-specified language was the same as the configured language, the client-specified preferred variant would be ignored, even if it wasn't the same as the configured preferred variant; Fixed.

src/Loader.php

@@ -8,7 +8,7 @@
  * License: GNU/GPLv2
  * @see LICENSE.txt
  *
- * This file: The loader (last modified: 2024.07.01).
+ * This file: The loader (last modified: 2024.07.13).
  */
 
 namespace phpMussel\Core;
@@ -629,26 +629,28 @@ public function loadL10N(string $Path = ''): void
                 $Accepted = preg_replace(['~;.*$~', '~[^-A-Za-z]~'], '', $Accepted);
                 $Primary = '';
                 $IsSameAs = false;
-                foreach ([$Accepted, strtolower(preg_replace('~-.*$~', '', $Accepted))] as $Accepted) {
-                    if ($this->L10NAccepted === $Accepted) {
+                if ($this->L10NAccepted === $Accepted) {
+                    $IsSameAs = true;
+                    break;
+                }
+                $Main = strpos($Accepted, '-') === false ? '' : strtolower(preg_replace('~-.*$~', '', $Accepted));
+                if (($Primary = $this->readFile($Path . $Accepted . '.yml')) !== '' || ($Primary = $this->readFile($Path . $Main . '.yml')) !== '') {
+                    break;
+                }
+                foreach ([$Accepted, $Main] as $Accepted) {
+                    if ($Accepted === '' || !isset($this->ConfigurationDefaults['core']['lang']['defer'][$Accepted])) {
+                        break;
+                    }
+                    if ($this->L10NAccepted === $this->ConfigurationDefaults['core']['lang']['defer'][$Accepted]) {
                         $IsSameAs = true;
                         break 2;
                     }
-                    if (($Primary = $this->readFile($Path . $Accepted . '.yml')) !== '') {
+                    if (
+                        ($Primary = $this->readFile($Path . $this->ConfigurationDefaults['core']['lang']['defer'][$Accepted] . '.yml')) !== '' ||
+                        ($Primary = $this->readFile($Path . preg_replace('~-.*$~', '', $this->ConfigurationDefaults['core']['lang']['defer'][$Accepted]) . '.yml')) !== ''
+                    ) {
                         break 2;
                     }
-                    if (isset($this->ConfigurationDefaults['core']['lang']['defer'][$Accepted])) {
-                        if ($this->L10NAccepted === $this->ConfigurationDefaults['core']['lang']['defer'][$Accepted]) {
-                            $IsSameAs = true;
-                            break 2;
-                        }
-                        if (
-                            ($Primary = $this->readFile($Path . $this->ConfigurationDefaults['core']['lang']['defer'][$Accepted] . '.yml')) !== '' ||
-                            ($Primary = $this->readFile($Path . preg_replace('~-.*$~', '', $this->ConfigurationDefaults['core']['lang']['defer'][$Accepted]) . '.yml')) !== ''
-                        ) {
-                            break 2;
-                        }
-                    }
                 }
             }
             if ($Primary !== '') {
@@ -676,7 +678,6 @@ public function loadL10N(string $Path = ''): void
                 }
             } elseif (!($this->ClientL10N instanceof \Maikuolan\Common\L10N)) {
                 $this->ClientL10N = new \Maikuolan\Common\L10N([], $this->L10N);
-                $this->ClientL10N->autoAssignRules($Accepted);
             }
         }