From 291242fcb0e75e0b3e7e23c2b1af3dd2c4a3b831 Mon Sep 17 00:00:00 2001 From: Jeramy Simpson Date: Wed, 18 Mar 2015 13:55:05 +1000 Subject: [PATCH] Update language references As a result of removing confide, the lang name for some text must change. --- app/Http/Controllers/UserController.php | 18 +++++++++--------- resources/lang/da/texts.php | 2 +- resources/lang/de/texts.php | 2 +- resources/lang/en/texts.php | 2 +- resources/lang/es/texts.php | 2 +- resources/lang/fr/texts.php | 2 +- resources/lang/it/texts.php | 2 +- resources/lang/lt/texts.php | 2 +- resources/lang/nb_NO/texts.php | 2 +- resources/lang/nl/texts.php | 2 +- resources/lang/pt_BR/texts.php | 12 ++++++++++++ 11 files changed, 30 insertions(+), 18 deletions(-) diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 9b761d12be07..b30cbe7505c3 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -85,7 +85,7 @@ class UserController extends BaseController $user->force_pdfjs = true; $user->save(); - Session::flash('message', trans('texts.confide.updated_settings')); + Session::flash('message', trans('texts.security.updated_settings')); return Redirect::to('/dashboard'); } @@ -306,7 +306,7 @@ class UserController extends BaseController // Check if there was too many login attempts if (Confide::isThrottled($input)) { - $err_msg = trans('texts.confide.too_many_attempts'); + $err_msg = trans('texts.security.too_many_attempts'); } /* elseif( $user->checkUserExists( $input ) and ! $user->isConfirmed( $input ) ) @@ -315,7 +315,7 @@ class UserController extends BaseController } */ else { - $err_msg = trans('texts.confide.wrong_credentials'); + $err_msg = trans('texts.security.wrong_credentials'); } return Redirect::action('UserController@login') @@ -332,7 +332,7 @@ class UserController extends BaseController public function confirm($code) { if (Confide::confirm($code)) { - $notice_msg = trans('texts.confide.confirmation'); + $notice_msg = trans('texts.security.confirmation'); $user = User::where('confirmation_code', '=', $code)->get()->first(); $user->confirmation_code = ''; @@ -353,7 +353,7 @@ class UserController extends BaseController } } } else { - $error_msg = trans('texts.confide.wrong_confirmation'); + $error_msg = trans('texts.security.wrong_confirmation'); return Redirect::action('UserController@login')->with('error', $error_msg); } @@ -376,7 +376,7 @@ class UserController extends BaseController { Confide::forgotPassword(Input::get('email')); - $notice_msg = trans('texts.confide.password_forgot'); + $notice_msg = trans('texts.security.password_forgot'); return Redirect::action('UserController@login') ->with('notice', $notice_msg); @@ -429,7 +429,7 @@ class UserController extends BaseController $user->password = Input::get('password'); $user->save(); - Session::flash('message', trans('texts.confide.password_reset')); + Session::flash('message', trans('texts.security.password_reset')); return Redirect::to('/dashboard'); } else { @@ -441,12 +441,12 @@ class UserController extends BaseController // By passing an array with the token, password and confirmation if (Confide::resetPassword($input)) { - $notice_msg = trans('texts.confide.password_reset'); + $notice_msg = trans('texts.security.password_reset'); return Redirect::action('UserController@login') ->with('notice', $notice_msg); } else { - $error_msg = trans('texts.confide.wrong_password_reset'); + $error_msg = trans('texts.security.wrong_password_reset'); return Redirect::action('UserController@reset_password', array('token' => $input['token'])) ->withInput() diff --git a/resources/lang/da/texts.php b/resources/lang/da/texts.php index 9df8d9e79d82..22cdf80da2e2 100644 --- a/resources/lang/da/texts.php +++ b/resources/lang/da/texts.php @@ -282,7 +282,7 @@ return array( 'cvv' => 'CVV', // Security alerts - 'confide' => [ + 'security' => [ 'too_many_attempts' => 'For mange forsøg. Prøv igen om nogen få minutter.', 'wrong_credentials' => 'Fejl e-mail eller adgangskode.', 'confirmation' => 'Din konto har blevet bekræftet!', diff --git a/resources/lang/de/texts.php b/resources/lang/de/texts.php index 87de74960d85..f40323baec73 100644 --- a/resources/lang/de/texts.php +++ b/resources/lang/de/texts.php @@ -277,7 +277,7 @@ return array( 'cvv' => 'Kartenprüfziffer', // Security alerts - 'confide' => array( + 'security' => array( 'too_many_attempts' => 'Zu viele Versuche. Bitte probiere es in ein paar Minuten erneut.', 'wrong_credentials' => 'Falsche E-Mail Adresse oder falsches Passwort.', 'confirmation' => 'Dein Konto wurde bestätigt!', diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 50727cfdd6c2..6899eaa70ac2 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -280,7 +280,7 @@ return array( 'cvv' => 'CVV', // Security alerts - 'confide' => [ + 'security' => [ 'too_many_attempts' => 'Too many attempts. Try again in few minutes.', 'wrong_credentials' => 'Incorrect email or password.', 'confirmation' => 'Your account has been confirmed!', diff --git a/resources/lang/es/texts.php b/resources/lang/es/texts.php index 5d5a04863c32..9be578dd69be 100644 --- a/resources/lang/es/texts.php +++ b/resources/lang/es/texts.php @@ -273,7 +273,7 @@ return array( 'cvv' => 'CVV', // Security alerts - 'confide' => array( + 'security' => array( 'too_many_attempts' => 'Demasiados intentos fallidos. Inténtalo de nuevo en un par de minutos.', 'wrong_credentials' => 'Contraseña o email incorrecto.', 'confirmation' => '¡Tu cuenta se ha confirmado!', diff --git a/resources/lang/fr/texts.php b/resources/lang/fr/texts.php index 9c78aa59e0ff..a0aa5cfe9c97 100644 --- a/resources/lang/fr/texts.php +++ b/resources/lang/fr/texts.php @@ -279,7 +279,7 @@ return array( 'cvv' => 'CVV', // Security alerts - 'confide' => array( + 'security' => array( 'too_many_attempts' => 'Trop de tentatives. Essayez à nouveau dans quelques minutes.', 'wrong_credentials' => 'Courriel ou mot de passe incorrect', 'confirmation' => 'Votre compte a été validé !', diff --git a/resources/lang/it/texts.php b/resources/lang/it/texts.php index b3c96be0a247..b04c0b3735ea 100644 --- a/resources/lang/it/texts.php +++ b/resources/lang/it/texts.php @@ -279,7 +279,7 @@ return array( 'cvv' => 'CVV', // Security alerts - 'confide' => [ + 'security' => [ 'too_many_attempts' => 'Troppi tentativi fatti. Riprova tra qualche minuto.', 'wrong_credentials' => 'Email o password non corretti.', 'confirmation' => 'Il tuo account è stato confermato!', diff --git a/resources/lang/lt/texts.php b/resources/lang/lt/texts.php index 81cfdee8f893..e9a89371e29a 100644 --- a/resources/lang/lt/texts.php +++ b/resources/lang/lt/texts.php @@ -280,7 +280,7 @@ return array( 'cvv' => 'CVV', // Security alerts - 'confide' => [ + 'security' => [ 'too_many_attempts' => 'Too many attempts. Try again in few minutes.', 'wrong_credentials' => 'Incorrect email or password.', 'confirmation' => 'Your account has been confirmed!', diff --git a/resources/lang/nb_NO/texts.php b/resources/lang/nb_NO/texts.php index 2d066fc016d7..b303e6d13a02 100644 --- a/resources/lang/nb_NO/texts.php +++ b/resources/lang/nb_NO/texts.php @@ -280,7 +280,7 @@ return array( 'cvv' => 'CVV', // Security alerts - 'confide' => [ + 'security' => [ 'too_many_attempts' => 'For mange forsøk. Prøv igjen om noen få minutter.', 'wrong_credentials' => 'Feil e-post eller passord.', 'confirmation' => 'Din konto har blitt bekreftet!', diff --git a/resources/lang/nl/texts.php b/resources/lang/nl/texts.php index 45304e64b143..cb87a1d03a3e 100644 --- a/resources/lang/nl/texts.php +++ b/resources/lang/nl/texts.php @@ -277,7 +277,7 @@ return array( 'cvv' => 'CVV', // Security alerts - 'confide' => [ + 'security' => [ 'too_many_attempts' => 'Te veel pogingen. Probeer opnieuw binnen enkele minuten.', 'wrong_credentials' => 'Verkeerd e-mailadres of paswoord.', 'confirmation' => 'Je account is bevestigd!', diff --git a/resources/lang/pt_BR/texts.php b/resources/lang/pt_BR/texts.php index 47ff16ff5dd6..4b5b1c6a0085 100644 --- a/resources/lang/pt_BR/texts.php +++ b/resources/lang/pt_BR/texts.php @@ -274,6 +274,18 @@ return array( 'expiration_year' => 'Ano de expiração', 'cvv' => 'CVV', + // This File was missing the security alerts. I'm not familiar with this language, Can someone translate? + // Security alerts + /*'security' => [ + 'too_many_attempts' => 'Too many attempts. Try again in few minutes.', + 'wrong_credentials' => 'Incorrect email or password.', + 'confirmation' => 'Your account has been confirmed!', + 'wrong_confirmation' => 'Wrong confirmation code.', + 'password_forgot' => 'The information regarding password reset was sent to your email.', + 'password_reset' => 'Your password has been changed successfully.', + 'wrong_password_reset' => 'Invalid password. Try again', + ],*/ + // Pro Plan 'pro_plan' => [ 'remove_logo' => ':link para remover a logo do Invoice Ninja contratando o plano profissional',