Updates following comments.

- Templates spaces and conventions
- Rename translation string keys

Controller/CRUDController.php

@@ -146,7 +146,7 @@ class CRUDController extends Controller
 
         $modelManager = $this->admin->getModelManager();
         $modelManager->batchDelete($this->admin->getClass(), $query);
-        $this->get('session')->setFlash('sonata_flash_success', 'sonata_flash_batch_delete_success');
+        $this->get('session')->setFlash('sonata_flash_success', 'flash_batch_delete_success');
 
 
         return new RedirectResponse($this->admin->generateUrl('list', $this->admin->getFilterParameters()));
@@ -166,7 +166,7 @@ class CRUDController extends Controller
         }
 
         $this->admin->delete($object);
-        $this->get('session')->setFlash('sonata_flash_success', 'sonata_flash_delete_success');
+        $this->get('session')->setFlash('sonata_flash_success', 'flash_delete_success');
         return new RedirectResponse($this->admin->generateUrl('list'));
     }
 
@@ -198,7 +198,7 @@ class CRUDController extends Controller
             
             if ($form->isValid()) {
                 $this->admin->update($object);
-                $this->get('session')->setFlash('sonata_flash_success', 'sonata_flash_edit_success');
+                $this->get('session')->setFlash('sonata_flash_success', 'flash_edit_success');
                 
                 if ($this->isXmlHttpRequest()) {
                     return $this->renderJson(array(
@@ -210,7 +210,7 @@ class CRUDController extends Controller
                 // redirect to edit mode
                 return $this->redirectTo($object);
             }
-            $this->get('session')->setFlash('sonata_flash_error', 'sonata_flash_edit_error');
+            $this->get('session')->setFlash('sonata_flash_error', 'flash_edit_error');
         }
 
         return $this->render($this->admin->getEditTemplate(), array(
@@ -266,7 +266,7 @@ class CRUDController extends Controller
         $all_elements = $this->get('request')->get('all_elements', false);
 
         if (count($idx) == 0 && !$all_elements) { // no item selected
-            $this->get('session')->setFlash('sonata_flash_notice', 'sonata_flash_batch_empty');
+            $this->get('session')->setFlash('sonata_flash_notice', 'flash_batch_empty');
 
             return new RedirectResponse($this->admin->generateUrl('list', $this->admin->getFilterParameters()));
         }
@@ -324,11 +324,11 @@ class CRUDController extends Controller
                         'objectId' => $this->admin->getNormalizedIdentifier($object)
                     ));
                 }
-                $this->get('session')->setFlash('sonata_flash_success','sonata_flash_create_success');
+                $this->get('session')->setFlash('sonata_flash_success','flash_create_success');
                 // redirect to edit mode
                 return $this->redirectTo($object);
             }
