From 87fe9c17714c77f6b8e593197c797ea8e787b745 Mon Sep 17 00:00:00 2001 From: Kode Date: Wed, 16 Mar 2022 20:07:43 +0000 Subject: [PATCH] Move setLocale out of vie composer so it's available everywhere Fixes #776 --- app/Providers/AppServiceProvider.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index db1eda92..cfc8c4d5 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -52,6 +52,10 @@ class AppServiceProvider extends ServiceProvider Artisan::call('storage:link'); \Session::put('current_user', null); } + + $lang = Setting::fetch('language'); + \App::setLocale($lang); + $applications = Application::all(); if($applications->count() <= 0) { @@ -97,8 +101,6 @@ class AppServiceProvider extends ServiceProvider if($bg_image = Setting::fetch('background_image')) { $alt_bg = ' style="background-image: url(storage/'.$bg_image.')"'; } - $lang = Setting::fetch('language'); - \App::setLocale($lang); $allusers = User::all(); $current_user = User::currentUser();