Skip to content

Commit a792243

Browse files
committed
tests + front components, started back translations
1 parent 0ba13ab commit a792243

36 files changed

+1953
-145
lines changed

app/Http/Controllers/Settings/LanguageController.php

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,16 @@ public function update(Request $request): RedirectResponse
1818
'locale' => ['required', 'string', Rule::in(['en', 'fr'])],
1919
]);
2020

21-
$request->user()->update([
22-
'locale' => $validated['locale'],
23-
]);
21+
// Update user's locale preference if authenticated
22+
if ($request->user()) {
23+
$request->user()->update([
24+
'locale' => $validated['locale'],
25+
]);
26+
}
27+
28+
// Set session locale for both authenticated and guest users
29+
$request->session()->put('locale', $validated['locale']);
2430

25-
return back()->with('status', 'Language updated successfully');
31+
return back()->with('status', __('messages.language_updated'));
2632
}
2733
}

app/Http/Controllers/Settings/PasswordController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ public function update(Request $request): RedirectResponse
3434
'password' => Hash::make($validated['password']),
3535
]);
3636

37-
return back();
37+
return back()->with('status', __('messages.password_updated'));
3838
}
3939
}

app/Http/Controllers/Settings/ProfileController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function update(ProfileUpdateRequest $request): RedirectResponse
3737

3838
$request->user()->save();
3939

40-
return to_route('profile.edit');
40+
return to_route('profile.edit')->with('status', __('messages.profile_updated'));
4141
}
4242

4343
/**

app/Http/Middleware/SetUserLocale.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@ public function handle(Request $request, Closure $next): Response
1919
// Priority 1: User's saved locale preference
2020
if ($userLocale = $request->user()?->locale) {
2121
App::setLocale($userLocale);
22+
2223
return $next($request);
2324
}
2425

2526
// Priority 2: Session locale (for guest users who changed language)
2627
if ($sessionLocale = $request->session()->get('locale')) {
2728
if (in_array($sessionLocale, $this->getSupportedLocales())) {
2829
App::setLocale($sessionLocale);
30+
2931
return $next($request);
3032
}
3133
}
@@ -49,20 +51,23 @@ private function setLocaleFromBrowser(Request $request): void
4951
$normalizedLocale = str_replace('_', '-', strtolower($browserLocale));
5052
if (in_array($normalizedLocale, $supportedLocales)) {
5153
App::setLocale($normalizedLocale);
54+
5255
return;
5356
}
5457

5558
// Try language code only (e.g., en from en-US)
5659
$languageCode = strtolower(substr($browserLocale, 0, 2));
5760
if (in_array($languageCode, $supportedLocales)) {
5861
App::setLocale($languageCode);
62+
5963
return;
6064
}
6165

6266
// Try to find a supported locale that starts with the language code
6367
foreach ($supportedLocales as $supportedLocale) {
64-
if (str_starts_with($supportedLocale, $languageCode . '-')) {
68+
if (str_starts_with($supportedLocale, $languageCode.'-')) {
6569
App::setLocale($supportedLocale);
70+
6671
return;
6772
}
6873
}

components.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
{
2-
"$schema": "https://shadcn-vue.com/schema.json",
3-
"style": "default",
4-
"tsx": true,
5-
"tailwind": {
6-
"config": "tailwind.config.js",
7-
"css": "resources/css/app.css",
8-
"baseColor": "neutral",
9-
"cssVariables": true,
10-
"prefix": ""
11-
},
12-
"aliases": {
13-
"components": "@/components",
14-
"composables": "@/composables",
15-
"utils": "@/lib/utils",
16-
"ui": "@/components/ui",
17-
"lib": "@/lib"
18-
},
19-
"iconLibrary": "lucide"
20-
}
2+
"$schema": "https://shadcn-vue.com/schema.json",
3+
"style": "new-york",
4+
"typescript": true,
5+
"tailwind": {
6+
"config": "",
7+
"css": "resources/css/app.css",
8+
"baseColor": "neutral",
9+
"cssVariables": true,
10+
"prefix": ""
11+
},
12+
"aliases": {
13+
"components": "@/components",
14+
"composables": "@/composables",
15+
"utils": "@/lib/utils",
16+
"ui": "@/components/ui",
17+
"lib": "@/lib"
18+
},
19+
"iconLibrary": "lucide"
20+
}

config/app.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136

137137
'available_locales' => [
138138
'en',
139-
'fr'
139+
'fr',
140140
],
141141

142142
];

0 commit comments

Comments
 (0)