Skip to content

Commit 39dabcd

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.4' into 4.0
* 3.4: [Form][WCAG] Errors sign for people that do not see colors [Form][WCAG] Added role=\"presentation\" on tables & removed bootstrap4 table
2 parents 96aac17 + c572e6c commit 39dabcd

28 files changed

+146
-33
lines changed

‎src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig‎

Lines changed: 42 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -58,32 +58,48 @@
5858
{%- else -%}
5959
{%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-inline')|trim}) -%}
6060
<div {{ block('widget_container_attributes') }}>
61-
<div class="table-responsive">
62-
<table class="table {{ table_class|default('table-bordered table-condensed table-striped') }}">
63-
<thead>
64-
<tr>
65-
{%- if with_years %}<th>{{ form_label(form.years) }}</th>{% endif -%}
66-
{%- if with_months %}<th>{{ form_label(form.months) }}</th>{% endif -%}
67-
{%- if with_weeks %}<th>{{ form_label(form.weeks) }}</th>{% endif -%}
68-
{%- if with_days %}<th>{{ form_label(form.days) }}</th>{% endif -%}
69-
{%- if with_hours %}<th>{{ form_label(form.hours) }}</th>{% endif -%}
70-
{%- if with_minutes %}<th>{{ form_label(form.minutes) }}</th>{% endif -%}
71-
{%- if with_seconds %}<th>{{ form_label(form.seconds) }}</th>{% endif -%}
72-
</tr>
73-
</thead>
74-
<tbody>
75-
<tr>
76-
{%- if with_years %}<td>{{ form_widget(form.years) }}</td>{% endif -%}
77-
{%- if with_months %}<td>{{ form_widget(form.months) }}</td>{% endif -%}
78-
{%- if with_weeks %}<td>{{ form_widget(form.weeks) }}</td>{% endif -%}
79-
{%- if with_days %}<td>{{ form_widget(form.days) }}</td>{% endif -%}
80-
{%- if with_hours %}<td>{{ form_widget(form.hours) }}</td>{% endif -%}
81-
{%- if with_minutes %}<td>{{ form_widget(form.minutes) }}</td>{% endif -%}
82-
{%- if with_seconds %}<td>{{ form_widget(form.seconds) }}</td>{% endif -%}
83-
</tr>
84-
</tbody>
85-
</table>
61+
{%- if with_years -%}
62+
<div class="col-auto">
63+
{{ form_label(form.years) }}
64+
{{ form_widget(form.years) }}
8665
</div>
66+
{%- endif -%}
67+
{%- if with_months -%}
68+
<div class="col-auto">
69+
{{ form_label(form.months) }}
70+
{{ form_widget(form.months) }}
71+
</div>
72+
{%- endif -%}
73+
{%- if with_weeks -%}
74+
<div class="col-auto">
75+
{{ form_label(form.weeks) }}
76+
{{ form_widget(form.weeks) }}
77+
</div>
78+
{%- endif -%}
79+
{%- if with_days -%}
80+
<div class="col-auto">
81+
{{ form_label(form.days) }}
82+
{{ form_widget(form.days) }}
83+
</div>
84+
{%- endif -%}
85+
{%- if with_hours -%}
86+
<div class="col-auto">
87+
{{ form_label(form.hours) }}
88+
{{ form_widget(form.hours) }}
89+
</div>
90+
{%- endif -%}
91+
{%- if with_minutes -%}
92+
<div class="col-auto">
93+
{{ form_label(form.minutes) }}
94+
{{ form_widget(form.minutes) }}
95+
</div>
96+
{%- endif -%}
97+
{%- if with_seconds -%}
98+
<div class="col-auto">
99+
{{ form_label(form.seconds) }}
100+
{{ form_widget(form.seconds) }}
101+
</div>
102+
{%- endif -%}
87103
{%- if with_invert %}{{ form_widget(form.invert) }}{% endif -%}
88104
</div>
89105
{%- endif -%}
@@ -248,7 +264,7 @@
248264
<div class="{% if form is not rootform %}invalid-feedback d-block{% else %}alert alert-danger{% endif %}">
249265
<ul class="list-unstyled mb-0">
250266
{%- for error in errors -%}
251-
<li>{{ error.message }}</li>
267+
<li><span class="initialism form-error-icon badge badge-danger">{{ 'Error'|trans({}, 'validators') }}</span> <span class="form-error-message">{{ error.message }}</span></li>
252268
{%- endfor -%}
253269
</ul>
254270
</div>

‎src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_base_layout.html.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
<div {{ block('widget_container_attributes') }}>
108108
{{- form_errors(form) -}}
109109
<div class="table-responsive">
110-
<table class="table {{ table_class|default('table-bordered table-condensed table-striped') }}">
110+
<table class="table {{ table_class|default('table-bordered table-condensed table-striped') }}" role="presentation">
111111
<thead>
112112
<tr>
113113
{%- if with_years %}<th>{{ form_label(form.years) }}</th>{% endif -%}

‎src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
{%- else -%}
137137
<div {{ block('widget_container_attributes') }}>
138138
{{- form_errors(form) -}}
139-
<table class="{{ table_class|default('') }}">
139+
<table class="{{ table_class|default('') }}" role="presentation">
140140
<thead>
141141
<tr>
142142
{%- if with_years %}<th>{{ form_label(form.years) }}</th>{% endif -%}

‎src/Symfony/Component/Form/Tests/AbstractBootstrap4HorizontalLayoutTest.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ public function testRow()
3434
[
3535
./div[
3636
./ul
37-
[./li[.="[trans]Error![/trans]"]]
37+
[./li
38+
[./span[.="[trans]Error[/trans]"]]
39+
[./span[.="[trans]Error![/trans]"]]
40+
]
3841
[count(./li)=1]
3942
]
4043
]

‎src/Symfony/Component/Form/Tests/AbstractBootstrap4LayoutTest.php‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ public function testRow()
3434
[
3535
./div[
3636
./ul
37-
[./li[.="[trans]Error![/trans]"]]
37+
[./li
38+
[./span[.="[trans]Error[/trans]"]]
39+
[./span[.="[trans]Error![/trans]"]]
40+
]
3841
[count(./li)=1]
3942
]
4043
]
@@ -166,9 +169,12 @@ public function testErrors()
166169
[@class="list-unstyled mb-0"]
167170
[
168171
./li
169-
[.="[trans]Error 1[/trans]"]
172+
[./span[.="[trans]Error[/trans]"]]
173+
[./span[.="[trans]Error 1[/trans]"]]
174+
170175
/following-sibling::li
171-
[.="[trans]Error 2[/trans]"]
176+
[./span[.="[trans]Error[/trans]"]]
177+
[./span[.="[trans]Error 2[/trans]"]]
172178
]
173179
[count(./li)=2]
174180
]

