einundzwanzig/einundzwanzig-app
1
0
Fork 0
mirror of https://github.com/HolgerHatGarKeineNode/einundzwanzig-app.git synced 2025-12-14 12:06:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

⚙️ Preserve user language preference in DomainMiddleware and adjust locale‑setting logic to avoid overwriting existing session values while still configuring domain‑specific app settings.

Browse Source
This commit is contained in:
HolgerHatGarKeineNode
2025-12-09 23:41:44 +01:00
parent c6c524a876
commit 52c05e6d47
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/Http/Middleware/DomainMiddleware.php
View File

@@ -49,16 +49,29 @@ class DomainMiddleware
];
// App-Locale dynamisch setzen
if (isset($domainArray[$domain]['locale'])) {
session([
'lang_country' => $domainArray[$domain]['lang_country'],
'locale' => $domainArray[$domain]['locale'],
]);
if (isset($domainArray[$domain])) {
$domainConfig = $domainArray[$domain];
// Only set session values if they are not already set (first visit)
// This allows user language preferences to persist
if (! session()->has('lang_country')) {
session(['lang_country' => $domainConfig['lang_country']]);
}
if (! session()->has('locale')) {
session(['locale' => $domainConfig['locale']]);
}
// Always set config values for the domain
config([
'app.name' => $domainArray[$domain]['app_name'],
'app.domain_country' => $domainArray[$domain]['locale'],
'app.name' => $domainConfig['app_name'],
'app.domain_country' => $domainConfig['locale'],
]);
App::setLocale($domainArray[$domain]['locale']);
// Set app locale based on user's current lang_country preference
$currentLangCountry = session('lang_country', $domainConfig['lang_country']);
$currentLocale = explode('-', $currentLangCountry)[0];
App::setLocale($currentLocale);
}
return $next($request);