accept multiple files

renatomarinho · Apr 17, 2017 · 9c78214 · 9c78214
1 parent e908e34
commit 9c78214
Showing 1 changed file with 11 additions and 17 deletions.
diff --git a/src/MultiLanguage.php b/src/MultiLanguage.php
@@ -13,28 +13,16 @@
 
 trait MultiLanguage
 {
-    private $appName;
     private $languageKeys;
     private $languages;
     private $languageDirectories;
 
     public function init()
     {
-        $this->setAppName();
         $this->setLanguageDirectories();
         $this->listLanguages();
     }
 
-    private function setAppName()
-    {
-        $this->appName = strtolower(config('app.name')).'.';
-    }
-
-    private function getAppName()
-    {
-        return $this->appName;
-    }
-
     private function setLanguageDirectories()
     {
         $this->languageDirectories = File::directories(resource_path().'/lang');
@@ -56,10 +44,15 @@ public function generateFile()
         $finder->in($this->languageDirectories);
 
         foreach ($finder as $file) {
+            $path = pathinfo($file);
             $arrFile = include $file;
-
+            $arr = [];
             foreach ($this->languageKeys as $value) {
-                $arr[$value] = $arrFile[$value] ?? $this->getAppName().$value;
+                $exp = explode('.', $value);
+                if ($exp[0] == $path['filename']) {
+                    $value = str_replace($path['filename'].'.', '', $value );
+                    $arr[$value] = $arrFile[$value] ?? $path['filename'].'.'.$value;
+                }
             }
 
             $this->putFile($file, $arr);
@@ -75,8 +68,9 @@ public function putFile($file, $arr)
         $template .= "\n";
         $template .= str_replace($search, $replace, $this->banner());
         $template .= "\n\r";
-        $template .= 'return '.var_export($arr, true).';';
-
+        if (!empty($arr)) {
+            $template .= 'return '.var_export($arr, true).';';
+        }
         File::put($file, $template);
         $this->line('Put file '.$file);
     }
@@ -120,7 +114,7 @@ public function find()
         foreach ($finder as $file) {
             if (preg_match_all("/$pattern/siU", $file->getContents(), $matches)) {
                 foreach ($matches[2] as $key) {
-                    $keys[] = str_replace($this->getAppName(), '', $key);
+                    $keys[] = $key;
                 }
             }