‎src/Symfony/Component/Form/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"symfony/doctrine-bridge": "<3.4",
4242
"symfony/framework-bundle": "<3.4",
4343
"symfony/http-kernel": "<3.4",
44-
"symfony/twig-bridge": "<3.4"
44+
"symfony/twig-bridge": "<3.4.5|<4.0.5,>=4.0"
4545
},
4646
"suggest": {
4747
"symfony/validator": "For form validation.",

‎src/Symfony/Component/Validator/Resources/translations/validators.bg.xlf‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,10 @@
314314
<source>This is not a valid Business Identifier Code (BIC).</source>
315315
<target>Невалиден бизнес идентификационен код (BIC).</target>
316316
</trans-unit>
317+
<trans-unit id="82">
318+
<source>Error</source>
319+
<target>Грешка</target>
320+
</trans-unit>
317321
</body>
318322
</file>
319323
</xliff>

‎src/Symfony/Component/Validator/Resources/translations/validators.cs.xlf‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,10 @@
314314
<source>This is not a valid Business Identifier Code (BIC).</source>
315315
<target>Tato hodnota není platný identifikační kód podniku (BIC).</target>
316316
</trans-unit>
317+
<trans-unit id="82">
318+
<source>Error</source>
319+
<target>Chyba</target>
320+
</trans-unit>
317321
</body>
318322
</file>
319323
</xliff>

‎src/Symfony/Component/Validator/Resources/translations/validators.da.xlf‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,10 @@
242242
<source>This value is not a valid ISSN.</source>
243243
<target>Værdien er ikke en gyldig ISSN.</target>
244244
</trans-unit>
245+
<trans-unit id="82">
246+
<source>Error</source>
247+
<target>Fejl</target>
248+
</trans-unit>
245249
</body>
246250
</file>
247251
</xliff>

‎src/Symfony/Component/Validator/Resources/translations/validators.de.xlf‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,10 @@
314314
<source>This is not a valid Business Identifier Code (BIC).</source>
315315
<target>Dieser Wert ist kein gültiger BIC.</target>
316316
</trans-unit>
317+
<trans-unit id="82">
318+
<source>Error</source>
319+
<target>Fehler</target>
320+
</trans-unit>
317321
</body>
318322
</file>
319323
</xliff>

0 commit comments

Comments
 (0)