feature #16031 [Translation][Form] Do not translate form labels and placeholders when 'translation_domain' is false (Restless-ET)

fabpot · fabpot · commit 42fe88387d8b · 2015-11-25T05:07:02.000+01:00
This PR was squashed before being merged into the 2.8 branch (closes #16031). Discussion ---------- [Translation][Form] Do not translate form labels and placeholders when 'translation_domain' is false | Q | A | ------------- | --- | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Seems like this behaviour was already partially added (as stated [here](symfony/symfony#16016 (comment))) to solve the problem of expanded choice widgets. Commits ------- 0e0b904 [Translation][Form] Do not translate form labels and placeholders when 'translation_domain' is false
diff --git a/Resources/views/Form/button_attributes.html.php b/Resources/views/Form/button_attributes.html.php
@@ -1,7 +1,7 @@
 id="<?php echo $view->escape($id) ?>" name="<?php echo $view->escape($full_name) ?>" <?php if ($disabled): ?>disabled="disabled" <?php endif ?>
 <?php foreach ($attr as $k => $v): ?>
 <?php if (in_array($v, array('placeholder', 'title'), true)): ?>
-<?php printf('%s="%s" ', $view->escape($k), $view->escape($view['translator']->trans($v, array(), $translation_domain))) ?>
+<?php printf('%s="%s" ', $view->escape($k), $view->escape(false !== $translation_domain ? $view['translator']->trans($v, array(), $translation_domain) : $v)) ?>
 <?php elseif ($v === true): ?>
 <?php printf('%s="%s" ', $view->escape($k), $view->escape($k)) ?>
 <?php elseif ($v !== false): ?>
diff --git a/Resources/views/Form/button_widget.html.php b/Resources/views/Form/button_widget.html.php
@@ -1,4 +1,4 @@
 <?php if (!$label) { $label = isset($label_format)
     ? strtr($label_format, array('%name%' => $name, '%id%' => $id))
     : $view['form']->humanize($name); } ?>
-<button type="<?php echo isset($type) ? $view->escape($type) : 'button' ?>" <?php echo $view['form']->block($form, 'button_attributes') ?>><?php echo $view->escape($view['translator']->trans($label, array(), $translation_domain)) ?></button>
+<button type="<?php echo isset($type) ? $view->escape($type) : 'button' ?>" <?php echo $view['form']->block($form, 'button_attributes') ?>><?php echo $view->escape(false !== $translation_domain ? $view['translator']->trans($label, array(), $translation_domain) : $label) ?></button>
diff --git a/Resources/views/Form/choice_widget_collapsed.html.php b/Resources/views/Form/choice_widget_collapsed.html.php
@@ -7,7 +7,7 @@
     )) ?>
     <?php if ($multiple): ?> multiple="multiple"<?php endif ?>
 >
-    <?php if (null !== $placeholder): ?><option value=""<?php if ($required and empty($value) && '0' !== $value): ?> selected="selected"<?php endif?>><?php echo '' != $placeholder ? $view->escape($view['translator']->trans($placeholder, array(), $translation_domain)) : '' ?></option><?php endif; ?>
+    <?php if (null !== $placeholder): ?><option value=""<?php if ($required and empty($value) && '0' !== $value): ?> selected="selected"<?php endif?>><?php echo '' != $placeholder ? $view->escape(false !== $translation_domain ? $view['translator']->trans($placeholder, array(), $translation_domain) : $placeholder) : '' ?></option><?php endif; ?>
     <?php if (count($preferred_choices) > 0): ?>
         <?php echo $view['form']->block($form, 'choice_widget_options', array('choices' => $preferred_choices)) ?>
         <?php if (count($choices) > 0 && null !== $separator): ?>
diff --git a/Resources/views/Form/widget_attributes.html.php b/Resources/views/Form/widget_attributes.html.php
@@ -2,7 +2,7 @@
 <?php if ($required): ?> required="required"<?php endif ?>
 <?php foreach ($attr as $k => $v): ?>
 <?php if (in_array($k, array('placeholder', 'title'), true)): ?>
-<?php printf(' %s="%s"', $view->escape($k), $view->escape($view['translator']->trans($v, array(), $translation_domain))) ?>
+<?php printf(' %s="%s"', $view->escape($k), $view->escape(false !== $translation_domain ? $view['translator']->trans($v, array(), $translation_domain) : $v)) ?>
 <?php elseif ($v === true): ?>
 <?php printf(' %s="%s"', $view->escape($k), $view->escape($k)) ?>
 <?php elseif ($v !== false): ?>
diff --git a/Resources/views/Form/widget_container_attributes.html.php b/Resources/views/Form/widget_container_attributes.html.php
@@ -1,7 +1,7 @@
 <?php if (!empty($id)): ?>id="<?php echo $view->escape($id) ?>" <?php endif ?>
 <?php foreach ($attr as $k => $v): ?>
 <?php if (in_array($v, array('placeholder', 'title'), true)): ?>
-<?php printf('%s="%s" ', $view->escape($k), $view->escape($view['translator']->trans($v, array(), $translation_domain))) ?>
+<?php printf('%s="%s" ', $view->escape($k), $view->escape(false !== $translation_domain ? $view['translator']->trans($v, array(), $translation_domain) : $v)) ?>
 <?php elseif ($v === true): ?>
 <?php printf('%s="%s" ', $view->escape($k), $view->escape($k)) ?>
 <?php elseif ($v !== false): ?>

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`)) ?>`
`8`	`8`	`<?php if ($multiple): ?> multiple="multiple"<?php endif ?>`
`9`	`9`	`>`
`10`		`- <?php if (null !== $placeholder): ?><option value=""<?php if ($required and empty($value) && '0' !== $value): ?> selected="selected"<?php endif?>><?php echo '' != $placeholder ? $view->escape($view['translator']->trans($placeholder, array(), $translation_domain)) : '' ?></option><?php endif; ?>`
	`10`	`+ <?php if (null !== $placeholder): ?><option value=""<?php if ($required and empty($value) && '0' !== $value): ?> selected="selected"<?php endif?>><?php echo '' != $placeholder ? $view->escape(false !== $translation_domain ? $view['translator']->trans($placeholder, array(), $translation_domain) : $placeholder) : '' ?></option><?php endif; ?>`
`11`	`11`	`<?php if (count($preferred_choices) > 0): ?>`
`12`	`12`	`<?php echo $view['form']->block($form, 'choice_widget_options', array('choices' => $preferred_choices)) ?>`
`13`	`13`	`<?php if (count($choices) > 0 && null !== $separator): ?>`