From 22b3ea3bdbcea36bceefcb2f4e96a59e68b23a8f Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Sat, 21 Jul 2018 07:36:14 +0800 Subject: [PATCH] Move lang stubs to stubs/resources/lang directory --- src/Generators/LangFileGenerator.php | 12 ++++++------ src/stubs/{lang-app.stub => resources/lang/en/app.stub} | 0 src/stubs/{lang.stub => resources/lang/en/master.stub} | 0 src/stubs/{lang-app-id.stub => resources/lang/id/app.stub} | 0 src/stubs/{lang-id.stub => resources/lang/id/master.stub} | 0 5 files changed, 6 insertions(+), 6 deletions(-) rename src/stubs/{lang-app.stub => resources/lang/en/app.stub} (100%) rename src/stubs/{lang.stub => resources/lang/en/master.stub} (100%) rename src/stubs/{lang-app-id.stub => resources/lang/id/app.stub} (100%) rename src/stubs/{lang-id.stub => resources/lang/id/master.stub} (100%) diff --git a/src/Generators/LangFileGenerator.php b/src/Generators/LangFileGenerator.php index 1004f37..20da9a5 100644 --- a/src/Generators/LangFileGenerator.php +++ b/src/Generators/LangFileGenerator.php @@ -17,7 +17,7 @@ class LangFileGenerator extends BaseGenerator $this->createAppLangFile($langPath); - $this->generateFile($langPath.'/'.$this->modelNames['lang_name'].'.php', $this->getContent('lang-'.$locale)); + $this->generateFile($langPath.'/'.$this->modelNames['lang_name'].'.php', $this->getContent($locale)); $this->command->info($this->modelNames['lang_name'].' lang files generated.'); } @@ -25,14 +25,14 @@ class LangFileGenerator extends BaseGenerator /** * {@inheritDoc} */ - public function getContent(string $stubName) + public function getContent(string $locale) { - $langStubPath = __DIR__.'/../stubs/'.$stubName.'.stub'; + $langStubPath = __DIR__.'/../stubs/resources/lang/'.$locale.'/master.stub'; if ($this->files->exists($langStubPath)) { $stub = $this->files->get($langStubPath); } else { - $stub = $this->files->get(__DIR__.'/../stubs/lang.stub'); + $stub = $this->files->get(__DIR__.'/../stubs/resources/lang/en/master.stub'); } $displayModelName = ucwords(str_replace('_', ' ', snake_case($this->modelNames['model_name']))); @@ -69,12 +69,12 @@ class LangFileGenerator extends BaseGenerator { $locale = config('app.locale'); - $langStubPath = __DIR__.'/../stubs/lang-app-'.$locale.'.stub'; + $langStubPath = __DIR__.'/../stubs/resources/lang/'.$locale.'/app.stub'; if ($this->files->exists($langStubPath)) { $stub = $this->files->get($langStubPath); } else { - $stub = $this->files->get(__DIR__.'/../stubs/lang-app.stub'); + $stub = $this->files->get(__DIR__.'/../stubs/resources/lang/en/app.stub'); } return $stub; } diff --git a/src/stubs/lang-app.stub b/src/stubs/resources/lang/en/app.stub similarity index 100% rename from src/stubs/lang-app.stub rename to src/stubs/resources/lang/en/app.stub diff --git a/src/stubs/lang.stub b/src/stubs/resources/lang/en/master.stub similarity index 100% rename from src/stubs/lang.stub rename to src/stubs/resources/lang/en/master.stub diff --git a/src/stubs/lang-app-id.stub b/src/stubs/resources/lang/id/app.stub similarity index 100% rename from src/stubs/lang-app-id.stub rename to src/stubs/resources/lang/id/app.stub diff --git a/src/stubs/lang-id.stub b/src/stubs/resources/lang/id/master.stub similarity index 100% rename from src/stubs/lang-id.stub rename to src/stubs/resources/lang/id/master.stub