Skip to content

Commit b8c428d

Browse files
committed
Fix w3c/w3c-website#730: Punctuation missing between error messages
1 parent 83cc28e commit b8c428d

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

templates/form/theme.html.twig

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@
1414
{%- set widget_attr = {attr: {'aria-describedby': "hint-" ~ id}} -%}
1515
{%- endif -%}
1616
{%- if form.vars.errors|length > 0 -%}
17+
{% set aria_errors = '' %}
18+
{% for e in form.vars.errors %}
19+
{% set aria_errors = aria_errors ~ ' error-' ~ form.vars.id ~ '_' ~ loop.index %}
20+
{% endfor %}
1721
{% set widget_attr = {
1822
attr: {
19-
'aria-describedby': (widget_attr.attr['aria-describedby']|default('') ~ ' error-' ~ form.vars.id)|trim
23+
'aria-describedby': (widget_attr.attr['aria-describedby']|default('') ~ aria_errors)|trim
2024
}
2125
} %}
2226
{% set row_attr = row_attr|merge({class: (row_attr.class|default('') ~ ' field--error')|trim}) %}
@@ -87,11 +91,11 @@
8791

8892
{%- block form_errors -%}
8993
{%- if errors|length > 0 -%}
90-
<span class="field-error-msg" id="error-{{ form.vars.id }}">
9194
{%- for error in errors -%}
92-
<span class="visuallyhidden">{{ 'Error'|trans({}, 'validators') }}</span> {{ error.message|raw }}
95+
<span class="field-error-msg" id="error-{{ form.vars.id }}_{{ loop.index }}">
96+
<span class="visuallyhidden">{{ 'Error'|trans({}, 'validators') }}</span> {{ error.message|raw }}
97+
</span>
9398
{%- endfor -%}
94-
</span>
9599
{%- endif -%}
96100
{%- endblock form_errors -%}
97101

0 commit comments

Comments
 (0)