diff --git a/config/app.php b/config/app.php index b5a8266add2..98fda3e316c 100644 --- a/config/app.php +++ b/config/app.php @@ -78,9 +78,9 @@ 'providers' => [ App\Providers\AppServiceProvider::class, - Illuminate\Translation\TranslationServiceProvider::class, - Illuminate\Validation\ValidationServiceProvider::class, Hyde\Framework\HydeServiceProvider::class, + Hyde\Framework\Providers\TranslationServiceProvider::class, + Illuminate\Validation\ValidationServiceProvider::class, ], /* diff --git a/packages/framework/src/Framework/HydeServiceProvider.php b/packages/framework/src/Framework/HydeServiceProvider.php index 8f89ecadffd..48541b98027 100644 --- a/packages/framework/src/Framework/HydeServiceProvider.php +++ b/packages/framework/src/Framework/HydeServiceProvider.php @@ -9,7 +9,6 @@ use Hyde\Framework\Concerns\RegistersFileLocations; use Hyde\Framework\Features\DataCollections\DataCollectionServiceProvider; use Hyde\Framework\Features\Session\SessionServiceProvider; -use Hyde\Framework\Providers\TranslationServiceProvider; use Hyde\Framework\Services\AssetService; use Hyde\Framework\Services\YamlConfigurationService; use Hyde\Framework\Views\Components\LinkComponent; @@ -115,6 +114,5 @@ protected function registerModuleServiceProviders(): void $this->app->register(SessionServiceProvider::class); $this->app->register(HydeConsoleServiceProvider::class); $this->app->register(DataCollectionServiceProvider::class); - $this->app->register(TranslationServiceProvider::class); } } diff --git a/packages/framework/src/Framework/Providers/TranslationServiceProvider.php b/packages/framework/src/Framework/Providers/TranslationServiceProvider.php index 235d036df02..b6d450e939d 100644 --- a/packages/framework/src/Framework/Providers/TranslationServiceProvider.php +++ b/packages/framework/src/Framework/Providers/TranslationServiceProvider.php @@ -5,15 +5,16 @@ namespace Hyde\Framework\Providers; use function config; -use Illuminate\Contracts\Support\DeferrableProvider; -use Illuminate\Support\ServiceProvider; +use Illuminate\Translation\TranslationServiceProvider as IlluminateTranslationServiceProvider; use function is_dir; use function lang_path; -class TranslationServiceProvider extends ServiceProvider implements DeferrableProvider +class TranslationServiceProvider extends IlluminateTranslationServiceProvider { public function register(): void { + parent::register(); + if (! is_dir(lang_path())) { $this->app->useLangPath(__DIR__.'/../../../resources/lang'); }