From b43ee26c81c290881bc8243541920808dd205549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 19 Nov 2014 13:39:46 +0100 Subject: [PATCH] translation of error message refs #3455 and refs #333 [ci skip] --- Controller/LoginController.php | 2 +- Resources/translations/messages.fr.yml | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Controller/LoginController.php b/Controller/LoginController.php index 1f3637130..72f8a28fb 100644 --- a/Controller/LoginController.php +++ b/Controller/LoginController.php @@ -37,7 +37,7 @@ class LoginController extends Controller return $this->render('ChillMainBundle:Login:login.html.twig', array( 'last_username' => $lastUsername, - 'error' => $error + 'error' => (empty($error)) ? $error : $error->getMessage() )); } diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml index c31e98fd7..3a016743d 100644 --- a/Resources/translations/messages.fr.yml +++ b/Resources/translations/messages.fr.yml @@ -2,4 +2,9 @@ Search a person: Rechercher une personne Person name: Nom / Prénom de la personne Login: Connexion Logout: Se déconnecter -Homepage: "Page d'accueil" \ No newline at end of file +Bad credentials: Le mot de passe et le nom d'utilisateur ne correspondent pas +Invalid CSRF token.: Votre session a expirée ou est devenue invalide. +Username: Nom d'utilisateur +Password: Mot de passe +Welcome to %installation_name%: Bienvenue à %installation_name% +Login to %installation_name%: Connexion à %installation_name% \ No newline at end of file