From 66a3c035d132f48c36f6b44d292883bc6c43d356 Mon Sep 17 00:00:00 2001 From: Mathieu Santostefano Date: Sun, 21 Nov 2021 23:11:05 +0100 Subject: [PATCH] Fix idempotency of LocoProvider write method --- .../Translation/Bridge/Loco/LocoProvider.php | 26 ++++++++++++++----- .../Bridge/Loco/Tests/LocoProviderTest.php | 4 +-- .../Command/TranslationPushCommandTest.php | 3 +-- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php b/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php index b5544070a5678..3882176d8d54a 100644 --- a/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php +++ b/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php @@ -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; + } } diff --git a/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderTest.php b/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderTest.php index 09c779324310b..2a2183abf110f 100644 --- a/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderTest.php +++ b/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderTest.php @@ -148,7 +148,7 @@ public function testCompleteWriteProcess() $this->assertSame(['filter' => 'messages'], $options['query']); $this->assertSame($expectedAuthHeader, $options['normalized_headers']['authorization'][0]); - return new MockResponse('[{"id":"messages__a"}]'); + return new MockResponse('[{"id":"messages__foo.existing_key"},{"id":"messages__a"}]'); }, 'translateAsset1' => function (string $method, string $url, array $options = []) use ($expectedAuthHeader): ResponseInterface { $this->assertSame('POST', $method); @@ -164,7 +164,7 @@ public function testCompleteWriteProcess() $this->assertSame(['filter' => 'validators'], $options['query']); $this->assertSame($expectedAuthHeader, $options['normalized_headers']['authorization'][0]); - return new MockResponse('[{"id":"validators__post.num_comments"}]'); + return new MockResponse('[{"id":"validators__foo.existing_key"},{"id":"validators__post.num_comments"}]'); }, 'translateAsset2' => function (string $method, string $url, array $options = []) use ($expectedAuthHeader): ResponseInterface { $this->assertSame('POST', $method); diff --git a/src/Symfony/Component/Translation/Tests/Command/TranslationPushCommandTest.php b/src/Symfony/Component/Translation/Tests/Command/TranslationPushCommandTest.php index 1f0db90d3fbff..eb975afbd8830 100644 --- a/src/Symfony/Component/Translation/Tests/Command/TranslationPushCommandTest.php +++ b/src/Symfony/Component/Translation/Tests/Command/TranslationPushCommandTest.php @@ -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; /** pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy