Fix idempotency of translation:push on Loco

welcoMattic · welcoMattic · commit 2c497198804b · 2021-11-21T23:11:05.000+01:00
diff --git a/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php b/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php
@@ -75,7 +75,12 @@ public function write(TranslatorBagInterface $translatorBag): void
             }
 
             foreach ($catalogue->all() as $domain => $messages) {
-                $ids = $this->getAssetsIds($domain);
+                $keysFromLoco = array_map(function ($id) use($domain) {
+                    return $this->retrieveKeyFromId($id, $domain);
+                }, $this->getAssetsIds($domain));
+
+                $ids = array_intersect($keysFromLoco, array_keys($messages));
+
                 $this->translateAssets(array_combine($ids, array_values($messages)), $locale);
             }
         }
@@ -122,11 +127,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 +290,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;
+    }
 }
