Skip to content

Commit 420ab97

Browse files
author
andrea.decastri
committed
Translate sentence. Different response for logout
1 parent 2b7292e commit 420ab97

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

app/Http/Controllers/JwtAuth/LoginController.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,11 @@ public function logout(Request $request){
274274

275275
auth()->logout(true, true);
276276

277-
return response([], 200);
277+
if($request->ajax() || $request->wantsJson()){
278+
response([], 200);
279+
} else {
280+
return redirect('loginForm');
281+
}
278282
}
279283

280284
private function getUserSession(Request $request){

resources/lang/en/auth.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
'label-login' => 'Login',
3939
'label-registration-success' => 'Successful registration! Check your mail box to verify your e-mail address',
4040
'label-account-actived' => 'Account successfully activated',
41-
'label-logout' => 'Logout'
41+
'label-logout' => 'Logout',
42+
'label-logged' => 'is logged'
4243

4344
];

resources/lang/it/auth.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,6 @@
2424
'label-login' => 'Accedi',
2525
'label-registration-success' => 'Registrazione avvenuta con successo! Accedi alla tua casella di posta per verificare la tua e-mail',
2626
'label-account-actived' => 'Account attivato correttamente',
27-
'label-logout' => 'Esci'
27+
'label-logout' => 'Esci',
28+
'label-logged' => 'sei autenticato'
2829
];
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@extends('base')
22

33
@section('content')
4-
<h4 class="text-center mt-5">{{ session()->get('user')->name }} sei già loggato</h4>
4+
<h4 class="text-center mt-5">{{ session()->get('user')->name }} @lang('auth.label-logged')</h4>
55
@endsection

0 commit comments

Comments
 (0)