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
This commit is contained in:
Nicolas Grekas 2018-03-01 11:21:51 +01:00
commit 39dabcd5ba
28 changed files with 146 additions and 33 deletions

View File

@ -58,32 +58,48 @@
{%- else -%}
{%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-inline')|trim}) -%}
<div {{ block('widget_container_attributes') }}>
<div class="table-responsive">
<table class="table {{ table_class|default('table-bordered table-condensed table-striped') }}">
<thead>
<tr>
{%- if with_years %}<th>{{ form_label(form.years) }}</th>{% endif -%}
{%- if with_months %}<th>{{ form_label(form.months) }}</th>{% endif -%}
{%- if with_weeks %}<th>{{ form_label(form.weeks) }}</th>{% endif -%}
{%- if with_days %}<th>{{ form_label(form.days) }}</th>{% endif -%}
{%- if with_hours %}<th>{{ form_label(form.hours) }}</th>{% endif -%}
{%- if with_minutes %}<th>{{ form_label(form.minutes) }}</th>{% endif -%}
{%- if with_seconds %}<th>{{ form_label(form.seconds) }}</th>{% endif -%}
</tr>
</thead>
<tbody>
<tr>
{%- if with_years %}<td>{{ form_widget(form.years) }}</td>{% endif -%}
{%- if with_months %}<td>{{ form_widget(form.months) }}</td>{% endif -%}
{%- if with_weeks %}<td>{{ form_widget(form.weeks) }}</td>{% endif -%}
{%- if with_days %}<td>{{ form_widget(form.days) }}</td>{% endif -%}
{%- if with_hours %}<td>{{ form_widget(form.hours) }}</td>{% endif -%}
{%- if with_minutes %}<td>{{ form_widget(form.minutes) }}</td>{% endif -%}
{%- if with_seconds %}<td>{{ form_widget(form.seconds) }}</td>{% endif -%}
</tr>
</tbody>
</table>
{%- if with_years -%}
<div class="col-auto">
{{ form_label(form.years) }}
{{ form_widget(form.years) }}
</div>
{%- endif -%}
{%- if with_months -%}
<div class="col-auto">
{{ form_label(form.months) }}
{{ form_widget(form.months) }}
</div>
{%- endif -%}
{%- if with_weeks -%}
<div class="col-auto">
{{ form_label(form.weeks) }}
{{ form_widget(form.weeks) }}
</div>
{%- endif -%}
{%- if with_days -%}
<div class="col-auto">
{{ form_label(form.days) }}
{{ form_widget(form.days) }}
</div>
{%- endif -%}
{%- if with_hours -%}
<div class="col-auto">
{{ form_label(form.hours) }}
{{ form_widget(form.hours) }}
</div>
{%- endif -%}
{%- if with_minutes -%}
<div class="col-auto">
{{ form_label(form.minutes) }}
{{ form_widget(form.minutes) }}
</div>
{%- endif -%}
{%- if with_seconds -%}
<div class="col-auto">
{{ form_label(form.seconds) }}
{{ form_widget(form.seconds) }}
</div>
{%- endif -%}
{%- if with_invert %}{{ form_widget(form.invert) }}{% endif -%}
</div>
{%- endif -%}
@ -248,7 +264,7 @@
<div class="{% if form is not rootform %}invalid-feedback d-block{% else %}alert alert-danger{% endif %}">
<ul class="list-unstyled mb-0">
{%- for error in errors -%}
<li>{{ error.message }}</li>
<li><span class="initialism form-error-icon badge badge-danger">{{ 'Error'|trans({}, 'validators') }}</span> <span class="form-error-message">{{ error.message }}</span></li>
{%- endfor -%}
</ul>
</div>

View File

@ -107,7 +107,7 @@
<div {{ block('widget_container_attributes') }}>
{{- form_errors(form) -}}
<div class="table-responsive">
<table class="table {{ table_class|default('table-bordered table-condensed table-striped') }}">
<table class="table {{ table_class|default('table-bordered table-condensed table-striped') }}" role="presentation">
<thead>
<tr>
{%- if with_years %}<th>{{ form_label(form.years) }}</th>{% endif -%}

View File

@ -136,7 +136,7 @@
{%- else -%}
<div {{ block('widget_container_attributes') }}>
{{- form_errors(form) -}}
<table class="{{ table_class|default('') }}">
<table class="{{ table_class|default('') }}" role="presentation">
<thead>
<tr>
{%- if with_years %}<th>{{ form_label(form.years) }}</th>{% endif -%}

View File

@ -34,7 +34,10 @@ abstract class AbstractBootstrap4HorizontalLayoutTest extends AbstractBootstrap4
[
./div[
./ul
[./li[.="[trans]Error![/trans]"]]
[./li
[./span[.="[trans]Error[/trans]"]]
[./span[.="[trans]Error![/trans]"]]
]
[count(./li)=1]
]
]

View File

@ -34,7 +34,10 @@ abstract class AbstractBootstrap4LayoutTest extends AbstractBootstrap3LayoutTest
[
./div[
./ul
[./li[.="[trans]Error![/trans]"]]
[./li
[./span[.="[trans]Error[/trans]"]]
[./span[.="[trans]Error![/trans]"]]
]
[count(./li)=1]
]
]
@ -166,9 +169,12 @@ abstract class AbstractBootstrap4LayoutTest extends AbstractBootstrap3LayoutTest
[@class="list-unstyled mb-0"]
[
./li
[.="[trans]Error 1[/trans]"]
[./span[.="[trans]Error[/trans]"]]
[./span[.="[trans]Error 1[/trans]"]]
/following-sibling::li
[.="[trans]Error 2[/trans]"]
[./span[.="[trans]Error[/trans]"]]
[./span[.="[trans]Error 2[/trans]"]]
]
[count(./li)=2]
]

