Merge pull request #21 from martiis/import_fix

Import HOTFIX

Author: Martynas Sudintas

Storage/ElasticsearchStorage.php

@@ -65,23 +65,23 @@ public function read($locales = [], $domains = [])
      */
     public function write(array $translations)
     {
-        foreach ($translations as $domain => $domainTrans) {
-            /** @var Translation $document */
+        foreach ($translations as $path => $domains) {
+            foreach ($domains as $domain => $transMeta) {
+                foreach ($transMeta['translations'] as $key => $keyTrans) {
+                    $document = $this->getRepository()->createDocument();
+                    $document->setDomain($domain);
+                    $document->setKey($key);
+                    $document->setPath($path);
+                    $document->setFormat($transMeta['format']);
 
-            foreach ($domainTrans['translations'] as $key => $keyTrans) {
-                $document = $this->getRepository()->createDocument();
-                $document->setDomain($domain);
-                $document->setKey($key);
-                $document->setPath($domainTrans['path']);
-                $document->setFormat($domainTrans['format']);
-
-                foreach ($keyTrans as $locale => $trans) {
-                    $message = new Message();
-                    $message->setLocale($locale);
-                    $message->setMessage($trans);
-                    $document->addMessage($message);
+                    foreach ($keyTrans as $locale => $trans) {
+                        $message = new Message();
+                        $message->setLocale($locale);
+                        $message->setMessage($trans);
+                        $document->addMessage($message);
+                    }
+                    $this->getRepository()->getManager()->persist($document);
                 }
-                $this->getRepository()->getManager()->persist($document);
             }
         }
 

Tests/Functional/Service/ImportTest.php

@@ -54,11 +54,11 @@ public function getExpectedTranslationsData()
      */
     public function testImport($expectedTranslations)
     {
-        $importService = $this->getContainer()->get('ongr_translations.import');
+        $translations = $this->getContainer()->get('ongr_translations.import')->getTranslations();
 
         $this->assertArraySubset(
             $expectedTranslations['messages'],
-            $importService->getTranslations()['messages']['translations']
+            reset($translations)['messages']['translations']
         );
     }
 

Translation/Import/FileImport.php

@@ -20,11 +20,6 @@
  */
 class FileImport
 {
-    /**
-     * @var array
-     */
-    private $translations = [];
-
     /**
      * @var LoadersContainer
      */
@@ -49,21 +44,22 @@ public function import(SplFileInfo $file)
     {
         list($domain, $locale, $extension) = explode('.', $file->getFilename());
 
+        $translations = [];
+
         if ($this->loadersContainer->has($extension)) {
             /* @var MessageCatalogue $messageCatalogue */
             $messageCatalogue = $this->loadersContainer->get($extension)->load($file, $locale, $domain);
             $domainMessages = $messageCatalogue->all($domain);
 
             if (!empty($domainMessages)) {
-                $this->translations[$domain]['path'] = pathinfo($file->getPathname(), PATHINFO_DIRNAME);
-                $this->translations[$domain]['format'] = $file->getExtension();
-
+                $path = pathinfo($file->getPathname(), PATHINFO_DIRNAME);
+                $translations[$path][$domain]['format'] = $file->getExtension();
                 foreach ($domainMessages as $key => $content) {
-                    $this->translations[$domain]['translations'][$key][$locale] = $content;
+                    $translations[$path][$domain]['translations'][$key][$locale] = $content;
                 }
             }
         }
 
-        return $this->translations;
+        return $translations;
     }
 }