Skip to content

Commit 2020fdf

Browse files
committed
remove comments
1 parent e3f66d6 commit 2020fdf

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

app/Http/Controllers/Settings/LanguageController.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,15 @@ class LanguageController extends Controller
1515
public function update(Request $request): RedirectResponse
1616
{
1717
$validated = $request->validate([
18-
'locale' => ['required', 'string', Rule::in(['en', 'fr'])],
18+
'locale' => ['required', 'string', Rule::in(config('app.available_locales'))],
1919
]);
2020

21-
// Update user's locale preference if authenticated
2221
if ($request->user()) {
2322
$request->user()->update([
2423
'locale' => $validated['locale'],
2524
]);
2625
}
2726

28-
// Set session locale for both authenticated and guest users
2927
$request->session()->put('locale', $validated['locale']);
3028

3129
return back()->with('status', __('messages.language_updated'));

app/Http/Middleware/SetUserLocale.php

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,12 @@ class SetUserLocale
1616
*/
1717
public function handle(Request $request, Closure $next): Response
1818
{
19-
// Priority 1: User's saved locale preference
2019
if ($userLocale = $request->user()?->locale) {
2120
App::setLocale($userLocale);
2221

2322
return $next($request);
2423
}
2524

26-
// Priority 2: Session locale (for guest users who changed language)
2725
if ($sessionLocale = $request->session()->get('locale')) {
2826
if (in_array($sessionLocale, $this->getSupportedLocales())) {
2927
App::setLocale($sessionLocale);
@@ -32,7 +30,6 @@ public function handle(Request $request, Closure $next): Response
3230
}
3331
}
3432

35-
// Priority 3: Browser language preferences
3633
$this->setLocaleFromBrowser($request);
3734

3835
return $next($request);
@@ -47,23 +44,22 @@ private function setLocaleFromBrowser(Request $request): void
4744
$supportedLocales = $this->getSupportedLocales();
4845

4946
foreach ($browserLocales as $browserLocale) {
50-
// Try exact match first (e.g., en-US)
5147
$normalizedLocale = str_replace('_', '-', strtolower($browserLocale));
48+
5249
if (in_array($normalizedLocale, $supportedLocales)) {
5350
App::setLocale($normalizedLocale);
5451

5552
return;
5653
}
5754

58-
// Try language code only (e.g., en from en-US)
5955
$languageCode = strtolower(substr($browserLocale, 0, 2));
56+
6057
if (in_array($languageCode, $supportedLocales)) {
6158
App::setLocale($languageCode);
6259

6360
return;
6461
}
6562

66-
// Try to find a supported locale that starts with the language code
6763
foreach ($supportedLocales as $supportedLocale) {
6864
if (str_starts_with($supportedLocale, $languageCode.'-')) {
6965
App::setLocale($supportedLocale);
@@ -73,7 +69,6 @@ private function setLocaleFromBrowser(Request $request): void
7369
}
7470
}
7571

76-
// Fallback to default locale if no match found
7772
App::setLocale(config('app.locale'));
7873
}
7974

0 commit comments

Comments
 (0)