diff --git a/app/Resources/translations/messages.en.xlf b/app/Resources/translations/messages.en.xlf new file mode 100644 index 0000000..674d6da --- /dev/null +++ b/app/Resources/translations/messages.en.xlf @@ -0,0 +1,35 @@ + + + + + + Sign in + Sign in + + + Sign out + Sign out + + + Rights + all rights reserved. + + + Admin + Admin + + + Register + Register + + + About + About + + + Home + Home + + + + diff --git a/app/Resources/translations/messages.fr.xlf b/app/Resources/translations/messages.fr.xlf new file mode 100644 index 0000000..2b1aa53 --- /dev/null +++ b/app/Resources/translations/messages.fr.xlf @@ -0,0 +1,35 @@ + + + + + + Sign in + Connexion + + + Sign out + Déconnection + + + Rights + tous droits réservés. + + + Admin + Administration + + + Register + Inscription + + + About + A propos + + + Home + Accueil + + + + diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig index 0e67e5a..8536a5e 100644 --- a/app/Resources/views/base.html.twig +++ b/app/Resources/views/base.html.twig @@ -19,23 +19,29 @@ @@ -43,9 +49,13 @@
  • {% if is_granted("IS_AUTHENTICATED_REMEMBERED") %} {{ app.user.username }} - - Déconnection + + {% trans %}Sign out{% endtrans %} + {% else %} - Connexion + + {% trans %}Sign in{% endtrans %} + {% endif %}
    • @@ -55,7 +65,7 @@ diff --git a/app/config/config.yml b/app/config/config.yml index 9890ae7..9ba81f2 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -10,7 +10,8 @@ parameters: framework: #esi: ~ - #translator: { fallbacks: ["%locale%"] } + default_locale: en + translator: { fallbacks: [en] } secret: "%secret%" router: resource: "%kernel.root_dir%/config/routing.yml" @@ -22,7 +23,6 @@ framework: templating: engines: ['twig'] #assets_version: SomeVersionScheme - default_locale: "%locale%" trusted_hosts: ~ trusted_proxies: ~ session: diff --git a/src/UserBundle/Resources/translations/messages.en.xlf b/src/UserBundle/Resources/translations/messages.en.xlf new file mode 100644 index 0000000..2af18d7 --- /dev/null +++ b/src/UserBundle/Resources/translations/messages.en.xlf @@ -0,0 +1,27 @@ + + + + + + Username + Username + + + Password + Password + + + Remember me + Remember me + + + Sign in + Sign in + + + Error sign in + An error ocurred during the sign in process + + + + diff --git a/src/UserBundle/Resources/translations/messages.fr.xlf b/src/UserBundle/Resources/translations/messages.fr.xlf index fd59e6c..35f86f8 100644 --- a/src/UserBundle/Resources/translations/messages.fr.xlf +++ b/src/UserBundle/Resources/translations/messages.fr.xlf @@ -3,8 +3,24 @@ - Symfony2 is great - J'aime Symfony2 + Username + Identifiant + + + Password + Mot de passe + + + Remember me + Se souvenir de moi + + + Sign in + Connection + + + Error sign in + Une erreur est survenue ou votre demande d'inscription n'a pas été validé. diff --git a/src/UserBundle/Resources/views/Security/login.html.twig b/src/UserBundle/Resources/views/Security/login.html.twig index 51832d4..4b92d8d 100644 --- a/src/UserBundle/Resources/views/Security/login.html.twig +++ b/src/UserBundle/Resources/views/Security/login.html.twig @@ -4,7 +4,10 @@
    {% if error %} {% endif %} @@ -14,14 +17,18 @@
    - +
    - +
    @@ -32,7 +39,8 @@
    @@ -41,7 +49,9 @@
    - +