feature #425 Translate the error (and errors) label of forms (thomasb…

…eaujean, javiereguiluz) This PR was merged into the master branch. Discussion ---------- Translate the error (and errors) label of forms Commits ------- 810e1be Minor tweaks for the template code fc6b4dc Updated more translations 1227d31 Simplified translation files e823768 Use transchoice for error translation af4cf07 Fix: it is the error message that must be used for one error cd294c6 Translate the error (and errors) label of forms
EasyCorp · Sep 1, 2015 · 9d32134 · 9d32134
2 parents ff6f5ef + 810e1be
commit 9d32134
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 11 deletions.
diff --git a/Resources/translations/EasyAdminBundle.en.xlf b/Resources/translations/EasyAdminBundle.en.xlf
@@ -116,6 +116,9 @@
             <trans-unit id="action.add_another_item">
                 <source>action.add_another_item</source>
                 <target>Add another item</target>
+            <trans-unit id="errors">
+                <source>errors</source>
+                <target>Error|Errors</target>
             </trans-unit>
         </body>
     </file>

diff --git a/Resources/translations/EasyAdminBundle.es.xlf b/Resources/translations/EasyAdminBundle.es.xlf
@@ -109,6 +109,10 @@
                 <source>delete_modal.content</source>
                 <target>Esta acción no se puede deshacer.</target>
             </trans-unit>
+            <trans-unit id="errors">
+                <source>errors</source>
+                <target>Error|Errores</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/EasyAdminBundle.eu.xlf b/Resources/translations/EasyAdminBundle.eu.xlf
@@ -109,6 +109,10 @@
                 <source>delete_modal.content</source>
                 <target>Ekintza hau ezin da desegin.</target>
             </trans-unit>
+            <trans-unit id="errors">
+                <source>errors</source>
+                <target>Hutsa|Hutsak</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/EasyAdminBundle.fr.xlf b/Resources/translations/EasyAdminBundle.fr.xlf
@@ -116,6 +116,9 @@
             <trans-unit id="action.add_another_item">
                 <source>action.add_another_item</source>
                 <target>Ajouter un autre élément</target>
+            <trans-unit id="errors">
+                <source>errors</source>
+                <target>Erreur|Erreurs</target>
             </trans-unit>
         </body>
     </file>

diff --git a/Resources/views/form/bootstrap_3_layout.html.twig b/Resources/views/form/bootstrap_3_layout.html.twig
@@ -232,18 +232,19 @@
 {# Errors #}
 
 {% block form_errors %}
-    {% if errors|length > 1 %}
+    {% set error_count = errors|length %}
+    {% if error_count >= 1 %}
         <div class="error-block">
-            <span class="label label-danger">{{ errors|length }} ERRORS</span>
-            <ul>
-                {% for error in errors %}
-                    <li>{{ error.message }}</li>
-                {% endfor %}
-            </ul>
-        </div>
-    {% elseif errors|length == 1 %}
-        <div class="error-block">
-            <span class="label label-danger">ERROR</span> {{ errors|first.message }}
+            <span class="label label-danger">{{ 'errors'|transchoice(error_count) }}</span>
+            {% if error_count == 1 %}
+                {{ errors|first.message }}
+            {% else %}
+                <ul>
+                    {% for error in errors %}
+                        <li>{{ error.message }}</li>
+                    {% endfor %}
+                </ul>
+            {% endif %}
         </div>
     {% endif %}
 {% endblock form_errors %}