Skip to content

Commit 841c46c

Browse files
Merge branch '3.4' into 4.4
* 3.4: Remove branch-version (keep them for contracts only) [Serializer] fix decoding float XML attributes starting with 0 add missing dutch translations [Validator] Add missing romanian translations do not translate null placeholders or titles
2 parents e5b975b + 090d19d commit 841c46c

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

Resources/views/Form/form_div_layout.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@
444444
{%- for attrname, attrvalue in attr -%}
445445
{{- " " -}}
446446
{%- if attrname in ['placeholder', 'title'] -%}
447-
{{- attrname }}="{{ translation_domain is same as(false) ? attrvalue : attrvalue|trans(attr_translation_parameters, translation_domain) }}"
447+
{{- attrname }}="{{ translation_domain is same as(false) or attrvalue is null ? attrvalue : attrvalue|trans(attr_translation_parameters, translation_domain) }}"
448448
{%- elseif attrvalue is same as(true) -%}
449449
{{- attrname }}="{{ attrname }}"
450450
{%- elseif attrvalue is not same as(false) -%}

composer.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,5 @@
7878
"/Tests/"
7979
]
8080
},
81-
"minimum-stability": "dev",
82-
"extra": {
83-
"branch-version": "4.4"
84-
}
81+
"minimum-stability": "dev"
8582
}

0 commit comments

Comments
 (0)