fix: User language setting
This commit is contained in:
parent
aba1f37b1c
commit
ec27889086
|
@ -28,9 +28,6 @@ class AppServiceProvider extends ServiceProvider
|
||||||
\Session::put('current_user', null);
|
\Session::put('current_user', null);
|
||||||
}
|
}
|
||||||
|
|
||||||
$lang = Setting::fetch('language');
|
|
||||||
\App::setLocale($lang);
|
|
||||||
|
|
||||||
$applications = Application::all();
|
$applications = Application::all();
|
||||||
if ($applications->count() <= 0) {
|
if ($applications->count() <= 0) {
|
||||||
if (class_exists('ZipArchive')) {
|
if (class_exists('ZipArchive')) {
|
||||||
|
@ -74,6 +71,9 @@ class AppServiceProvider extends ServiceProvider
|
||||||
$allusers = User::all();
|
$allusers = User::all();
|
||||||
$current_user = User::currentUser();
|
$current_user = User::currentUser();
|
||||||
|
|
||||||
|
$lang = Setting::fetch('language');
|
||||||
|
\App::setLocale($lang);
|
||||||
|
|
||||||
$view->with('alt_bg', $alt_bg);
|
$view->with('alt_bg', $alt_bg);
|
||||||
$view->with('allusers', $allusers);
|
$view->with('allusers', $allusers);
|
||||||
$view->with('current_user', $current_user);
|
$view->with('current_user', $current_user);
|
||||||
|
|
Loading…
Reference in a new issue