Added translation domain to batchActions

SirEOF · Nov 6, 2015 · ffe2736 · ffe2736
1 parent 03f72ae
commit ffe2736
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Admin/Admin.php b/Admin/Admin.php
@@ -1158,8 +1158,9 @@ public function getBatchActions()
 
         if ($this->hasRoute('delete') && $this->isGranted('DELETE')) {
             $actions['delete'] = array(
-                'label'            => $this->trans('action_delete', array(), 'SonataAdminBundle'),
-                'ask_confirmation' => true, // by default always true
+                'label'              => 'action_delete',
+                'translation_domain' => 'SonataAdminBundle',
+                'ask_confirmation'   => true, // by default always true
             );
         }
 

diff --git a/Resources/doc/reference/batch_actions.rst b/Resources/doc/reference/batch_actions.rst
@@ -37,7 +37,8 @@ merges them onto a single target item. It should only be available when two cond
           $this->hasRoute('delete') && $this->isGranted('DELETE')
         ) {
             $actions['merge'] = array(
-                'label' => $this->trans('action_merge', array(), 'SonataAdminBundle'),
+                'label' => 'action_merge',
+                'translation_domain' => 'SonataAdminBundle'
                 'ask_confirmation' => true
             );
 

diff --git a/Resources/views/CRUD/base_list.html.twig b/Resources/views/CRUD/base_list.html.twig
@@ -144,7 +144,7 @@ file that was distributed with this source code.
 
                                             <select name="action" style="width: auto; height: auto" class="form-control">
                                                 {% for action, options in batchactions %}
-                                                    <option value="{{ action }}">{{ options.label }}</option>
+                                                    <option value="{{ action }}">{{ options.label|trans({}, options.translation_domain|default(admin.translationDomain)) }}</option>
                                                 {% endfor %}
                                             </select>
                                         {% endblock %}