From 5699e021de4a69d3cef44a64fcd4ab3be8e98bb4 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 20 Mar 2019 00:50:09 -0700 Subject: [PATCH] Update auth controllers to use translations --- app/Http/Controllers/Auth/LoginController.php | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 99464ffdbe..eca1e4d3da 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -210,7 +210,7 @@ class LoginController extends Controller { if (!Auth::check()) { - return redirect()->route('login')->with('error', 'You must be logged in.'); + return redirect()->route('login')->with('error', trans('auth/general.login_prompt')); } @@ -218,10 +218,9 @@ class LoginController extends Controller $user = Auth::user(); if (($user->two_factor_secret!='') && ($user->two_factor_enrolled==1)) { - return redirect()->route('two-factor')->with('error', 'Your device is already enrolled.'); + return redirect()->route('two-factor')->with('error', trans('auth/message.two_factor.already_enrolled')); } - $google2fa = new Google2FA(); $secret = $google2fa->generateSecretKey(); $user->two_factor_secret = $secret; @@ -242,7 +241,7 @@ class LoginController extends Controller public function getTwoFactorAuth() { if (!Auth::check()) { - return redirect()->route('login')->with('error', 'You must be logged in.'); + return redirect()->route('login')->with('error', trans('auth/general.login_prompt')); } $user = Auth::user(); @@ -263,11 +262,11 @@ class LoginController extends Controller { if (!Auth::check()) { - return redirect()->route('login')->with('error', 'You must be logged in.'); + return redirect()->route('login')->with('error', trans('auth/general.login_prompt')); } if (!$request->has('two_factor_secret')) { - return redirect()->route('two-factor')->with('error', 'Two-factor code is required.'); + return redirect()->route('two-factor')->with('error', trans('auth/message.two_factor.code_required')); } $user = Auth::user(); @@ -281,8 +280,7 @@ class LoginController extends Controller return redirect()->route('home')->with('success', 'You are logged in!'); } - \Log::debug('Did not match'); - return redirect()->route('two-factor')->with('error', 'Invalid two-factor code'); + return redirect()->route('two-factor')->with('error', trans('auth/message.two_factor.invalid_code')); } @@ -305,7 +303,7 @@ class LoginController extends Controller return redirect()->away($customLogoutUrl); } - return redirect()->route('login')->with('success', 'You have successfully logged out!'); + return redirect()->route('login')->with('success', trans('auth/general.logout.success')); }