Individual locales files (martinlindhe#22)

* Added Option to create Multiple Files with multiple languages so it can be implemented via Component based localization

* Added option to change Locales so we use Lang:get() on our language files on laravel and recive a pure js fully translated , example in php         'error' => Lang::get('errors.please_enter_valid',['label' => Lang::get('words.email')]),  on js
"en": {
        "email": {
            "error": "Please enter a valid Email Address",
        },
    },
    "es": {
        "email": {
            "error": "Por favor inserta un Correo Electronico correcto",
        },
    }

* Fixed multi line on privates
Added validation on allocateLocaleArray to prevent  creation of fileToCreate if no Locale is defined

Author: ferleal

src/Commands/GenerateInclude.php

@@ -11,7 +11,7 @@ class GenerateInclude extends Command
      *
      * @var string
      */
-    protected $signature = 'vue-i18n:generate {--umd}';
+    protected $signature = 'vue-i18n:generate {--umd} {--multi}';
 
     /**
      * The console command description.
@@ -30,11 +30,20 @@ public function handle()
 
         $umd = $this->option('umd');
 
+        $multipleFiles = $this->option('multi');
+
+        if ($multipleFiles) {
+            $files = (new Generator)
+                ->generateMultiple($root, $umd);
+            echo "Written to :" . PHP_EOL . $files . PHP_EOL;
+            exit();
+        }
+
         $data = (new Generator)
             ->generateFromPath($root, $umd);
 
-        $jsFile = base_path() . config('vue-i18n-generator.jsFile');
 
+        $jsFile = base_path() . config('vue-i18n-generator.jsFile');
         file_put_contents($jsFile, $data);
 
         echo "Written to " . $jsFile . PHP_EOL;

src/Generator.php

@@ -2,9 +2,14 @@
 
 use DirectoryIterator;
 use Exception;
+use App;
 
 class Generator
 {
+
+    private $availableLocales = [];
+    private $filesToCreate = [];
+
     /**
      * @param string $path
      * @param boolean $umd
@@ -14,13 +19,12 @@ class Generator
     public function generateFromPath($path, $umd = null)
     {
         if (!is_dir($path)) {
-            throw new Exception('Directory not found: '.$path);
+            throw new Exception('Directory not found: ' . $path);
         }
 
         $locales = [];
         $dir = new DirectoryIterator($path);
         $jsBody = '';
-
         foreach ($dir as $fileinfo) {
             if (!$fileinfo->isDot()
                 && !in_array($fileinfo->getFilename(), ['vendor'])
@@ -39,20 +43,79 @@ public function generateFromPath($path, $umd = null)
                 } else {
                     $locales[$noExt] = $local;
                 }
+
+
             }
         }
 
         $jsonLocales = json_encode($locales, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE) . PHP_EOL;
 
-        if(!$umd) {
-            $jsBody  = $this->getES6Module($jsonLocales);
+        if (!$umd) {
+            $jsBody = $this->getES6Module($jsonLocales);
         } else {
             $jsBody = $this->getUMDModule($jsonLocales);
         }
-
         return $jsBody;
     }
 
+    /**
+     * @param string $path
+     * @param boolean $umd
+     * @return string
+     * @throws Exception
+     */
+    public function generateMultiple($path, $umd = null)
+    {
+        if (!is_dir($path)) {
+            throw new Exception('Directory not found: ' . $path);
+        }
+        $jsPath = base_path() . config('vue-i18n-generator.jsPath');
+        $locales = [];
+        $fileToCreate = '';
+        $createdFiles = '';
+        $dir = new DirectoryIterator($path);
+        $jsBody = '';
+        foreach ($dir as $fileinfo) {
+            if (!$fileinfo->isDot()
+                && !in_array($fileinfo->getFilename(), ['vendor'])
+            ) {
+                $noExt = $this->removeExtension($fileinfo->getFilename());
+                if (!in_array($noExt, $this->availableLocales)) {
+                    App::setLocale($noExt);
+                    $this->availableLocales[] = $noExt;
+                }
+                if ($fileinfo->isDir()) {
+                    $local = $this->allocateLocaleArray($fileinfo->getRealPath());
+                } else {
+                    $local = $this->allocateLocaleJSON($fileinfo->getRealPath());
+                    if ($local === null) continue;
+                }
+
+                if (isset($locales[$noExt])) {
+                    $locales[$noExt] = array_merge($local, $locales[$noExt]);
+                } else {
+                    $locales[$noExt] = $local;
+                }
+
+
+            }
+        }
+        foreach ($this->filesToCreate as $fileName => $data) {
+            $fileToCreate = $jsPath . $fileName . '.js';
+            $createdFiles .= $fileToCreate . PHP_EOL;
+            $jsonLocales = json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE) . PHP_EOL;
+
+            if (!$umd) {
+                $jsBody = $this->getES6Module($jsonLocales);
+            } else {
+                $jsBody = $this->getUMDModule($jsonLocales);
+            }
+            file_put_contents($fileToCreate, $jsBody);
+        }
+        return $createdFiles;
+    }
+
+
     /**
      * @param string $path
      * @return array
@@ -63,9 +126,9 @@ private function allocateLocaleJSON($path)
         if (pathinfo($path, PATHINFO_EXTENSION) !== 'json') {
             return null;
         }
-        $tmp = (array) json_decode(file_get_contents($path));
+        $tmp = (array)json_decode(file_get_contents($path));
         if (gettype($tmp) !== "array") {
-            throw new Exception('Unexpected data while processing '.$path);
+            throw new Exception('Unexpected data while processing ' . $path);
         }
 
         return $tmp;
@@ -78,8 +141,8 @@ private function allocateLocaleJSON($path)
     private function allocateLocaleArray($path)
     {
         $data = [];
-
         $dir = new DirectoryIterator($path);
+        $lastLocale = last($this->availableLocales);
         foreach ($dir as $fileinfo) {
             // Do not mess with dotfiles at all.
             if ($fileinfo->isDot()) {
@@ -88,6 +151,7 @@ private function allocateLocaleArray($path)
 
             if ($fileinfo->isDir()) {
                 // Recursivley iterate through subdirs, until everything is allocated.
+
                 $data[$fileinfo->getFilename()] =
                     $this->allocateLocaleArray($path . '/' . $fileinfo->getFilename());
             } else {
@@ -98,16 +162,24 @@ private function allocateLocaleArray($path)
                 if (pathinfo($fileName, PATHINFO_EXTENSION) !== 'php') {
                     continue;
                 }
+
+
                 $tmp = include($fileName);
+
                 if (gettype($tmp) !== "array") {
-                    throw new Exception('Unexpected data while processing '.$fileName);
+                    throw new Exception('Unexpected data while processing ' . $fileName);
                     continue;
                 }
+                if($lastLocale !== false){
+                    $root = realpath(base_path() . config('vue-i18n-generator.langPath') . '/' . $lastLocale);
+                    $filePath = $this->removeExtension(str_replace('\\', '_', ltrim(str_replace($root, '', realpath($fileName)), '\\')));
+                    $this->filesToCreate[$filePath][$lastLocale] = $this->adjustArray($tmp);
+                }
 
                 $data[$noExt] = $this->adjustArray($tmp);
+
             }
         }
-
         return $data;
     }
 
@@ -118,15 +190,14 @@ private function allocateLocaleArray($path)
     private function adjustArray(array $arr)
     {
         $res = [];
-
         foreach ($arr as $key => $val) {
+
             if (is_string($val)) {
                 $res[$key] = $this->adjustString($val);
             } else {
                 $res[$key] = $this->adjustArray($val);
             }
         }
-
         return $res;
     }
 

src/config/vue-i18n-generator.php

@@ -23,6 +23,6 @@
     | Note: the path will be prepended to point to the App directory.
     |
     */
-
+    'jsPath' => '/resources/assets/js/langs/',
     'jsFile' => '/resources/assets/js/vue-i18n-locales.generated.js'
 ];