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

aitboudad · aitboudad · commit b0b07929fb83 · 2015-02-10T23:27:19.000Z
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,
+            'trans_options' => 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 %}>{{ trans_options is sameas(false) ? choice.label : choice.label|trans({}, translation_domain) }}</option>
         {%- endif -%}
     {% endfor %}
 {%- endblock choice_widget_options -%}
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,
+            'trans_options' => $options['trans_options'],
         ));
 
         // 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,
+            'trans_options' => 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'),
+            'trans_options' => 'bool',
         ));
     }
 
