浏览代码

[Form] made it possible to translate the empty value of Choice fields

Fabien Potencier 14 年之前
父节点
当前提交
2ce3cfad18

+ 1 - 1
src/Symfony/Bridge/Twig/Resources/views/Form/div_layout.html.twig

@@ -134,7 +134,7 @@
     {% else %}
     <select {{ block('attributes') }}{% if multiple %} multiple="multiple"{% endif %}>
         {% if not multiple and empty_value is not none %}
-            <option value="">{{ empty_value }}</option>
+            <option value="">{{ empty_value|trans }}</option>
         {% endif %}
         {% if preferred_choices|length > 0 %}
             {% set options = preferred_choices %}

+ 1 - 1
src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget.html.php

@@ -12,7 +12,7 @@
         <?php if ($read_only): ?> disabled="disabled"<?php endif ?>
         <?php if ($multiple): ?> multiple="multiple"<?php endif ?>
     >
-        <?php if (!$multiple && null !== $empty_value): ?><option value=""><?php echo $empty_value; ?></option><?php endif; ?>
+        <?php if (!$multiple && null !== $empty_value): ?><option value=""><?php echo $view->escape($view['translator']->trans($empty_value)) ?></option><?php endif; ?>
         <?php if (count($preferred_choices) > 0): ?>
             <?php foreach ($preferred_choices as $choice => $label): ?>
                 <?php if ($view['form']->isChoiceGroup($label)): ?>

+ 2 - 2
tests/Symfony/Tests/Component/Form/AbstractLayoutTest.php

@@ -371,7 +371,7 @@ abstract class AbstractLayoutTest extends \PHPUnit_Framework_TestCase
 '/select
     [@name="na&me"]
     [
-        ./option[@value=""][.=""]
+        ./option[@value=""][.="[trans][/trans]"]
         /following-sibling::option[@value="&a"][@selected="selected"][.="Choice&A"]
         /following-sibling::option[@value="&b"][not(@selected)][.="Choice&B"]
     ]
@@ -394,7 +394,7 @@ abstract class AbstractLayoutTest extends \PHPUnit_Framework_TestCase
 '/select
     [@name="na&me"]
     [
-        ./option[@value=""][.=""]
+        ./option[@value=""][.="[trans][/trans]"]
         /following-sibling::option[@value="&a"][@selected="selected"][.="Choice&A"]
         /following-sibling::option[@value="&b"][not(@selected)][.="Choice&B"]
     ]