Merge branch '2.1'

Admin/Admin.php

@@ -680,7 +680,7 @@ abstract class Admin implements AdminInterface, DomainObjectInterface
             ));
 
             $fieldDescription->setAdmin($this);
-            $fieldDescription->setTemplate('SonataAdminBundle:CRUD:list__batch.html.twig');
+            $fieldDescription->setTemplate($this->getTemplate('batch'));
 
             $mapper->add($fieldDescription, 'batch');
         }

Controller/CRUDController.php

@@ -427,7 +427,7 @@ class CRUDController extends Controller
         if ($askConfirmation && $confirmation != 'ok') {
             $formView = $datagrid->getForm()->createView();
 
-            return $this->render('SonataAdminBundle:CRUD:batch_confirmation.html.twig', array(
+            return $this->render($this->admin->getTemplate('batch_confirmation'), array(
                 'action'   => 'list',
                 'datagrid' => $datagrid,
                 'form'     => $formView,

DependencyInjection/Configuration.php

@@ -138,6 +138,8 @@ class Configuration implements ConfigurationInterface
                         ->scalarNode('list_block')->defaultValue('SonataAdminBundle:Block:block_admin_list.html.twig')->cannotBeEmpty()->end()
                         ->scalarNode('short_object_description')->defaultValue('SonataAdminBundle:Helper:short-object-description.html.twig')->cannotBeEmpty()->end()
                         ->scalarNode('delete')->defaultValue('SonataAdminBundle:CRUD:delete.html.twig')->cannotBeEmpty()->end()
+                        ->scalarNode('batch')->defaultValue('SonataAdminBundle:CRUD:list__batch.html.twig')->cannotBeEmpty()->end()
+                        ->scalarNode('batch_confirmation')->defaultValue('SonataAdminBundle:CRUD:batch_confirmation.html.twig')->cannotBeEmpty()->end()
                     ->end()
                 ->end()
 

Resources/doc/reference/templates.rst

@@ -18,7 +18,9 @@ By default, an Admin class uses a set of templates, it is possible to tweak the
             history: SonataAdminBundle:CRUD:history.html.twig
             preview: SonataAdminBundle:CRUD:preview.html.twig
             delete:  SonataAdminBundle:CRUD:delete.html.twig
-
+            batch:   SonataAdminBundle:CRUD:list__batch.html.twig
+            batch_confirmation: SonataAdminBundle:CRUD:batch_confirmation.html.twig
+            
             # default values of helper templates
             short_object_description: SonataAdminBundle:Helper:short-object-description.html.twig
 

Resources/translations/SonataAdminBundle.fr.xliff

@@ -140,7 +140,7 @@
             </trans-unit>
             <trans-unit id='flash_create_success'>
                 <source>flash_create_success</source>
-                <target>L'élément a été crée avec succès.</target>
+                <target>L'élément a été créé avec succès.</target>
             </trans-unit>
             <trans-unit id='flash_create_error'>
                 <source>flash_create_error</source>

Resources/translations/SonataAdminBundle.ru.xliff

@@ -60,7 +60,7 @@
             </trans-unit>
             <trans-unit id="link_action_edit">
                 <source>link_action_edit</source>
-                <target>Редактировать "%name%"</target>
+                <target>Редактировать</target>
             </trans-unit>
             <trans-unit id="link_add">
                 <source>link_add</source>
@@ -84,7 +84,7 @@
             </trans-unit>
             <trans-unit id="title_edit">
                 <source>title_edit</source>
-                <target>Редактировать</target>
+                <target>Редактировать "%name%"</target>
             </trans-unit>
             <trans-unit id="title_list">
                 <source>title_list</source>

Resources/views/CRUD/delete.html.twig

@@ -33,7 +33,7 @@ file that was distributed with this source code.
 
         <h1>{{ 'title_delete'|trans({}, 'SonataAdminBundle') }}</h1>
 
-        {{ 'message_delete_confirmation'|trans({'%object%': object}, 'SonataAdminBundle') }}
+        {{ 'message_delete_confirmation'|trans({'%object%': admin.toString(object)}, 'SonataAdminBundle') }}
 
         <div class="well form-actions">
             <form method="POST" action="{{ admin.generateObjectUrl('delete', object) }}">