From ec27889086da1bc40e178b53f42c658f5aa8d133 Mon Sep 17 00:00:00 2001
From: Attila Kerekes <ak@enrg8.com>
Date: Thu, 17 Nov 2022 17:12:24 +0100
Subject: [PATCH] fix: User language setting

---
 app/Providers/AppServiceProvider.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index da7f2789..cede5237 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -28,9 +28,6 @@ class AppServiceProvider extends ServiceProvider
             \Session::put('current_user', null);
         }
 
-        $lang = Setting::fetch('language');
-        \App::setLocale($lang);
-
         $applications = Application::all();
         if ($applications->count() <= 0) {
             if (class_exists('ZipArchive')) {
@@ -74,6 +71,9 @@ class AppServiceProvider extends ServiceProvider
             $allusers = User::all();
             $current_user = User::currentUser();
 
+            $lang = Setting::fetch('language');
+            \App::setLocale($lang);
+
             $view->with('alt_bg', $alt_bg);
             $view->with('allusers', $allusers);
             $view->with('current_user', $current_user);