-            $this->get('session')->setFlash('sonata_flash_error', 'sonata_flash_create_error');
+            $this->get('session')->setFlash('sonata_flash_error', 'flash_create_error');
         }
 
         return $this->render($this->admin->getEditTemplate(), array(

Resources/translations/SonataAdminBundle.en.xliff

@@ -114,40 +114,40 @@
                 <source>all_elements</source>
                 <target>All elements</target>
             </trans-unit>
-            <trans-unit id='sonata_flash_batch_empty'>
-              <source>sonata_flash_batch_empty</source>
+            <trans-unit id='flash_batch_empty'>
+              <source>flash_batch_empty</source>
               <target>Action aborted. No items where selected.</target>
             </trans-unit>
-            <trans-unit id='sonata_flash_create_success'>
-              <source>sonata_flash_create_success</source>
+            <trans-unit id='flash_create_success'>
+              <source>flash_create_success</source>
               <target>Item has been successfully created.</target>
             </trans-unit>
-            <trans-unit id='sonata_flash_create_error'>
-              <source>sonata_flash_create_error</source>
+            <trans-unit id='flash_create_error'>
+              <source>flash_create_error</source>
               <target>An error has occurred during item creation.</target>
             </trans-unit>
-            <trans-unit id='sonata_flash_edit_success'>
-              <source>sonata_flash_edit_success</source>
+            <trans-unit id='flash_edit_success'>
+              <source>flash_edit_success</source>
               <target>Item has been successfully updated.</target>
             </trans-unit>
-            <trans-unit id='sonata_flash_edit_error'>
-              <source>sonata_flash_edit_error</source>
+            <trans-unit id='flash_edit_error'>
+              <source>flash_edit_error</source>
               <target>An error has occurred during item update.</target>
             </trans-unit>
-            <trans-unit id='sonata_flash_batch_delete_success'>
-              <source>sonata_flash_batch_delete_success</source>
+            <trans-unit id='flash_batch_delete_success'>
+              <source>flash_batch_delete_success</source>
               <target>Selected items have been successfully deleted.</target>
             </trans-unit>
-            <trans-unit id='sonata_flash_batch_delete_error'>
-              <source>sonata_flash_batch_delete_error</source>
+            <trans-unit id='flash_batch_delete_error'>
+              <source>flash_batch_delete_error</source>
               <target>An Error has occurred during selected items deletion.</target>
             </trans-unit>
-            <trans-unit id='sonata_flash_delete_error'>
-              <source>sonata_flash_delete_error</source>
+            <trans-unit id='flash_delete_error'>
+              <source>flash_delete_error</source>
               <target>An Error has occurred during item deletion.</target>
             </trans-unit>
-            <trans-unit id='sonata_flash_delete_success'>
-              <source>sonata_flash_delete_success</source>
+            <trans-unit id='flash_delete_success'>
+              <source>flash_delete_success</source>
               <target>Item has been deleted successfully.</target>
             </trans-unit>
         </body>

Resources/translations/SonataAdminBundle.fr.xliff

@@ -114,40 +114,40 @@
                 <source>all_elements</source>
                 <target>Tous les éléments</target>
             </trans-unit>
-            <trans-unit id='sonata_flash_batch_empty'>
-              <source>sonata_flash_batch_empty</source>
+            <trans-unit id='flash_batch_empty'>
+              <source>flash_batch_empty</source>
               <target>Action interrompue. Aucun élément n'a été séléctionné.</target>
             </trans-unit>
-            <trans-unit id='sonata_flash_create_success'>
-              <source>sonata_flash_create_success</source>
+            <trans-unit id='flash_create_success'>
+              <source>flash_create_success</source>
               <target>L'élément a été crée avec succès.</target>
             </trans-unit>
-            <trans-unit id='sonata_flash_create_error'>
-              <source>sonata_flash_create_error</source>
+            <trans-unit id='flash_create_error'>
+              <source>flash_create_error</source>
               <target>Une erreur est intervenue lors de la création de l'élément.</target>
             </trans-unit>
-            <trans-unit id='sonata_flash_edit_success'>
-              <source>sonata_flash_edit_success</source>
+            <trans-unit id='flash_edit_success'>
+              <source>flash_edit_success</source>
               <target>L'élément a été mis à jour avec succès.</target>
             </trans-unit>
-            <trans-unit id='sonata_flash_edit_error'>
-              <source>sonata_flash_edit_error</source>
+            <trans-unit id='flash_edit_error'>
+              <source>flash_edit_error</source>
               <target>Une erreur est intervenue lors de la mise à jour de l'élément.</target>
             </trans-unit>
-            <trans-unit id='sonata_flash_batch_delete_success'>
-              <source>sonata_flash_batch_delete_success</source>
+            <trans-unit id='flash_batch_delete_success'>
+              <source>flash_batch_delete_success</source>
               <target>Les éléments séléctionnés ont été supprimés avec succès.</target>
             </trans-unit>
-            <trans-unit id='sonata_flash_batch_delete_error'>
-              <source>sonata_flash_batch_delete_error</source>
+            <trans-unit id='flash_batch_delete_error'>
+              <source>flash_batch_delete_error</source>
               <target>Une erreur est intervenue lors de la suppression des éléments séléctionnés.</target>
             </trans-unit>
-            <trans-unit id='sonata_flash_delete_error'>
-              <source>sonata_flash_delete_error</source>
+            <trans-unit id='flash_delete_error'>
+              <source>flash_delete_error</source>
               <target>Une erreur est intervenue lors de la suppression de l'élément.</target>
             </trans-unit>
-            <trans-unit id='sonata_flash_delete_success'>
-              <source>sonata_flash_delete_success</source>
+            <trans-unit id='flash_delete_success'>
+              <source>flash_delete_success</source>
               <target>Les éléments ont été supprimés avec succès.</target>
             </trans-unit>
         </body>

Resources/views/standard_layout.html.twig

@@ -95,12 +95,14 @@ file that was distributed with this source code.
                 
                 {# flash notice defined in CRUDController after actions- 3 levels #}
                 {% for notice_level in ['success','error','notice'] %}
-                   {%set session_var = ( ['sonata_flash_',notice_level]|join)%}
+
+                   {% set session_var = 'sonata_flash_' ~ notice_level %}
                     {% if app.session.hasFlash(session_var) %}
                         <div class="{{notice_level}}">
                         {{ app.session.flash(session_var) | trans([],'SonataAdminBundle') }}
                        </div>
-                    {%endif%}
+                    {% endif %}
+                
                 {% endfor %}
                
             </div>