[ApiBundle] Unification of locale in translations #15535

Wojdylak · 2023-11-15T14:36:30Z

Q	A
Branch?	1.13
Bug fix?	no
New feature?	no
BC breaks?	no
Deprecations?	no
Related tickets	N?A
License	MIT

github-actions · 2023-11-15T14:49:53Z

Bunnyshell Preview Environment deleted

Available commands:

/bns:deploy to redeploy the environment

GSadee · 2023-11-16T12:14:08Z

Thanks, Karol! 🎉

diimpp · 2023-11-16T12:16:39Z

src/Sylius/Behat/Context/Api/Admin/ManagingProductAssociationTypesContext.php

@@ -167,7 +166,7 @@ public function iWantToModifyTheProductAssociationType(ProductAssociationTypeInt
     */
    public function iRenameItToIn(string $name, string $language): void


--- public function iRenameItToIn(string $name, string $language): void +++ public function iRenameItToIn(string $name, string $localeCode): void

diimpp · 2023-11-16T12:17:06Z

src/Sylius/Behat/Context/Api/Admin/ManagingProductAssociationTypesContext.php

@@ -167,7 +166,7 @@ public function iWantToModifyTheProductAssociationType(ProductAssociationTypeInt
     */
    public function iRenameItToIn(string $name, string $language): void
    {
-        $this->client->updateRequestData(['translations' => [$language => ['name' => $name, 'locale' => $language]]]);
+        $this->client->updateRequestData(['translations' => [$language => ['name' => $name]]]);


--- $this->client->updateRequestData(['translations' => [$language => ['name' => $name]]]); +++ $this->client->updateRequestData(['translations' => [$localeCode => ['name' => $name]]]);

diimpp · 2023-11-16T12:18:08Z

src/Sylius/Behat/Context/Api/Admin/ManagingProductOptionsContext.php

@@ -61,7 +61,7 @@ public function iWantToModifyProductOption(ProductOptionInterface $productOption
     */
    public function iNameItInLanguage(?string $name = null, ?string $language = 'en_US'): void
    {
-        $data = ['translations' => [$language => ['locale' => $language]]];
+        $data = ['translations' => [$language => []]];


--- $data = ['translations' => [$language => []]]; +++ $data = ['translations' => [$localeCode => []]];

diimpp · 2023-11-16T12:18:33Z

src/Sylius/Behat/Context/Api/Admin/ManagingProductOptionsContext.php

@@ -74,15 +74,15 @@ public function iNameItInLanguage(?string $name = null, ?string $language = 'en_
     */
    public function iRenameItInLanguage(string $name, string $language): void
    {
-        $this->client->updateRequestData(['translations' => [$language => ['name' => $name, 'locale' => $language]]]);
+        $this->client->updateRequestData(['translations' => [$language => ['name' => $name]]]);


--- $this->client->updateRequestData(['translations' => [$language => ['name' => $name]]]); +++ $this->client->updateRequestData(['translations' => [$localeCode => ['name' => $name]]]);

diimpp · 2023-11-16T12:19:02Z

src/Sylius/Behat/Context/Api/Admin/ManagingProductOptionsContext.php

    }

    /**
     * @When I remove its name from :language translation
     */
    public function iRemoveItsNameFromTranslation(string $language): void
    {
-        $this->client->updateRequestData(['translations' => [$language => ['name' => '', 'locale' => $language]]]);
+        $this->client->updateRequestData(['translations' => [$language => ['name' => '']]]);


--- $this->client->updateRequestData(['translations' => [$language => ['name' => '']]]); +++ $this->client->updateRequestData(['translations' => [$localeCode => ['name' => '']]]);

diimpp · 2023-11-16T12:25:48Z

src/Sylius/Bundle/ApiBundle/spec/Serializer/TranslatableLocaleKeyDenormalizerSpec.php

+
+        $this
+            ->shouldThrow(TranslationLocaleMismatchException::class)
+            ->during('denormalize', [['translations' => ['de_DE' => ['locale' => 'locale']]], TranslatableInterface::class])


As idea for more readability. (I assume test is about two valid locales mismatch)

--- ->during('denormalize', [['translations' => ['de_DE' => ['locale' => 'locale']]], TranslatableInterface::class]) +++ ->during('denormalize', [['translations' => ['de_DE' => ['locale' => 'en_US']]], TranslatableInterface::class])

@Wojdylak cc

It looks better

This PR was merged into the 1.13 branch. Discussion ---------- | Q | A | |-----------------|--------------------------------------------------------------| | Branch? | 1.13 | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Related tickets | N/A | License | MIT #15535 Commits ------- [AttributeBundle] Add unique entity constraint to AttributeTranslation [PaymentBundle] Add unique entity constraint to PaymentMethodTranslation [ProductBundle] Add unique entity constraint to ProductAssociationTypeTranslation [ProductBundle] Add unique entity constraint to ProductOptionTranslation and ProductOptionValueTranslation [ProductBundle] Add unique entity constraint to ProductTranslation [ProductBundle] Add unique entity constraint to ProductVariantTranslation [PromotionBundle] Add unique entity constraint to CatalogPromotionTranslation [PromotionBundle] Add unique entity constraint to PromotionTranslation [ShippingBundle] Add unique entity constraint to ShippingMethodTranslation [TaxonBundle] Add unique entity constraint to TaxonTranslation [Behat] Rename language to localeCode for improved clarity [Api][Test] Improve spec test of throwing an exception if locale is not the same as key Change message of unique entity constraint of translations Rename unique constraint error message in translation

[ApiBundle] Unification of locale in translations

41fb82f

Wojdylak requested a review from a team as a code owner November 15, 2023 14:36

probot-autolabeler bot added the API APIs related issues and PRs. label Nov 15, 2023

NoResponseMate previously approved these changes Nov 15, 2023

View reviewed changes

Wojdylak added 2 commits November 15, 2023 16:13

[Behat] Remove locale from POST/PUT

bf7636d

[Test][Api/Admin] Remove locale from POST/PUT

b433e75

Wojdylak dismissed NoResponseMate’s stale review via b433e75 November 15, 2023 15:13

Wojdylak changed the title ~~[ApiBundle] Unification of locale in translations~~ 🚧 [ApiBundle] Unification of locale in translations Nov 15, 2023

[ApiBundle] Add TranslationLocaleMismatchException class

2c1649c

probot-autolabeler bot added the Maintenance CI configurations, READMEs, releases, etc. label Nov 16, 2023

Wojdylak changed the title ~~🚧 [ApiBundle] Unification of locale in translations~~ [ApiBundle] Unification of locale in translations Nov 16, 2023

Wojdylak mentioned this pull request Nov 16, 2023

[ApiBundle] Validate locale field on translation object #15508

Merged

GSadee approved these changes Nov 16, 2023

View reviewed changes

GSadee merged commit a3d76f0 into Sylius:1.13 Nov 16, 2023
25 checks passed

diimpp reviewed Nov 16, 2023

View reviewed changes

Wojdylak deleted the SYL-3222-unification-of-locale-return-via-api branch November 30, 2023 07:57

Wojdylak mentioned this pull request Nov 30, 2023

[API] Resolve update of translations #15581

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[ApiBundle] Unification of locale in translations #15535

[ApiBundle] Unification of locale in translations #15535

Wojdylak commented Nov 15, 2023

github-actions bot commented Nov 15, 2023 •

edited

GSadee commented Nov 16, 2023

diimpp Nov 16, 2023

diimpp Nov 16, 2023

diimpp Nov 16, 2023

diimpp Nov 16, 2023

diimpp Nov 16, 2023

diimpp Nov 16, 2023

diimpp Nov 16, 2023

Wojdylak Nov 30, 2023

		@@ -167,7 +166,7 @@ public function iWantToModifyTheProductAssociationType(ProductAssociationTypeInt
		*/
		public function iRenameItToIn(string $name, string $language): void

[ApiBundle] Unification of locale in translations #15535

[ApiBundle] Unification of locale in translations #15535

Conversation

Wojdylak commented Nov 15, 2023

github-actions bot commented Nov 15, 2023 • edited

Bunnyshell Preview Environment deleted

GSadee commented Nov 16, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Nov 15, 2023 •

edited