From f800c3a76d120ea64facbacc5bda787145b75273 Mon Sep 17 00:00:00 2001 From: Diego Souza Date: Sun, 8 Sep 2019 04:07:23 -0300 Subject: [PATCH] fix for undefined property in SetupController [fixes #3774] --- app/Http/Controllers/SetupController.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php index 6055d8a8709b..52bf51f7a3bd 100644 --- a/app/Http/Controllers/SetupController.php +++ b/app/Http/Controllers/SetupController.php @@ -134,18 +134,21 @@ public function __construct() */ public function getIndex() { - $supportedLanguages = Request::getLanguages(); + $requestedLanguages = Request::getLanguages(); $userLanguage = Config::get('app.locale'); + $langs = Config::get('langs'); - foreach ($supportedLanguages as $language) { + foreach ($requestedLanguages as $language) { $language = str_replace('_', '-', $language); - if (isset($this->langs[$language])) { + if (isset($langs[$language])) { $userLanguage = $language; break; } } + app('translator')->setLocale($userLanguage); + // Since .env may already be configured, we should show that data! $cacheConfig = [ 'driver' => Config::get('cache.default'),