Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-10-31 01:08:26 +00:00
Code Issues Actions Projects Releases Wiki Activity

translation of error message

Browse Source 
refs #3455 and refs #333
[ci skip]
This commit is contained in:
Julien Fastré
2014-11-19 13:39:46 +01:00
parent 68a3ed70f1
commit b43ee26c81
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Controller/LoginController.php
View File

@@ -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()
));
}

7
Resources/translations/messages.fr.yml
View File

@@ -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"
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%