From cefe07d218c92ed0a90ad701a349834207c9a4cd Mon Sep 17 00:00:00 2001
From: jatdung <48778797+dairidong@users.noreply.github.com>
Date: Fri, 24 Feb 2023 01:24:11 +0800
Subject: [PATCH] fix language setting only available in view (#1117)

---
 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 136907e3..ec597799 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -43,6 +43,9 @@ class AppServiceProvider extends ServiceProvider
             ProcessApps::dispatch();
         }
 
+        $lang = Setting::fetch('language');
+        \App::setLocale($lang);
+
         // User specific settings need to go here as session isn't available at this point in the app
         view()->composer('*', function ($view) {
             if (isset($_SERVER['HTTP_AUTHORIZATION']) && ! empty($_SERVER['HTTP_AUTHORIZATION'])) {
@@ -77,9 +80,6 @@ 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);