Merge branch 'master' of github.com:sonata-project/BaseApplicationBundle

Resources/views/CRUD/base_filter_field.html.twig

@@ -10,7 +10,14 @@ file that was distributed with this source code.
 #}
 
 <div>
-    {% block label %}{{ form_label(filter.field) }} <br />{% endblock %}
+    {% block label %}
+        {% if filter.description.options.name is defined %}
+            {{ form_label(filter.field, filter.description.options.name) }}
+        {% else %}
+            {{ form_label(filter.field) }}
+        {% endif %}
+        <br />
+    {% endblock %}
 
     <div class="sonata-ba-field {% if filter.field.haserrors %}sonata-ba-field-error"{% endif %}">
         {% block field %}{{ form_field(filter.field) }}{% endblock %}

Resources/views/CRUD/base_list.html.twig

@@ -30,7 +30,13 @@ file that was distributed with this source code.
                         {% if field_description.getOption('code') == '_batch' %}
                             <th class="sonata-ba-list-field-header sonata-ba-list-field-header-batch"><input type="checkbox" id="list_batch_checkbox" /></th>
                         {% else %}
-                            <th class="sonata-ba-list-field-header sonata-ba-list-field-header-{{ field_description.type}}">{{ field_description.name }}</th>
+                                {% spaceless %}<th class="sonata-ba-list-field-header sonata-ba-list-field-header-{{ field_description.type}}">
+                                    {% if field_description.options.name is defined %}
+                                        {{ field_description.options.name }}
+                                    {% else %}
+                                        {{ field_description.name }}
+                                    {% endif %}
+                                </th>{% endspaceless %}
                         {% endif %}
                     {% endfor %}
                 </tr>

Resources/views/CRUD/base_standard_edit_field.html.twig

@@ -10,7 +10,14 @@ file that was distributed with this source code.
 #}
 
 <div id="sonata-ba-field-container-{{ admin.uniqid }}-{{ field_element.id}}">
-    {% block label %}{{ form_label(field_element) }} <br />{% endblock %}
+    {% block label %}
+        {% if field_description.options.name is defined %}
+            {{ form_label(field_element, field_description.options.name) }}
+        {% else %}
+            {{ form_label(field_element) }}
+        {% endif %}
+        <br />
+    {% endblock %}
 
     <div class="sonata-ba-field sonata-ba-field-{{ edit }}-{{ inline }} {% if field_element.haserrors %}sonata-ba-field-error{% endif %}">
 

Resources/views/CRUD/edit_boolean.html.twig

@@ -11,9 +11,17 @@ file that was distributed with this source code.
 
 <div>
 
-    <div class="sonata-ba-field {% if field_element.haserrors %}sonata-ba-field-error"{% endif %}">
-
-        {% block field %}{{ form_field(field_element) }}{% endblock %}{% block label %}{{ form_label(field_element) }} <br />{% endblock %}
+    <div class="sonata-ba-field {% if field_element.haserrors %}sonata-ba-field-error{% endif %}">
+
+        {% block field %}{{ form_field(field_element) }}{% endblock %}
+        {% block label %}
+            {% if field_description.options.name is defined %}
+                {{ form_label(field_element, field_description.options.name) }}
+            {% else %}
+                {{ form_label(field_element) }}
+            {% endif %}
+            <br />
+        {% endblock %}
 
         <div class="sonata-ba-field-error-messages">
             {% block errors %}{{ form_errors(field_element) }}{% endblock %}