Fix bug related to aliasing default domain translations. (#4167)

vufind-org · Dec 17, 2024 · bcb1fa2 · bcb1fa2
1 parent 9ca264e
commit bcb1fa2
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/module/VuFind/src/VuFind/I18n/Translator/Loader/ExtendedIni.php b/module/VuFind/src/VuFind/I18n/Translator/Loader/ExtendedIni.php
@@ -194,7 +194,7 @@ public function load($locale, $filename)
      */
     public function getLanguageFilename($locale, $domain)
     {
-        return empty($domain)
+        return (empty($domain) || $domain === 'default')
             ? $locale . '.ini'
             : $domain . '/' . $locale . '.ini';
     }

diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/I18n/Translator/Loader/ExtendedIniTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/I18n/Translator/Loader/ExtendedIniTest.php
@@ -172,11 +172,11 @@ public function testMissingPathStack(): void
     }
 
     /**
-     * Test alias behavior.
+     * Test alias behavior in default domain.
      *
      * @return void
      */
-    public function testAliasing(): void
+    public function testAliasingInDefaultDomain(): void
     {
         $pathStack = [
             realpath($this->getFixtureDir() . 'language/aliases'),
@@ -195,6 +195,27 @@ public function testAliasing(): void
         );
     }
 
+    /**
+     * Test alias behavior in non-default domain.
+     *
+     * @return void
+     */
+    public function testAliasingInNonDefaultDomain(): void
+    {
+        $pathStack = [
+            realpath($this->getFixtureDir() . 'language/aliases'),
+        ];
+        $loader = new ExtendedIni($pathStack, 'en');
+        $result = $loader->load('en', 'Domain');
+        $this->assertEquals(
+            [
+                'bar' => 'Domain Translation',
+                'foofoo' => 'Translation',
+            ],
+            (array)$result
+        );
+    }
+
     /**
      * Test circular alias infinite loop prevention.
      *