Add published vendor translation (martinlindhe#37)

* Added vendor directory parsing

* Added with-vendor command options

* Added with-vendor command options

* fixed test temp directory path

Author: Mohammad Roseffendi

.gitignore

@@ -1,2 +1,2 @@
 /vendor
-/.idea
+/.idea

src/Commands/GenerateInclude.php

@@ -11,7 +11,7 @@ class GenerateInclude extends Command
      *
      * @var string
      */
-    protected $signature = 'vue-i18n:generate {--umd} {--multi}';
+    protected $signature = 'vue-i18n:generate {--umd} {--multi} {--with-vendor}';
 
     /**
      * The console command description.
@@ -32,6 +32,8 @@ public function handle()
 
         $multipleFiles = $this->option('multi');
 
+        $withVendor = $this->option('with-vendor');
+
         $i18nLib = config('vue-i18n-generator.i18nLib');
 
         if ($multipleFiles) {
@@ -42,7 +44,7 @@ public function handle()
         }
 
         $data = (new Generator($i18nLib))
-            ->generateFromPath($root, $umd);
+            ->generateFromPath($root, $umd, $withVendor);
 
 
 

src/Generator.php

@@ -28,10 +28,11 @@ public function __construct($i18nLib = self::VUE_I18N)
     /**
      * @param string $path
      * @param boolean $umd
+     * @param boolean $withVendor
      * @return string
      * @throws Exception
      */
-    public function generateFromPath($path, $umd = null)
+    public function generateFromPath($path, $umd = null, $withVendor = false)
     {
         if (!is_dir($path)) {
             throw new Exception('Directory not found: ' . $path);
@@ -41,9 +42,11 @@ public function generateFromPath($path, $umd = null)
         $dir = new DirectoryIterator($path);
         $jsBody = '';
         foreach ($dir as $fileinfo) {
-            if (!$fileinfo->isDot()
-                && !in_array($fileinfo->getFilename(), ['vendor'])
-            ) {
+            if (!$fileinfo->isDot()) {
+                if(!$withVendor && in_array($fileinfo->getFilename(), ['vendor'])) {
+                    continue;
+                }
+
                 $noExt = $this->removeExtension($fileinfo->getFilename());
 
                 if ($fileinfo->isDir()) {
@@ -58,11 +61,11 @@ public function generateFromPath($path, $umd = null)
                 } else {
                     $locales[$noExt] = $local;
                 }
-
-
             }
         }
 
+        $locales = $this->adjustVendor($locales);
+
         $jsonLocales = json_encode($locales, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE) . PHP_EOL;
 
         if (!$umd) {
@@ -221,6 +224,30 @@ private function adjustArray(array $arr)
         return $res;
     }
 
+    /**
+     * Adjus vendor index placement.
+     * 
+     * @param array $locales
+     * 
+     * @return array
+     */
+    private function adjustVendor($locales)
+    {
+        if(isset($locales['vendor'])) {
+            foreach($locales['vendor'] as $vendor => $data) {
+                foreach($data as $key => $group) {
+                    foreach($group as $locale => $lang) {
+                        $locales[$locale]['vendor'][$vendor][$key] = $lang;
+                    }
+                }
+            }
+
+            unset($locales['vendor']);
+        }
+
+        return $locales;
+    }
+
     /**
      * Turn Laravel style ":link" into vue-i18n style "{link}" and
      * turn Laravel style "|" into vuex-i18n style ":::" when using vuex-i18n.

tests/GenerateTest.php

@@ -107,6 +107,54 @@ function testBasic()
                 ]
             ]
         ];
+        $root = $this->generateLocaleFilesFrom($arr);
+        $this->assertEquals(
+            'export default {' . PHP_EOL
+            . '    "en": {' . PHP_EOL
+            . '        "help": {' . PHP_EOL
+            . '            "yes": "yes",' . PHP_EOL
+            . '            "no": "no"' . PHP_EOL
+            . '        }' . PHP_EOL
+            . '    },' . PHP_EOL
+            . '    "sv": {' . PHP_EOL
+            . '        "help": {' . PHP_EOL
+            . '            "yes": "ja",' . PHP_EOL
+            . '            "no": "nej"' . PHP_EOL
+            . '        }' . PHP_EOL
+            . '    }' . PHP_EOL
+            . '}' . PHP_EOL,
+            (new Generator)->generateFromPath($root));
+        $this->destroyLocaleFilesFrom($arr, $root);
+    }
+
+    function testBasicWithVendor()
+    {
+        $arr = [
+            'en' => [
+                'help' => [
+                    'yes' => 'yes',
+                    'no' => 'no',
+                ]
+            ],
+            'sv' => [
+                'help' => [
+                    'yes' => 'ja',
+                    'no' => 'nej',
+                ]
+            ],
+            'vendor' => [
+                'test-vendor' => [
+                    'test-lang' => [
+                        'en' => [
+                            'maybe' => 'maybe'
+                        ],
+                        'sv' => [
+                            'maybe' => 'kanske'
+                        ]
+                    ]
+                ]
+            ],
+        ];
 
         $root = $this->generateLocaleFilesFrom($arr);
 
@@ -116,16 +164,30 @@ function testBasic()
             . '        "help": {' . PHP_EOL
             . '            "yes": "yes",' . PHP_EOL
             . '            "no": "no"' . PHP_EOL
+            . '        },' . PHP_EOL
+            . '        "vendor": {' . PHP_EOL
+            . '            "test-vendor": {' . PHP_EOL
+            . '                "test-lang": {' . PHP_EOL
+            . '                    "maybe": "maybe"' . PHP_EOL
+            . '                }' . PHP_EOL
+            . '            }' . PHP_EOL
             . '        }' . PHP_EOL
             . '    },' . PHP_EOL
             . '    "sv": {' . PHP_EOL
             . '        "help": {' . PHP_EOL
             . '            "yes": "ja",' . PHP_EOL
             . '            "no": "nej"' . PHP_EOL
+            . '        },' . PHP_EOL
+            . '        "vendor": {' . PHP_EOL
+            . '            "test-vendor": {' . PHP_EOL
+            . '                "test-lang": {' . PHP_EOL
+            . '                    "maybe": "kanske"' . PHP_EOL
+            . '                }' . PHP_EOL
+            . '            }' . PHP_EOL
             . '        }' . PHP_EOL
             . '    }' . PHP_EOL
             . '}' . PHP_EOL,
-            (new Generator)->generateFromPath($root));
+            (new Generator)->generateFromPath($root, false, true));
 
         $this->destroyLocaleFilesFrom($arr, $root);
     }