From 8da0107c644972ed37e7ef3eb76480c88d2984f7 Mon Sep 17 00:00:00 2001 From: evilangelmd Date: Mon, 6 Mar 2017 11:32:51 +0100 Subject: [PATCH 1/2] Update LaravelJsLocalizationServiceProvider.php Bugfix for L4 --- .../LaravelJsLocalizationServiceProvider.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Mariuzzo/LaravelJsLocalization/LaravelJsLocalizationServiceProvider.php b/src/Mariuzzo/LaravelJsLocalization/LaravelJsLocalizationServiceProvider.php index 6f5fc8a..3fe58af 100644 --- a/src/Mariuzzo/LaravelJsLocalization/LaravelJsLocalizationServiceProvider.php +++ b/src/Mariuzzo/LaravelJsLocalization/LaravelJsLocalizationServiceProvider.php @@ -65,8 +65,16 @@ public function register() { // Bind the Laravel JS Localization command into the app IOC. $this->app->singleton('localization.js', function ($app) { + $app = $this->app; + $laravelMajorVersion = (int) $app::VERSION; + $files = $app['files']; - $langs = $app['path.base'].'/resources/lang'; + + if ($laravelMajorVersion === 4) { + $langs = $app['path.base'].'/app/lang'; + }} elseif ($laravelMajorVersion === 5) { + $langs = $app['path.base'].'/resources/lang'; + } $messages = $app['config']->get('localization-js.messages'); $generator = new Generators\LangJsGenerator($files, $langs, $messages); From bb0b6fb2d46ceaf1fced59e2227b8615f78f722c Mon Sep 17 00:00:00 2001 From: evilangelmd Date: Mon, 6 Mar 2017 11:38:19 +0100 Subject: [PATCH 2/2] Update LaravelJsLocalizationServiceProvider.php --- .../LaravelJsLocalizationServiceProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mariuzzo/LaravelJsLocalization/LaravelJsLocalizationServiceProvider.php b/src/Mariuzzo/LaravelJsLocalization/LaravelJsLocalizationServiceProvider.php index 3fe58af..b34b96a 100644 --- a/src/Mariuzzo/LaravelJsLocalization/LaravelJsLocalizationServiceProvider.php +++ b/src/Mariuzzo/LaravelJsLocalization/LaravelJsLocalizationServiceProvider.php @@ -72,7 +72,7 @@ public function register() if ($laravelMajorVersion === 4) { $langs = $app['path.base'].'/app/lang'; - }} elseif ($laravelMajorVersion === 5) { + } elseif ($laravelMajorVersion === 5) { $langs = $app['path.base'].'/resources/lang'; } $messages = $app['config']->get('localization-js.messages');