Export and Import Message::DEFAULT_LOCALE

models/MessageExport.php

@@ -5,14 +5,15 @@
 class MessageExport extends ExportModel
 {
     const CODE_COLUMN_NAME = 'code';
+    const DEFAULT_LOCALE_COLUMN_NAME = 'default';
 
     /**
      * exports the message data with each locale in a separate column.
      *
-     * code  | en    | de    | fr
-     * -------------------------------
-     * title | Title | Titel | Titre
-     * name  | Name  | Name  | Prénom
+     * code      | default   | en    | de    | fr
+     * ----------------------------------------------
+     * title     | title     | Title | Titel | Titre
+     * item.name | Item Name | Name  | Name  | Prénom
      * ...
      *
      * @param $columns
@@ -21,6 +22,7 @@ class MessageExport extends ExportModel
      */
     public function exportData($columns, $sessionKey = null)
     {
+
         return Message::all()->map(function($message) use($columns) {
             $data = $message->message_data;
             // add code to data to simplify algorithm
@@ -36,8 +38,11 @@ public function exportData($columns, $sessionKey = null)
 
     public static function getColumns()
     {
-        // code column + all existing locales
-        return array_merge([self::CODE_COLUMN_NAME => self::CODE_COLUMN_NAME],
-            Locale::lists(self::CODE_COLUMN_NAME, self::CODE_COLUMN_NAME));
+        // code, default column + all existing locales
+        return array_merge([
+            self::CODE_COLUMN_NAME => self::CODE_COLUMN_NAME,
+            Message::DEFAULT_LOCALE => Message::DEFAULT_LOCALE,
+        ], Locale::lists(self::CODE_COLUMN_NAME, self::CODE_COLUMN_NAME));
     }
+
 }

models/MessageImport.php

@@ -38,14 +38,11 @@ public function importData($results, $sessionKey = null)
 
                     $message = Message::firstOrNew(['code' => $code]);
 
-                    // create empty array, if $message is new
-                    $message->message_data = $message->message_data ?: [];
-
-                    if(!isset($message->message_data[Message::DEFAULT_LOCALE])) {
+                    // write default if not existing
+                    if(!isset($result[Message::DEFAULT_LOCALE])) {
                         $result[Message::DEFAULT_LOCALE] = $code;
                     }
-
-                    $message->message_data = array_merge($message->message_data, $result);
+                    $message->message_data = array_merge($message->message_data ?: [], $result);
 
                     if ($message->exists) {
                         $this->logUpdated();
@@ -57,6 +54,7 @@ public function importData($results, $sessionKey = null)
                     $this->logSkipped($index, 'no code provided');
                 }
             } catch (\Exception $exception) {
+                echo $exception->getMessage();
                 $this->logError($index, $exception->getMessage());
             }
         }

tests/unit/models/ExportMessageTest.php

@@ -1,6 +1,7 @@
 <?php namespace RainLab\Translate\Tests\Unit\Models;
 
 use PluginTestCase;
+use RainLab\Translate\Models\Locale;
 use RainLab\Translate\Models\Message;
 use RainLab\Translate\Models\MessageExport;
 
@@ -70,6 +71,21 @@ public function testCanHandleNonExistingColumns()
         $this->assertEquals($expected, $result);
     }
 
+    public function testGetColumns()
+    {
+        Locale::unguard();
+        Locale::create(['code' => 'de', 'name' => 'German', 'is_enabled' => true]);
+
+        $columns = MessageExport::getColumns();
+
+        $this->assertEquals([
+            MessageExport::CODE_COLUMN_NAME => MessageExport::CODE_COLUMN_NAME,
+            Message::DEFAULT_LOCALE => Message::DEFAULT_LOCALE,
+            'en' => 'en',
+            'de' => 'de',
+        ], $columns);
+    }
+
     private function createMessages()
     {
         Message::create([

tests/unit/models/ImportMessageTest.php

@@ -71,4 +71,25 @@ public function testMissingCodeIsSkipped()
         $this->assertEquals(true, $stats->hasMessages);
         $this->assertEquals(Message::count(), 0);
     }
+
+    public function testDefaultLocaleIsImported()
+    {
+        $messageImport = new MessageImport();
+        $data = [
+            ['code' => 'test.me', 'x' => 'foo bar', 'de' => 'Neu 2', 'en' => 'new 2']
+        ];
+
+        $messageImport->importData($data);
+
+        $stats = $messageImport->getResultStats();
+        $this->assertEquals(1, $stats->created);
+        $this->assertEquals(0, $stats->updated);
+        $this->assertEquals(0, $stats->skippedCount);
+        $this->assertEquals(false, $stats->hasMessages);
+        $this->assertEquals(Message::count(), 1);
+
+        $message = Message::where('code', 'test.me')->first();
+
+        $this->assertEquals('foo bar', $message->message_data['x']);
+    }
 }