[Form][choice] avoid trans options for entity type.

aitboudad · aitboudad · commit 3eff0337d7be · 2015-02-11T10:52:45.000Z
diff --git a/UPGRADE-2.7.md b/UPGRADE-2.7.md
@@ -15,22 +15,22 @@ Router
    `foo%bar%2` which would be compiled to `$foo % $bar % 2` in 2.6
    but in 2.7 you would get an error if `bar` parameter
    doesn't exist or unexpected result otherwise.
- 
+
 Form
 ----
 
  * In form types and extension overriding the "setDefaultOptions" of the
    AbstractType or AbstractExtensionType has been deprecated in favor of
    overriding the new "configureOptions" method.
 
-   The method "setDefaultOptions(OptionsResolverInterface $resolver)" will 
+   The method "setDefaultOptions(OptionsResolverInterface $resolver)" will
    be renamed in Symfony 3.0 to "configureOptions(OptionsResolver $resolver)".
 
    Before:
 
    ```php
         use Symfony\Component\OptionsResolver\OptionsResolverInterface;
-        
+
         class TaskType extends AbstractType
         {
             // ...
@@ -47,7 +47,7 @@ Form
 
    ```php
         use Symfony\Component\OptionsResolver\OptionsResolver;
-        
+
         class TaskType extends AbstractType
         {
             // ...
@@ -60,6 +60,27 @@ Form
         }
    ```
 
+ * The ability to translate Doctrine type entries by the translator component
+   is now disabled by default and to enable it you must explicitly set the option
+   "translate_choices" to "true".
+
+   Before:
+
+   ```
+   $form->add('products', 'entity', array(
+       'class' => 'AppBundle/Entity/Product',
+   ));
+   ```
+
+   After:
+
+   ```
+   $form->add('products', 'entity', array(
+       'class' => 'AppBundle/Entity/Product',
+       'translate_choices' => true,
+   ));
+   ```
+
 Serializer
 ----------
 
diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
@@ -171,6 +171,7 @@ public function configureOptions(OptionsResolver $resolver)
             'choices' => null,
             'choice_list' => $choiceList,
             'group_by' => null,
+            'translate_choices' => false,
         ));
 
         $resolver->setRequired(array('class'));
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
@@ -79,7 +79,7 @@
                 {{- block('choice_widget_options') -}}
             </optgroup>
         {%- else -%}
-            <option value="{{ choice.value }}"{% if choice is selectedchoice(value) %} selected="selected"{% endif %}>{{ choice.label|trans({}, translation_domain) }}</option>
+            <option value="{{ choice.value }}"{% if choice is selectedchoice(value) %} selected="selected"{% endif %}>{{ translate_choices is sameas(false) ? choice.label : choice.label|trans({}, translation_domain) }}</option>
         {%- endif -%}
     {% endfor %}
 {%- endblock choice_widget_options -%}
diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 2.7.0
 -----
 
+ * added options "translate_choices" to ChoiceType.
  * deprecated the overwriting of AbstractType::setDefaultOptions() in favor of overwriting AbstractType::configureOptions().
  * deprecated the overwriting of AbstractTypeExtension::setDefaultOptions() in favor of overwriting AbstractTypeExtension::configureOptions().
 
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -102,6 +102,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
             'choices' => $options['choice_list']->getRemainingViews(),
             'separator' => '-------------------',
             'placeholder' => null,
+            'translate_choices' => $options['translate_choices'],
         ));
 
         // The decision, whether a choice is selected, is potentially done
@@ -231,6 +232,7 @@ public function configureOptions(OptionsResolver $resolver)
             // is manually set to an object.
             // See https://github.com/symfony/symfony/pull/5582
             'data_class' => null,
+            'translate_choices' => true,
         ));
 
         $resolver->setNormalizers(array(
@@ -240,6 +242,7 @@ public function configureOptions(OptionsResolver $resolver)
 
         $resolver->setAllowedTypes(array(
             'choice_list' => array('null', 'Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceListInterface'),
+            'translate_choices' => 'bool',
         ));
     }
 
