=fix a bug to allow the command to work with version 5.1 and 5.2

Author: malhayek2014

src/commands/CreateLanguageCommand.php

@@ -3,12 +3,11 @@
 namespace CrestApps\CodeGenerator\Commands;
 
 use File;
-use Lang;
 use Illuminate\Console\Command;
 use CrestApps\CodeGenerator\Support\Helpers;
 use CrestApps\CodeGenerator\Traits\CommonCommand;
 use CrestApps\CodeGenerator\Support\Label;
-
+use CrestApps\CodeGenerator\Support\CrestAppsTranslator;
 
 class CreateLanguageCommand extends Command
 {
@@ -82,7 +81,7 @@ protected function registerMessages(array $messages, $language)
     {
         if( count($messages) > 0)
         {
-            Lang::addLines($messages, $language);
+            $this->getTranslator()->addLines($messages, $language);
         }
 
         return $this;
@@ -98,7 +97,23 @@ protected function registerMessages(array $messages, $language)
      */
     protected function isMessageExists($key, $language)
     {   
-        return Lang::has($key, $language, false);
+        return $this->getTranslator()->has($key, $language, false);
+    }
+
+    /**
+     * Depends on the framework version, it a singleton instance of a translator.
+     *
+     * @return CrestApps\CodeGenerator\Support\CrestAppsTranslator | Illuminate\Translation\Translator
+     */
+    protected function getTranslator()
+    {
+
+        if(!$this->isNewerThan('5.3'))
+        {
+            return CrestAppsTranslator::getTranslator();
+        }
+
+        return app('translator');
     }
 
     /**

src/support/CrestAppsTranslator.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace CrestApps\CodeGenerator\Support;
+
+use Illuminate\Translation\Translator;
+use Illuminate\Support\Arr;
+
+class CrestAppsTranslator extends Translator
+{
+	 /**
+     * Add translation lines to the given locale.
+     *
+     * @param  array  $lines
+     * @param  string  $locale
+     * @param  string  $namespace
+     * @return void
+     */
+    public function addLines(array $lines, $locale, $namespace = '*')
+    {
+        foreach ($lines as $key => $value) {
+            list($group, $item) = explode('.', $key, 2);
+            Arr::set($this->loaded, "$namespace.$group.$locale.$item", $value);
+        }
+    }
+
+	 /**
+     * Adds a new instance of crestapps_translator to the IoC container,
+     *
+     * @return CrestApps\CodeGenerator\Support\CrestAppsTranslator
+     */
+    public static function getTranslator()
+    {
+    	$translator = app('translator');
+
+    	app()->singleton('crestapps_translator', function ($app) use($translator) {
+
+            $trans = new CrestAppsTranslator($translator->getLoader(), $translator->getLocale());
+
+            $trans->setFallback($translator->getFallback());
+
+            return $trans;
+        });
+
+        return app('crestapps_translator');
+    }
+
+
+}

src/traits/CommonCommand.php

@@ -39,21 +39,63 @@ protected function getFields($fields, $langFile, $fieldsFile = null)
         return Helpers::getFields($fields, $langFile);
     }
 
+    /**
+     * Evaluates the current version of the framework to see if it >= a giving version.
+     *
+     * @param $version
+     *
+     * @return bool
+     */
+    protected function isNewerThan($version = '5.3')
+    {
+        return (App::VERSION() >= $version);
+    }
+
     /**
      * Gets the correct routes fullname based on current framework version.
      *
      * @return string
      */
     protected function getRoutesFileName()
     {
-        if (App::VERSION() >= '5.3')
+        if ($this->isNewerThan())
         {
             return base_path('routes/web.php');
         }
 
         return app_path('Http/routes.php');
     }
 
+    /**
+     * Gets all command's arguments depending on the current framework version.
+     *
+     * @return string
+     */
+    public function arguments()
+    {
+        if ($this->isNewerThan())
+        {
+            return parent::arguments();
+        }
+
+        return parent::argument();
+    }
+
+    /**
+     * Gets all command's options depending on the current framework version.
+     *
+     * @return string
+     */
+    public function options()
+    {
+        if ($this->isNewerThan())
+        {
+            return parent::options();
+        }
+
+        return parent::option();
+    }
+
     /**
      * It Replaces the view names in a giving stub
      *