Merge branch 'lakiboy-master'

Author: matthiasnoback

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v2.5.0
+
+- Support for 'translation_domain' option for labels (#27).
+
 ## v2.2.1
 
 - Forms now accept pre-filled data (#21).

features/interactive.feature

@@ -147,6 +147,21 @@ Feature: It is possible to interactively fill in a form from the CLI
         )
       """
 
+  Scenario: Translatable label
+    When I run the command "form:translatable_label" and I provide as input
+      """
+        empty[enter]empty[enter]
+      """
+    Then the command has finished successfully
+    And the output should be
+      """
+        Child first field: Parent second field: Array
+        (
+            [fieldOne] => empty
+            [fieldTwo] => empty
+        )
+      """
+
   Scenario: Provide no value with no default value, value should be asked again
     When I run the command "form:name_without_default_value" and I provide as input "[enter]Jelmer[enter]"
     And the output should contain

src/Bridge/Transformer/AbstractTransformer.php

@@ -32,7 +32,7 @@ public function __construct(TranslatorInterface $translator)
      */
     protected function questionFrom(FormInterface $form)
     {
-        $question = $this->translator->trans(FormUtil::label($form));
+        $question = $this->translator->trans(FormUtil::label($form), [], $this->translationDomainFrom($form));
 
         return $this->formattedQuestion($question, $this->defaultValueFrom($form));
     }
@@ -52,6 +52,20 @@ protected function defaultValueFrom(FormInterface $form)
         return $defaultValue;
     }
 
+    /**
+     * @param FormInterface $form
+     *
+     * @return string|null
+     */
+    protected function translationDomainFrom(FormInterface $form)
+    {
+        while ((null === $domain = $form->getConfig()->getOption('translation_domain')) && $form->getParent()) {
+            $form = $form->getParent();
+        }
+
+        return $domain;
+    }
+
     /**
      * @param string $question
      * @param string $defaultValue

test/Form/TranslatableLabelType.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Matthias\SymfonyConsoleForm\Tests\Form;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class TranslatableLabelType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add(
+                'fieldOne',
+                TextType::class,
+                [
+                    'label' => 'field_one',
+                    'translation_domain' => 'child_domain',
+                ]
+            )
+            ->add(
+                'fieldTwo',
+                TextType::class,
+                [
+                    'label' => 'field_two',
+                ]
+            )
+        ;
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefault('translation_domain', 'parent_domain');
+    }
+}

test/config.yml

@@ -74,10 +74,21 @@ services:
         tags:
             - { name: console.command }
 
+    translatable_label_command:
+        class: Matthias\SymfonyConsoleForm\Tests\Command\PrintFormDataCommand
+        arguments:
+            - Matthias\SymfonyConsoleForm\Tests\Form\TranslatableLabelType
+            - translatable_label
+        tags:
+            - { name: console.command }
+
 framework:
     form:
         csrf_protection: true
     secret: "%secret%"
     csrf_protection: ~
     session:
         handler_id: ~
+    translator:
+        paths:
+            - "%kernel.root_dir%/translations"

test/translations/child_domain.en.yml

@@ -0,0 +1,2 @@
+field_one: Child first field
+field_two: Child second field

test/translations/parent_domain.en.yml

@@ -0,0 +1,2 @@
+field_one: Parent first field
+field_two: Parent second field