update filament + change admin access class to ad

This commit is contained in:
xiaomlove
2022-07-19 13:28:04 +08:00
parent 2912c89202
commit 64809aa436
9 changed files with 706 additions and 1480 deletions
+21 -3
View File
@@ -8,6 +8,7 @@ use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\Cookie;
class Locale
{
@@ -29,10 +30,14 @@ class Locale
$user = $request->user();
if ($user) {
$locale = $user->locale;
do_log("user: {$user->id}, set locale: $locale");
App::setLocale($locale);
Carbon::setLocale($locale);
do_log("locale from user: {$user->id}, set locale: $locale");
} else {
$locale = self::getLocaleFromCookie() ?? 'en';
do_log("locale from cookie, set locale: $locale");
}
App::setLocale($locale);
Carbon::setLocale($locale);
/** @var Response $response */
$response = $next($request);
if ($response instanceof Response || $response instanceof JsonResponse) {
@@ -41,4 +46,17 @@ class Locale
return $response;
}
public static function getLocaleFromCookie()
{
if (IN_NEXUS) {
$lang = get_langfolder_cookie();
$log = "IN_NEXUS, get_langfolder_cookie(): $lang";
} else {
$lang = Cookie::get('c_lang_folder');
$log = "Cookie::get(): $lang";
}
do_log($log);
return self::$languageMaps[$lang] ?? null;
}
}