symfony
diff --git a/‎src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php
+19-7Lines changed: 19 additions & 7 deletions b/‎src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php
+19-7Lines changed: 19 additions & 7 deletions
diff --git a/‎src/Symfony/Component/Translation/Tests/Command/TranslationPushCommandTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Tests/Command/TranslationPushCommandTest.php
+1-2Lines changed: 1 addition & 2 deletions b/‎src/Symfony/Component/Translation/Tests/Command/TranslationPushCommandTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Tests/Command/TranslationPushCommandTest.php
+1-2Lines changed: 1 addition & 2 deletions
@@ -75,8 +75,15 @@ public function write(TranslatorBagInterface $translatorBag): void
             }
 
             foreach ($catalogue->all() as $domain => $messages) {
-                $ids = $this->getAssetsIds($domain);
-                $this->translateAssets(array_combine($ids, array_values($messages)), $locale);
+                $keysIdsMap = [];
+
+                foreach ($this->getAssetsIds($domain) as $id) {
+                    $keysIdsMap[$this->retrieveKeyFromId($id, $domain)] = $id;
+                }
+
+                $ids = array_intersect_key($keysIdsMap, $messages);
+
+                $this->translateAssets(array_combine(array_values($ids), array_values($messages)), $locale);
             }
         }
     }
@@ -122,11 +129,7 @@ public function read(array $domains, array $locales): TranslatorBag
             $catalogue = new MessageCatalogue($locale);
 
             foreach ($locoCatalogue->all($domain) as $key => $message) {
-                if (str_starts_with($key, $domain.'__')) {
-                    $key = substr($key, \strlen($domain) + 2);
-                }
-
-                $catalogue->set($key, $message, $domain);
+                $catalogue->set($this->retrieveKeyFromId($key, $domain), $message, $domain);
             }
 
             $translatorBag->addCatalogue($catalogue);
@@ -289,4 +292,13 @@ private function getLocales(): array
             return $carry;
         }, []);
     }
+
+    private function retrieveKeyFromId(string $id, string $domain): string
+    {
+        if (str_starts_with($id, $domain.'__')) {
+            return substr($id, \strlen($domain) + 2);
+        }
+
+        return $id;
+    }
 }
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\FrameworkBundle\Tests\Command;
+namespace Symfony\Component\Translation\Tests\Command;
 
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
@@ -18,7 +18,6 @@
 use Symfony\Component\Translation\Loader\XliffFileLoader;
 use Symfony\Component\Translation\Provider\ProviderInterface;
 use Symfony\Component\Translation\Reader\TranslationReader;
-use Symfony\Component\Translation\Tests\Command\TranslationProviderTestCase;
 use Symfony\Component\Translation\TranslatorBag;
 
 /**