Merge pull request #9 from yxie/master

Fixing various bugs during use of the bundle

Author: guilhermeblanco

Command/ImportCommand.php

@@ -151,7 +151,8 @@ function ($translation) use ($locale) {
                 }
             }
 
-            $storage->flushAll();
+            $storage->flush();
+            $storage->clear();
 
             $this->output->writeln('<info>DONE</info>');
         }

Controller/EditorController.php

@@ -136,6 +136,8 @@ public function addTranslationAction()
             $storageService->createTranslation($locale, $entry, $translationValue);
         }
 
+        $storageService->flush();
+
         // Return reponse according to request type
         if ( ! $request->isXmlHttpRequest()) {
             return new RedirectResponse($this->generateUrl('sg_localeditor_index'));
@@ -183,6 +185,8 @@ public function updateTranslationAction()
                 $storageService->createTranslation($locale, $entry, $value);
             }
 
+            $storageService->flush();
+
             $result = array(
                 'result'  => true,
                 'message' => 'Translation updated successfully.'
@@ -253,6 +257,8 @@ public function addLocaleAction()
             // Create new Locale
             $storageService->createLocale($language, $country);
 
+            $storageService->flush();
+
             $result = array(
                 'result'  => true,
                 'message' => 'New locale added successfully. Reload list for completion.'

Resources/views/layout.html.twig

@@ -93,7 +93,7 @@
         $(document).ready(function () {
             $('#locales input').click(function(e) {
                 var li = $(e.target).parent();
-                confirm('Are you sure?') && removeLocale(li.data('id'), li.data('index'));
+                confirm('Are you sure?') && removeLocale(li.data('index'), li.data('id'));
             });
             $('#nav-new-locale').click(function() {
                 $('.alert-message').hide();

Storage/AbstractStorage.php

@@ -109,9 +109,16 @@ public function persist($entity)
     /**
      * {@inheritdoc}
      */
-    public function flushAll()
+    public function flush()
     {
         $this->manager->flush();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function clear()
+    {
         $this->manager->clear();
     }
 

Storage/StorageInterface.php

@@ -106,7 +106,12 @@ public function deleteTranslation($id);
     public function persist($entity);
 
     /**
-     * Flushes all persisted entities, and clear the object manager
+     * Flushes all persisted entities
      */
-    public function flushAll();
+    public function flush();
+
+    /**
+     * Clear all managed entities in the object manager
+     */
+    public function clear();
 }