also load and publish json translations (#32)

* also load and publish json translations * apply StyleCI recommendations
overtrue · Sep 1, 2018 · 6367499 · 6367499
1 parent e73aa56
commit 6367499
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/Commands/Publish.php b/src/Commands/Publish.php
@@ -47,6 +47,7 @@ public function handle()
         $force = $this->option('force') ? 'f' : 'n';
 
         $sourcePath = base_path('vendor/caouecs/laravel-lang/src');
+        $sourceJsonPath = base_path('vendor/caouecs/laravel-lang/json');
         $targetPath = base_path('resources/lang/');
 
         if (!is_dir($targetPath) && !mkdir($targetPath)) {
@@ -59,7 +60,10 @@ public function handle()
         $inLumen = $this->laravel instanceof \Laravel\Lumen\Application;
 
         if ('all' == $locale) {
-            $files = [$sourcePath.'/*'];
+            $files = [
+                $sourcePath.'/*',
+                $jsonSourcePath,
+            ];
             $message = 'all';
             $copyEnFiles = true;
         } else {
@@ -70,6 +74,7 @@ public function handle()
                     continue;
                 }
                 $file = $sourcePath.'/'.trim($filename);
+                $jsonFile = $jsonSourcePath.'/'.trim($filename).'.json';
 
                 if (!file_exists($file)) {
                     $this->error("lang '$filename' not found.");
@@ -79,6 +84,13 @@ public function handle()
 
                 $published[] = $filename;
                 $files[] = $file;
+
+                if (!file_exists($jsonFile)) {
+                    $this->error("lang '$filename' not found.");
+
+                    continue;
+                }
+                $files[] = $jsonFile;
             }
 
             if (empty($files)) {

diff --git a/src/TranslationServiceProvider.php b/src/TranslationServiceProvider.php
@@ -49,12 +49,15 @@ protected function registerLoader()
                 base_path('vendor/caouecs/laravel-lang/src/'),
             ];
 
+            $jsonPath = base_path('vendor/caouecs/laravel-lang/json/');
+
             if ($this->inLumen) {
                 $this->app['path.lang'] = base_path('vendor/laravel/lumen-framework/resources/lang');
                 array_push($paths, base_path('resources/lang/'));
             }
 
-            return new FileLoader($app['files'], $app['path.lang'], $paths);
+            return (new FileLoader($app['files'], $app['path.lang'], $paths))
+                ->addJsonPath($jsonPath);
         });
     }