From ac6c5bd1be79f3dce6460b1b06ac3817bb139168 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Azevedo?= Date: Fri, 24 Nov 2023 12:11:04 +0000 Subject: [PATCH 1/2] Fix on lang folder location error for Laravel version >= 9 --- .../LaravelJsLocalizationServiceProvider.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Mariuzzo/LaravelJsLocalization/LaravelJsLocalizationServiceProvider.php b/src/Mariuzzo/LaravelJsLocalization/LaravelJsLocalizationServiceProvider.php index eab4548..f0255b6 100644 --- a/src/Mariuzzo/LaravelJsLocalization/LaravelJsLocalizationServiceProvider.php +++ b/src/Mariuzzo/LaravelJsLocalization/LaravelJsLocalizationServiceProvider.php @@ -74,6 +74,8 @@ public function register() $langs = $app['path.base'].'/app/lang'; } elseif ($laravelMajorVersion >= 5) { $langs = $app['path.base'].'/resources/lang'; + } elseif ($laravelMajorVersion >= 9) { + $langs = $app['path.base'].'/lang'; } $messages = $app['config']->get('localization-js.messages'); $generator = new Generators\LangJsGenerator($files, $langs, $messages); From 3c74b6b38acfdcee96e34cbe260353b00a1a62a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Azevedo?= Date: Thu, 14 Dec 2023 09:22:08 +0000 Subject: [PATCH 2/2] Fix on version if statement for laravel version --- .../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 f0255b6..a53a9f6 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 && $laravelMajorVersion < 9) { $langs = $app['path.base'].'/resources/lang'; } elseif ($laravelMajorVersion >= 9) { $langs = $app['path.base'].'/lang';