diff --git a/UPGRADE-7.4.md b/UPGRADE-7.4.md
index e496e069e72b..0ce57379aede 100644
--- a/UPGRADE-7.4.md
+++ b/UPGRADE-7.4.md
@@ -50,6 +50,11 @@ Security
* Deprecate `AbstractListener::__invoke`
* Deprecate `LazyFirewallContext::__invoke()`
+Translation
+-----------
+
+ * Deprecate `TranslatableMessage::__toString`
+
Validator
---------
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig
index 49cd804398b5..fc7289c8c393 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig
@@ -24,7 +24,7 @@ col-sm-2
{% block form_row -%}
{%- set widget_attr = {} -%}
- {%- if help is not empty -%}
+ {%- if help -%}
{%- set widget_attr = {attr: {'aria-describedby': id ~"_help"}} -%}
{%- endif -%}
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 f4e313b4756c..bfb9d89aaeec 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
@@ -94,7 +94,7 @@
{% set embed_label_classes = parent_label_class|split(' ')|filter(class => class in ['checkbox-inline', 'radio-inline']) %}
{%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' ' ~ embed_label_classes|join(' '))|trim}) -%}
{% endif %}
- {%- if label is not same as(false) and label is empty -%}
+ {%- if label is not same as(false) and not label -%}
{%- if label_format is not empty -%}
{%- set label = label_format|replace({
'%name%': name,
@@ -129,7 +129,7 @@
{% block form_row -%}
{%- set widget_attr = {} -%}
- {%- if help is not empty -%}
+ {%- if help -%}
{%- set widget_attr = {attr: {'aria-describedby': id ~"_help"}} -%}
{%- endif -%}
@@ -199,7 +199,7 @@
{# Help #}
{% block form_help -%}
- {%- if help is not empty -%}
+ {%- if help -%}
{%- set help_attr = help_attr|merge({class: (help_attr.class|default('') ~ ' help-block')|trim}) -%}
{%- if translation_domain is same as(false) -%}
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig
index 990b324cb0d1..516d79938d6a 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig
@@ -25,7 +25,7 @@ col-sm-2
{{ block('fieldset_form_row') }}
{%- else -%}
{%- set widget_attr = {} -%}
- {%- if help is not empty -%}
+ {%- if help -%}
{%- set widget_attr = {attr: {'aria-describedby': id ~"_help"}} -%}
{%- endif -%}
@@ -40,7 +40,7 @@ col-sm-2
{% block fieldset_form_row -%}
{%- set widget_attr = {} -%}
- {%- if help is not empty -%}
+ {%- if help -%}
{%- set widget_attr = {attr: {'aria-describedby': id ~"_help"}} -%}
{%- endif -%}