From 64a3209a2db73e1616d5926fa59241c1f0f0f81c Mon Sep 17 00:00:00 2001
From: Stephen Lewis <mail@stephen-lewis.me.uk>
Date: Mon, 18 Nov 2019 12:33:11 +0000
Subject: [PATCH 1/2] A form button widget will now have its title attribute
 translated even if its label is null or false

---
 src/Symfony/Bridge/Twig/CHANGELOG.md                      | 5 +++++
 .../Twig/Resources/views/Form/form_div_layout.html.twig   | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Bridge/Twig/CHANGELOG.md b/src/Symfony/Bridge/Twig/CHANGELOG.md
index c70801a89014c..a4cd781737b89 100644
--- a/src/Symfony/Bridge/Twig/CHANGELOG.md
+++ b/src/Symfony/Bridge/Twig/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+5.1.0
+-----
+*  a form button widget will now have its `title` attribute translated
+   even if its `label` option is `null` or `false`
+
 5.0.0
 -----
 
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 ff8faad141cff..e169638a9d926 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
@@ -226,13 +226,13 @@
                 '%name%': name,
                 '%id%': id,
             }) %}
-        {%- elseif label is same as(false) -%}
-            {% set translation_domain = false %}
-        {%- else -%}
+        {%- elseif label is not same as(false) -%}
             {% set label = name|humanize %}
         {%- endif -%}
     {%- endif -%}
-    <button type="{{ type|default('button') }}" {{ block('button_attributes') }}>{{ translation_domain is same as(false) ? label : label|trans(label_translation_parameters, translation_domain) }}</button>
+    <button type="{{ type|default('button') }}" {{ block('button_attributes') }}>{{ translation_domain is same as
+            (false) or label is same as(false) ? label : label|trans(label_translation_parameters, translation_domain)
+        }}</button>
 {%- endblock button_widget -%}
 
 {%- block submit_widget -%}

From 88c6cf5b5ac2c0bb0160e8c51ea5c59b3539e9cb Mon Sep 17 00:00:00 2001
From: Stephen Lewis <mail@stephen-lewis.me.uk>
Date: Tue, 17 Dec 2019 19:14:29 +0000
Subject: [PATCH 2/2] [TwigBridge] Removed unnecessary line break

---
 .../Twig/Resources/views/Form/form_div_layout.html.twig       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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 e169638a9d926..f80232f8f42db 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
@@ -230,9 +230,7 @@
             {% set label = name|humanize %}
         {%- endif -%}
     {%- endif -%}
-    <button type="{{ type|default('button') }}" {{ block('button_attributes') }}>{{ translation_domain is same as
-            (false) or label is same as(false) ? label : label|trans(label_translation_parameters, translation_domain)
-        }}</button>
+    <button type="{{ type|default('button') }}" {{ block('button_attributes') }}>{{ translation_domain is same as(false) or label is same as(false) ? label : label|trans(label_translation_parameters, translation_domain) }}</button>
 {%- endblock button_widget -%}
 
 {%- block submit_widget -%}