From 3c5b7b672e5fa5645226d124bcb82509aec06956 Mon Sep 17 00:00:00 2001 From: Baptiste Lemoine Date: Tue, 18 Sep 2018 16:47:58 +0200 Subject: [PATCH] login translate --- .../views/Security/login.html.twig | 66 ++++++++++--------- translations/messages.en.yml | 19 ++++-- .../{messages.fr.yaml => messages.fr.yml} | 10 ++- 3 files changed, 56 insertions(+), 39 deletions(-) rename translations/{messages.fr.yaml => messages.fr.yml} (61%) diff --git a/app/Resources/FOSUserBundle/views/Security/login.html.twig b/app/Resources/FOSUserBundle/views/Security/login.html.twig index 784de4b6..f06bbb7b 100755 --- a/app/Resources/FOSUserBundle/views/Security/login.html.twig +++ b/app/Resources/FOSUserBundle/views/Security/login.html.twig @@ -8,37 +8,6 @@ Se connecter - {% if error %} -
{{ error.messageKey|trans(error.messageData, 'security') }}
- {% endif %} - -
- {% if csrf_token %} - - {% endif %} -
- - - -
-
- - - - -
-
- - - - -
- - -
category-listing -
@@ -60,7 +29,42 @@
+
+
+
+ + {% if error %} +
{{ error.messageKey|trans(error.messageData, 'security') }}
+ {% endif %} + +
+ {% if csrf_token %} + + {% endif %} +
+ + + +
+
+ + + + +
+
+ + +
+ + +
+
+
+
{% endblock %} diff --git a/translations/messages.en.yml b/translations/messages.en.yml index 53c319e7..8e44dc87 100644 --- a/translations/messages.en.yml +++ b/translations/messages.en.yml @@ -1,15 +1,22 @@ -layout.login: login -layout.logout: logout -layout.register: subscribe -'Symfony is great': 'J''aime Symfony' +layout: + login: login + logout: logout + register: subscribe menu: title: Caisse Bliss dashboard: Dashboard history: History import: Import - festival: Festivals + festivals: Festivals products: Products categories: Categories future: Forecast user: - greet: Hi \ No newline at end of file + greet: Hi +security: + login: + username: utilisateur + password: mot de passe + remember_me: se souvenir + submit: envoyer +'Symfony is great': 'J''aime Symfony' diff --git a/translations/messages.fr.yaml b/translations/messages.fr.yml similarity index 61% rename from translations/messages.fr.yaml rename to translations/messages.fr.yml index fc45745c..162eb003 100755 --- a/translations/messages.fr.yaml +++ b/translations/messages.fr.yml @@ -7,9 +7,15 @@ menu: dashboard: Dashboard history: Historique import: Importer - festival: Festivals + festivals: Festivals products: Produits categories: Catégories future: Prévisionnel user: - greet: Bonjour \ No newline at end of file + greet: Bonjour +security: + login: + username: utilisateur + password: mot de passe + remember_me: se souvenir + submit: envoyer \ No newline at end of file