diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig index afd1011771..6fc8153d62 100644 --- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig +++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig @@ -155,6 +155,6 @@ {% block form_help -%} {% if help is not empty %} - {{ translation_domain is same as(false) ? help : help|trans({}, translation_domain) }} + {{ translation_domain is same as(false) ? help : help|trans({}, translation_domain) }} {% endif %} {%- endblock form_help %} diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig index 87876a73b4..3a80659bca 100644 --- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig +++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig @@ -282,6 +282,6 @@ {% block form_help -%} {% if help is not empty %} - {{ translation_domain is same as(false) ? help : help|trans({}, translation_domain) }} + {{ translation_domain is same as(false) ? help : help|trans({}, translation_domain) }} {% endif %} {%- endblock form_help %} 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 index 60cf52d8be..09bd5eb7ab 100644 --- 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 @@ -291,7 +291,7 @@ {% block form_help -%} {% if help is not empty %} -

{{ translation_domain is same as(false) ? help : help|trans({}, translation_domain) }}

+

{{ translation_domain is same as(false) ? help : help|trans({}, translation_domain) }}

{% endif %} {%- endblock form_help %} diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_help.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_help.html.php index 654bf8c92f..947ef7eea7 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_help.html.php +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_help.html.php @@ -1,3 +1,3 @@ -

escape(false !== $translation_domain ? $view['translator']->trans($help, array(), $translation_domain) : $help) ?>

+

escape(false !== $translation_domain ? $view['translator']->trans($help, array(), $translation_domain) : $help) ?>

diff --git a/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php index 439d39b01e..6fa45e69e1 100644 --- a/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php +++ b/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php @@ -112,6 +112,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest $this->assertMatchesXpath($html, '/span + [@id="name_help"] [@class="help-block"] [.="[trans]Help text test![/trans]"] ' diff --git a/src/Symfony/Component/Form/Tests/AbstractBootstrap4LayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractBootstrap4LayoutTest.php index 63aef7d923..cf729176d5 100644 --- a/src/Symfony/Component/Form/Tests/AbstractBootstrap4LayoutTest.php +++ b/src/Symfony/Component/Form/Tests/AbstractBootstrap4LayoutTest.php @@ -161,6 +161,7 @@ abstract class AbstractBootstrap4LayoutTest extends AbstractBootstrap3LayoutTest $this->assertMatchesXpath($html, '/small + [@id="name_help"] [@class="form-text text-muted"] [.="[trans]Help text test![/trans]"] ' diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php index a87fb833ca..f71b90cba2 100644 --- a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php +++ b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php @@ -420,6 +420,7 @@ abstract class AbstractLayoutTest extends FormIntegrationTestCase $this->assertMatchesXpath($html, '/p + [@id="name_help"] [@class="help-text"] [.="[trans]Help text test![/trans]"] '