bug #972 Fixed some missing translations (javiereguiluz)

This PR was squashed before being merged into the master branch (closes #972). Discussion ---------- Fixed some missing translations This fixes #957. Commits ------- 7536b57 Fixed some missing translations
EasyCorp · Mar 10, 2016 · 0480f7d · 0480f7d
2 parents 29f042e + 7536b57
commit 0480f7d
Show file tree

Hide file tree

Showing 19 changed files with 127 additions and 27 deletions.
diff --git a/Resources/translations/messages.bg.xlf b/Resources/translations/messages.bg.xlf
@@ -35,6 +35,13 @@
                 <source>action.list</source>
                 <target>Обратно към списъка</target>
             </trans-unit>
+
+            <!-- forms -->
+            <trans-unit id="form.label.collections">
+                <!-- don't change this "translation" -->
+                <source>__name__label__</source>
+                <target>__name__label__</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/messages.ca.xlf b/Resources/translations/messages.ca.xlf
@@ -39,6 +39,13 @@
                 <source>label.form.empty_value</source>
                 <target>Ningú</target>
             </trans-unit>
+
+            <!-- forms -->
+            <trans-unit id="form.label.collections">
+                <!-- don't change this "translation" -->
+                <source>__name__label__</source>
+                <target>__name__label__</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/messages.cs.xlf b/Resources/translations/messages.cs.xlf
@@ -39,6 +39,13 @@
                 <source>label.form.empty_value</source>
                 <target>Prázdné</target>
             </trans-unit>
+
+            <!-- forms -->
+            <trans-unit id="form.label.collections">
+                <!-- don't change this "translation" -->
+                <source>__name__label__</source>
+                <target>__name__label__</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/messages.de.xlf b/Resources/translations/messages.de.xlf
@@ -39,6 +39,13 @@
                 <source>label.form.empty_value</source>
                 <target>kein Wert</target>
             </trans-unit>
+
+            <!-- forms -->
+            <trans-unit id="form.label.collections">
+                <!-- don't change this "translation" -->
+                <source>__name__label__</source>
+                <target>__name__label__</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/messages.en.xlf b/Resources/translations/messages.en.xlf
@@ -39,6 +39,13 @@
                 <source>label.form.empty_value</source>
                 <target>None</target>
             </trans-unit>
+
+            <!-- forms -->
+            <trans-unit id="form.label.collections">
+                <!-- don't change this "translation" -->
+                <source>__name__label__</source>
+                <target>__name__label__</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/messages.es.xlf b/Resources/translations/messages.es.xlf
@@ -39,6 +39,13 @@
                 <source>label.form.empty_value</source>
                 <target>Ninguno</target>
             </trans-unit>
+
+            <!-- forms -->
+            <trans-unit id="form.label.collections">
+                <!-- don't change this "translation" -->
+                <source>__name__label__</source>
+                <target>__name__label__</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/messages.eu.xlf b/Resources/translations/messages.eu.xlf
@@ -35,6 +35,13 @@
                 <source>action.list</source>
                 <target>Zerrendara itzuli</target>
             </trans-unit>
+
+            <!-- forms -->
+            <trans-unit id="form.label.collections">
+                <!-- don't change this "translation" -->
+                <source>__name__label__</source>
+                <target>__name__label__</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/messages.fr.xlf b/Resources/translations/messages.fr.xlf
@@ -39,6 +39,13 @@
                 <source>label.form.empty_value</source>
                 <target>Aucun(e)</target>
             </trans-unit>
+
+            <!-- forms -->
+            <trans-unit id="form.label.collections">
+                <!-- don't change this "translation" -->
+                <source>__name__label__</source>
+                <target>__name__label__</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/messages.it.xlf b/Resources/translations/messages.it.xlf
@@ -39,6 +39,13 @@
                 <source>label.form.empty_value</source>
                 <target>Nessun valore</target>
             </trans-unit>
+
+            <!-- forms -->
+            <trans-unit id="form.label.collections">
+                <!-- don't change this "translation" -->
+                <source>__name__label__</source>
+                <target>__name__label__</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/messages.nl.xlf b/Resources/translations/messages.nl.xlf
@@ -35,6 +35,13 @@
                 <source>action.list</source>
                 <target>Terug naar overzicht</target>
             </trans-unit>
+
+            <!-- forms -->
+            <trans-unit id="form.label.collections">
+                <!-- don't change this "translation" -->
+                <source>__name__label__</source>
+                <target>__name__label__</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/messages.pl.xlf b/Resources/translations/messages.pl.xlf
@@ -39,6 +39,13 @@
                 <source>label.form.empty_value</source>
                 <target>Pusta wartość</target>
             </trans-unit>
+
+            <!-- forms -->
+            <trans-unit id="form.label.collections">
+                <!-- don't change this "translation" -->
+                <source>__name__label__</source>
+                <target>__name__label__</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/messages.pt.xlf b/Resources/translations/messages.pt.xlf
@@ -35,6 +35,13 @@
                 <source>action.list</source>
                 <target>Voltar para a lista</target>
             </trans-unit>
+
+            <!-- forms -->
+            <trans-unit id="form.label.collections">
+                <!-- don't change this "translation" -->
+                <source>__name__label__</source>
+                <target>__name__label__</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/messages.ro.xlf b/Resources/translations/messages.ro.xlf
@@ -39,6 +39,13 @@
                 <source>label.form.empty_value</source>
                 <target>Gol</target>
             </trans-unit>
+
+            <!-- forms -->
+            <trans-unit id="form.label.collections">
+                <!-- don't change this "translation" -->
+                <source>__name__label__</source>
+                <target>__name__label__</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/messages.ru.xlf b/Resources/translations/messages.ru.xlf
@@ -39,6 +39,13 @@
                 <source>label.form.empty_value</source>
                 <target>Пусто</target>
             </trans-unit>
+
+            <!-- forms -->
+            <trans-unit id="form.label.collections">
+                <!-- don't change this "translation" -->
+                <source>__name__label__</source>
+                <target>__name__label__</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/messages.sl.xlf b/Resources/translations/messages.sl.xlf
@@ -39,6 +39,13 @@
                 <source>label.form.empty_value</source>
                 <target>Noben</target>
             </trans-unit>
+
+            <!-- forms -->
+            <trans-unit id="form.label.collections">
+                <!-- don't change this "translation" -->
+                <source>__name__label__</source>
+                <target>__name__label__</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/messages.sv.xlf b/Resources/translations/messages.sv.xlf
@@ -35,6 +35,13 @@
                 <source>action.list</source>
                 <target>Åter till lista</target>
             </trans-unit>
+
+            <!-- forms -->
+            <trans-unit id="form.label.collections">
+                <!-- don't change this "translation" -->
+                <source>__name__label__</source>
+                <target>__name__label__</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/messages.tr.xlf b/Resources/translations/messages.tr.xlf
@@ -39,6 +39,13 @@
                 <source>label.form.empty_value</source>
                 <target>Boş</target>
             </trans-unit>
+
+            <!-- forms -->
+            <trans-unit id="form.label.collections">
+                <!-- don't change this "translation" -->
+                <source>__name__label__</source>
+                <target>__name__label__</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/views/form/bootstrap_3_horizontal_layout.html.twig b/Resources/views/form/bootstrap_3_horizontal_layout.html.twig
@@ -18,21 +18,16 @@
 {% endspaceless %}
 {%- endblock form_label %}
 
-{% block form_label_class -%}
-col-sm-2
-{%- endblock form_label_class %}
+{% block form_label_class 'col-sm-2' %}
 
 {# Rows #}
 
 {% block form_row -%}
 {% spaceless %}
     {% set _field_type = easyadmin.field.fieldType|default('default') %}
     <div class="form-group {% if (not compound or force_error|default(false)) and not valid %}has-error{% endif %} field-{{ block_prefixes|slice(-2)|first }}">
-
-        {% set _trans_parameters = { '%entity_name%':  easyadmin.entity.name|trans, '%entity_label%': easyadmin.entity.label|trans } %}
         {% set _field_label = easyadmin.field['label']|default(null) %}
-
-        {{ form_label(form, _field_label|trans(_trans_parameters)) }}
+        {{ form_label(form, _field_label, { translation_domain: 'messages' }) }}
         <div class="{{ block('form_group_class') }}">
             {{ form_widget(form) }}
 
@@ -97,6 +92,4 @@ col-sm-2
 {% endspaceless %}
 {% endblock reset_row %}
 
-{% block form_group_class -%}
-col-sm-10
-{%- endblock form_group_class %}
+{% block form_group_class 'col-sm-10' %}
diff --git a/Resources/views/form/bootstrap_3_layout.html.twig b/Resources/views/form/bootstrap_3_layout.html.twig
@@ -1,7 +1,4 @@
-{% use "form_div_layout.html.twig" %}
-
-{# needed to force translation of labels #}
-{% set translation_domain = 'messages' %}
+{% use 'form_div_layout.html.twig' %}
 
 {% block form_start -%}
     {% if 'easyadmin' == block_prefixes|slice(-2)|first %}
@@ -175,8 +172,6 @@
 {# Labels #}
 
 {% block form_label -%}
-    {# needed to force translation of labels #}
-    {% set translation_domain = 'messages' %}
     {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' control-label')|trim}) -%}
     {{- parent() -}}
 {%- endblock form_label %}
@@ -196,9 +191,6 @@
 {%- endblock radio_label %}
 
 {% block checkbox_radio_label %}
-    {# needed to force translation of labels #}
-    {% set translation_domain = 'messages' %}
-
     {# Do no display the label if widget is not defined in order to prevent double label rendering #}
     {% if widget is defined %}
         {% if required %}
@@ -212,7 +204,7 @@
         {% endif %}
         <label{% for attrname, attrvalue in label_attr %} {{ attrname }}="{{ attrvalue }}"{% endfor %}>
             {{- widget|raw -}}
-            {{- label is not same as(false) ? label|trans({}, translation_domain) -}}
+            {{- label is not same as(false) ? label|trans({}, 'messages') -}}
         </label>
     {% endif %}
 {% endblock checkbox_radio_label %}
@@ -222,11 +214,8 @@
 {% block form_row -%}
     {% set _field_type = easyadmin.field.fieldType|default('default') %}
     <div class="form-group {% if (not compound or force_error|default(false)) and not valid %}has-error{% endif %} field-{{ block_prefixes|slice(-2)|first }}">
-
-        {% set _trans_parameters = { '%entity_name%':  easyadmin.entity.name|trans, '%entity_label%': easyadmin.entity.label|trans } %}
         {% set _field_label = easyadmin.field['label']|default(null) %}
-
-        {{- form_label(form, _field_label|trans(_trans_parameters)) -}}
+        {{- form_label(form, _field_label, { translation_domain: 'messages' }) -}}
         {{- form_widget(form) -}}
 
         {% if _field_type in ['datetime', 'datetimetz', 'date', 'time'] and easyadmin.field.nullable|default(false) %}
@@ -358,7 +347,7 @@
         <div class="row">
             {% if form.delete is defined %}
             <div class="col-sm-3 col-md-2">
-                {{ form_row(form.delete) }}
+                {{ form_row(form.delete, { label: 'action.delete' }) }}
             </div>
             {% endif %}
             <div class="{{ form.delete is defined ? 'col-sm-9 col-md-10' : 'col-sm-12' }}">
@@ -374,7 +363,7 @@
     <div class="easyadmin-vich-image">
         {{ form_widget(form.file) }}
         {% if form.delete is defined %}
-            {{ form_row(form.delete) }}
+            {{ form_row(form.delete, { label: 'action.delete' }) }}
         {% endif %}
 
         {% if download_uri|default('') is not empty %}
@@ -394,7 +383,6 @@
 
 {# Easy admin form type #}
 {% block easyadmin_widget %}
-
     {% set _trans_parameters = { '%entity_name%':  easyadmin.entity.name|trans, '%entity_label%': easyadmin.entity.label|trans } %}
 
     {% if form.vars.errors|length > 0 %}