From 0076cfba2ef677110f7bf7e90d4bf276c5dcc206 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Sat, 23 Jul 2016 23:54:57 +0200 Subject: [PATCH] FIX: use LaravelLocalizationServiceProvider in CLI, but do not throw exceptions when table languages is missing --- .../LaravelLocalizationServiceProvider.php | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/app/Providers/LaravelLocalizationServiceProvider.php b/app/Providers/LaravelLocalizationServiceProvider.php index 14c7ac44..30b153dc 100644 --- a/app/Providers/LaravelLocalizationServiceProvider.php +++ b/app/Providers/LaravelLocalizationServiceProvider.php @@ -11,17 +11,16 @@ class LaravelLocalizationServiceProvider extends ServiceProvider { public function register() { - // localization is not important in running in CLI - if (App::runningInConsole()) { - return; + try { + $languages = DB::table('languages') + ->get(); + } catch (\Exception $e) { + $languages = []; } - $languages = DB::table('languages') - ->get(); - $supportedLocales = []; if (empty($languages)) { - $supportedLocales[config('app.locale')] = (object)[ + $supportedLocales[config('app.locale')] = [ 'native' => env('LOCALE_NATIVE_NAME'), 'script' => env('LOCALE_SCRIPT'), 'name' => env('LOCALE_TRANSLATED_NAME'), @@ -29,7 +28,11 @@ class LaravelLocalizationServiceProvider extends ServiceProvider ]; // create default language - Language::create((array)$supportedLocales[config('app.locale')]); + try { + Language::create($supportedLocales[config('app.locale')]); + } catch (\Exception $e) { + // ignore, table languages probably does not exist. + } } foreach ($languages as $language) {