Skip to content

Commit 81260f5

Browse files
Merge branch '3.4' into 4.0
* 3.4: [HttpKernel] DebugHandlersListener should always replace the existing exception handler fix the Composer API being used [Security] Notify that symfony/expression-language is not installed if ExpressionLanguage and ExpressionLanguagePrivider are used [Debug] Always decorate existing exception handlers to deal with fatal errors Enableable ArrayNodeDefinition is disabled for empty configuration Fixing a bug where the dump() function depended on bundle ordering [Cache] Fix handling of apcu_fetch() edgy behavior Add nn (Norwegian Nynorsk) translation files, and improve existing file Problem in phar see mergerequest #25579 [Form] Disallow transform dates beyond the year 9999 Avoid button label translation when it's set to false Copied NO language files to the new NB locale. [Serializer] DateTimeNormalizer handling of null and empty values (returning null or empty instead of new object) Fix options resolver with array allowed types [Console] Improve phpdoc on StyleInterface::ask() [TwigBridge][WIP] Pass the form-check-inline in parent
2 parents 7b96743 + a69e3f2 commit 81260f5

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

Resources/views/Form/bootstrap_4_layout.html.twig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,10 @@
7474
{%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-check-input')|trim}) -%}
7575
{% if 'checkbox-inline' in parent_label_class %}
7676
{{- form_label(form, null, { widget: parent() }) -}}
77+
{% elseif 'form-check-inline' in parent_label_class %}
78+
<div class="form-check{{ not valid ? ' form-control is-invalid' }} form-check-inline">
79+
{{- form_label(form, null, { widget: parent() }) -}}
80+
</div>
7781
{% else -%}
7882
<div class="form-check{{ not valid ? ' form-control is-invalid' }}">
7983
{{- form_label(form, null, { widget: parent() }) -}}

Resources/views/Form/form_div_layout.html.twig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,12 +216,14 @@
216216
{%- endblock range_widget %}
217217

218218
{%- block button_widget -%}
219-
{%- if label is not same as(false) and label is empty -%}
219+
{%- if label is empty -%}
220220
{%- if label_format is not empty -%}
221221
{% set label = label_format|replace({
222222
'%name%': name,
223223
'%id%': id,
224224
}) %}
225+
{%- elseif label is same as(false) -%}
226+
{% set translation_domain = false %}
225227
{%- else -%}
226228
{% set label = name|humanize %}
227229
{%- endif -%}

0 commit comments

Comments
 (0)