Translate sentence. Different response for logout

ZanichelliEditore · Nov 19, 2018 · 420ab97 · 420ab97
1 parent 2b7292e
commit 420ab97
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/app/Http/Controllers/JwtAuth/LoginController.php b/app/Http/Controllers/JwtAuth/LoginController.php
@@ -274,7 +274,11 @@ public function logout(Request $request){
 
         auth()->logout(true, true);
 
-        return response([], 200);
+        if($request->ajax() || $request->wantsJson()){
+            response([], 200);
+        } else {
+            return redirect('loginForm');
+        }
     }
 
     private function getUserSession(Request $request){

diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php
@@ -38,6 +38,7 @@
     'label-login' => 'Login',
     'label-registration-success' => 'Successful registration! Check your mail box to verify your e-mail address',
     'label-account-actived' => 'Account successfully activated',
-    'label-logout' => 'Logout'
+    'label-logout' => 'Logout',
+    'label-logged' => 'is logged'
 
 ];
diff --git a/resources/lang/it/auth.php b/resources/lang/it/auth.php
@@ -24,5 +24,6 @@
     'label-login' => 'Accedi',
     'label-registration-success' => 'Registrazione avvenuta con successo! Accedi alla tua casella di posta per verificare la tua e-mail',
     'label-account-actived' => 'Account attivato correttamente',
-    'label-logout' => 'Esci'
+    'label-logout' => 'Esci',
+    'label-logged' => 'sei autenticato'
 ];
diff --git a/resources/views/auth/logged.blade.php b/resources/views/auth/logged.blade.php
@@ -1,5 +1,5 @@
 @extends('base')
 
 @section('content')
-    <h4 class="text-center mt-5">{{ session()->get('user')->name }} sei già loggato</h4>
+    <h4 class="text-center mt-5">{{ session()->get('user')->name }} @lang('auth.label-logged')</h4>
 @endsection