bug #60549 [Translation] Add intl-icu fallback for MessageCatalogue metadata (pontus-mp)

fabpot · fabpot · commit a36cfd8cf3f5 · 2025-05-29T09:06:50.000+02:00
This PR was squashed before being merged into the 6.4 branch. Discussion ---------- [Translation] Add intl-icu fallback for MessageCatalogue metadata | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #60523 | License | MIT Added domain fallback for metadata, which should match the behavior used for fetching messages. Commits ------- 4ab973c [Translation] Add intl-icu fallback for MessageCatalogue metadata
diff --git a/src/Symfony/Component/Translation/MessageCatalogue.php b/src/Symfony/Component/Translation/MessageCatalogue.php
@@ -237,6 +237,16 @@ public function getMetadata(string $key = '', string $domain = 'messages'): mixe
             return $this->metadata;
         }
 
+        if (isset($this->metadata[$domain.self::INTL_DOMAIN_SUFFIX])) {
+            if ('' === $key) {
+                return $this->metadata[$domain.self::INTL_DOMAIN_SUFFIX];
+            }
+
+            if (isset($this->metadata[$domain.self::INTL_DOMAIN_SUFFIX][$key])) {
+                return $this->metadata[$domain.self::INTL_DOMAIN_SUFFIX][$key];
+            }
+        }
+
         if (isset($this->metadata[$domain])) {
             if ('' == $key) {
                 return $this->metadata[$domain];
diff --git a/src/Symfony/Component/Translation/Tests/Catalogue/MessageCatalogueTest.php b/src/Symfony/Component/Translation/Tests/Catalogue/MessageCatalogueTest.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Translation\Tests\Catalogue;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Translation\MessageCatalogue;
+
+class MessageCatalogueTest extends TestCase
+{
+    public function testIcuMetadataKept()
+    {
+        $mc = new MessageCatalogue('en', ['messages' => ['a' => 'new_a']]);
+        $metadata = ['metadata' => 'value'];
+        $mc->setMetadata('a', $metadata, 'messages+intl-icu');
+        $this->assertEquals($metadata, $mc->getMetadata('a', 'messages'));
+        $this->assertEquals($metadata, $mc->getMetadata('a', 'messages+intl-icu'));
+    }
+}
