From d7acde5cc3e391c4588c94f71252418ee39d13a2 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 20 Nov 2016 20:07:47 +0100 Subject: Use the correct template MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When resetting the password, the overriden template we used wasn’t well spelled. And since we are using a locked version of FOSUser (on a custom commit), the translation of `resetting.check_email` is wrong in any language but english. --- .../UserBundle/Resources/views/Resetting/checkEmail.html.twig | 11 ----------- .../Resources/views/Resetting/check_email.html.twig | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 src/Wallabag/UserBundle/Resources/views/Resetting/checkEmail.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/Resetting/check_email.html.twig (limited to 'src/Wallabag/UserBundle/Resources/views/Resetting') diff --git a/src/Wallabag/UserBundle/Resources/views/Resetting/checkEmail.html.twig b/src/Wallabag/UserBundle/Resources/views/Resetting/checkEmail.html.twig deleted file mode 100644 index 66cbdc28..00000000 --- a/src/Wallabag/UserBundle/Resources/views/Resetting/checkEmail.html.twig +++ /dev/null @@ -1,11 +0,0 @@ -{% extends "FOSUserBundle::layout.html.twig" %} - -{% trans_default_domain 'FOSUserBundle' %} - -{% block fos_user_content %} -
-
- {{ 'resetting.check_email'|trans({'%email%': email}) }} -
-
-{% endblock fos_user_content %} diff --git a/src/Wallabag/UserBundle/Resources/views/Resetting/check_email.html.twig b/src/Wallabag/UserBundle/Resources/views/Resetting/check_email.html.twig new file mode 100644 index 00000000..e9d46dcc --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/Resetting/check_email.html.twig @@ -0,0 +1,11 @@ +{% extends "FOSUserBundle::layout.html.twig" %} + +{% trans_default_domain 'FOSUserBundle' %} + +{% block fos_user_content %} +
+
+

{{ 'resetting.check_email'|trans({'%tokenLifetime%': tokenLifetime}) }}

+
+
+{% endblock fos_user_content %} -- cgit v1.2.3