Merge branch '1.14' into 2.0

* 1.14: Remove select scope translation Remove unneded placeholder from Zone's form scope
Sylius · May 8, 2024 · 0decbd7 · 0decbd7
2 parents 3af4f84 + 5e59f97
commit 0decbd7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/Sylius/Bundle/AddressingBundle/Form/Type/ZoneType.php b/src/Sylius/Bundle/AddressingBundle/Form/Type/ZoneType.php
@@ -52,7 +52,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                 ->add('scope', ChoiceType::class, [
                     'choices' => array_flip($this->scopeChoices),
                     'label' => 'sylius.form.zone.scope',
-                    'placeholder' => 'sylius.form.zone.select_scope',
+                    'placeholder' => null,
                     'required' => false,
                 ])
             ;

diff --git a/src/Sylius/Bundle/AddressingBundle/Resources/translations/messages.en.yml b/src/Sylius/Bundle/AddressingBundle/Resources/translations/messages.en.yml
@@ -34,6 +34,5 @@ sylius:
             scopes:
                 all: All
             select: Select
-            select_scope: Select scope
         zone_member:
             select: Select