Merge remote-tracking branch 'origin/master' into 2.3

2017-05-09 13:55:31 +02:00
parent b28c5430ef c829b06ed8
commit 54c2d164a3
13 changed files with 37 additions and 11 deletions
--- a/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig
@ -5,7 +5,7 @@
    <div class="card-content">

        {% if error %}
-            <script>Materialize.toast('{{ error.message }}', 4000)</script>
+            <script>Materialize.toast('{{ error.messageKey|trans(error.messageData, 'security') }}', 4000)</script>
        {% endif %}

        {% for flashMessage in app.session.flashbag.get('notice') %}