]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Use the correct template
authorJeremy Benoist <jeremy.benoist@gmail.com>
Sun, 20 Nov 2016 19:07:47 +0000 (20:07 +0100)
committerJeremy Benoist <jeremy.benoist@gmail.com>
Tue, 22 Nov 2016 20:23:58 +0000 (21:23 +0100)
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.

src/Wallabag/UserBundle/Resources/views/Resetting/check_email.html.twig [moved from src/Wallabag/UserBundle/Resources/views/Resetting/checkEmail.html.twig with 71% similarity]

similarity index 71%
rename from src/Wallabag/UserBundle/Resources/views/Resetting/checkEmail.html.twig
rename to src/Wallabag/UserBundle/Resources/views/Resetting/check_email.html.twig
index 66cbdc28a3812a74af26e4370a2170b8f23b1fee..e9d46dcc8ae7105cb1410455895f6d0447ab018e 100644 (file)
@@ -5,7 +5,7 @@
 {% block fos_user_content %}
 <div class="card-content">
     <div class="row">
-        {{ 'resetting.check_email'|trans({'%email%': email}) }}
+        <p>{{ 'resetting.check_email'|trans({'%tokenLifetime%': tokenLifetime}) }}</p>
     </div>
 </div>
 {% endblock fos_user_content %}