View File

@ -41,7 +41,7 @@
"symfony/doctrine-bridge": "<3.4",
"symfony/framework-bundle": "<3.4",
"symfony/http-kernel": "<3.4",
"symfony/twig-bridge": "<3.4"
"symfony/twig-bridge": "<3.4.5|<4.0.5,>=4.0"
},
"suggest": {
"symfony/validator": "For form validation.",

View File

@ -314,6 +314,10 @@
<source>This is not a valid Business Identifier Code (BIC).</source>
<target>Невалиден бизнес идентификационен код (BIC).</target>
</trans-unit>
<trans-unit id="82">
<source>Error</source>
<target>Грешка</target>
</trans-unit>
</body>
</file>
</xliff>

View File

@ -314,6 +314,10 @@
<source>This is not a valid Business Identifier Code (BIC).</source>
<target>Tato hodnota není platný identifikační kód podniku (BIC).</target>
</trans-unit>
<trans-unit id="82">
<source>Error</source>
<target>Chyba</target>
</trans-unit>
</body>
</file>
</xliff>

View File

@ -242,6 +242,10 @@
<source>This value is not a valid ISSN.</source>
<target>Værdien er ikke en gyldig ISSN.</target>
</trans-unit>
<trans-unit id="82">
<source>Error</source>
<target>Fejl</target>
</trans-unit>
</body>
</file>
</xliff>

View File

@ -314,6 +314,10 @@
<source>This is not a valid Business Identifier Code (BIC).</source>
<target>Dieser Wert ist kein gültiger BIC.</target>
</trans-unit>
<trans-unit id="82">
<source>Error</source>
<target>Fehler</target>
</trans-unit>
</body>
</file>
</xliff>

View File

@ -314,6 +314,10 @@
<source>This is not a valid Business Identifier Code (BIC).</source>
<target>This is not a valid Business Identifier Code (BIC).</target>
</trans-unit>
<trans-unit id="82">
<source>Error</source>
<target>Error</target>
</trans-unit>
</body>
</file>
</xliff>

View File

@ -314,6 +314,10 @@
<source>This is not a valid Business Identifier Code (BIC).</source>
<target>No es un Código de Identificación Bancaria (BIC) válido.</target>
</trans-unit>
<trans-unit id="82">
<source>Error</source>
<target>Error</target>
</trans-unit>
</body>
</file>
</xliff>

View File

@ -278,6 +278,10 @@
<source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
<target>Balio hau ez litzateke {{ compared_value_type }} {{ compared_value }}-(r)en berbera izan behar.</target>
</trans-unit>
<trans-unit id="82">
<source>Error</source>
<target>Errore</target>
</trans-unit>
</body>
</file>
</xliff>

View File

@ -222,6 +222,10 @@
<source>Unsupported card type or invalid card number.</source>
<target>Tätä korttityyppiä ei tueta tai korttinumero on virheellinen.</target>
</trans-unit>
<trans-unit id="82">
<source>Error</source>
<target>Virhe</target>
</trans-unit>
</body>
</file>
</xliff>

View File

@ -314,6 +314,10 @@
<source>This is not a valid Business Identifier Code (BIC).</source>
<target>Ce n'est pas un code universel d'identification des banques (BIC) valide.</target>
</trans-unit>
<trans-unit id="82">
<source>Error</source>
<target>Erreur</target>
</trans-unit>
</body>
</file>
</xliff>

View File

@ -314,6 +314,10 @@
<source>This is not a valid Business Identifier Code (BIC).</source>
<target>Ovo nije validan poslovni identifikacijski broj (BIC).</target>
</trans-unit>
<trans-unit id="82">
<source>Error</source>
<target>Greška</target>
</trans-unit>
</body>
</file>
</xliff>

View File

@ -314,6 +314,10 @@
<source>This is not a valid Business Identifier Code (BIC).</source>
<target>Érvénytelen nemzetközi bankazonosító kód (BIC/SWIFT).</target>
</trans-unit>
<trans-unit id="82">
<source>Error</source>
<target>Hiba</target>
</trans-unit>
</body>
</file>
</xliff>

View File

@ -314,6 +314,10 @@
<source>This is not a valid Business Identifier Code (BIC).</source>
<target>Questo valore non è un codice BIC valido.</target>
</trans-unit>
<trans-unit id="82">
<source>Error</source>
<target>Errore</target>
</trans-unit>
</body>
</file>
</xliff>

View File

@ -302,6 +302,10 @@
<source>An empty file is not allowed.</source>
<target>Failas negali būti tuščias.</target>
</trans-unit>
<trans-unit id="82">
<source>Error</source>
<target>Klaida</target>
</trans-unit>
</body>
</file>
</xliff>

View File

@ -310,6 +310,10 @@
<source>This is not a valid Business Identifier Code (BIC).</source>
<target>Dit is geen geldige bedrijfsidentificatiecode (BIC/SWIFT).</target>
</trans-unit>
<trans-unit id="82">
<source>Error</source>
<target>Fout</target>
</trans-unit>
</body>
</file>
</xliff>

View File

@ -314,6 +314,10 @@
<source>This is not a valid Business Identifier Code (BIC).</source>
<target>Ta wartość nie jest poprawnym kodem BIC (Business Identifier Code).</target>
</trans-unit>
<trans-unit id="82">
<source>Error</source>
<target>Błąd</target>
</trans-unit>
</body>
</file>
</xliff>

View File

@ -302,6 +302,10 @@
<source>An empty file is not allowed.</source>
<target>Ficheiro vazio não é permitido.</target>
</trans-unit>
<trans-unit id="82">
<source>Error</source>
<target>Erro</target>
</trans-unit>
</body>
</file>
</xliff>

View File

@ -278,6 +278,10 @@
<source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
<target>Această valoare nu trebuie să fie identică cu {{ compared_value_type }} {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="82">
<source>Error</source>
<target>Eroare</target>
</trans-unit>
</body>
</file>
</xliff>

View File

@ -310,6 +310,10 @@
<source>This value does not match the expected {{ charset }} charset.</source>
<target>Значение не совпадает с ожидаемой {{ charset }} кодировкой.</target>
</trans-unit>
<trans-unit id="82">
<source>Error</source>
<target>Ошибка</target>
</trans-unit>
</body>
</file>
</xliff>

View File

@ -314,6 +314,10 @@
<source>This is not a valid Business Identifier Code (BIC).</source>
<target>Detta är inte en giltig BIC-kod.</target>
</trans-unit>
<trans-unit id="82">
<source>Error</source>
<target>Fel</target>
</trans-unit>
</body>
</file>
</xliff>

View File

@ -222,6 +222,10 @@
<source>Unsupported card type or invalid card number.</source>
<target>Desteklenmeyen kart tipi veya geçersiz kart numarası.</target>
</trans-unit>
<trans-unit id="82">
<source>Error</source>
<target>Hata</target>
</trans-unit>
</body>
</file>
</xliff>

View File

@ -278,6 +278,10 @@
<source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
<target>Значення не повинно бути ідентичним {{ compared_value_type }} {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="82">
<source>Error</source>
<target>Помилка</target>
</trans-unit>
</body>
</file>
</xliff>

View File

@ -310,6 +310,10 @@
<source>This value does not match the expected {{ charset }} charset.</source>
<target>该值不符合 {{ charset }} 编码。</target>
</trans-unit>
<trans-unit id="82">
<source>Error</source>
<target>错误</target>
</trans-unit>
</body>
</file>
</xliff>