diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2017-05-09 13:55:31 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2017-05-09 13:55:31 +0200 |
| commit | 54c2d164a362e64a320438b439bf9dd6d2c02424 (patch) | |
| tree | dc25a86685524e642cedfd95d02736ef06b28f77 /src/Wallabag/UserBundle/Resources | |
| parent | b28c5430efefa63d04d87404c99798e82d0427e4 (diff) | |
| parent | c829b06ed8f757f2b96515eb872f9ccf20363c94 (diff) | |
| download | wallabag-54c2d164a362e64a320438b439bf9dd6d2c02424.tar.gz wallabag-54c2d164a362e64a320438b439bf9dd6d2c02424.tar.zst wallabag-54c2d164a362e64a320438b439bf9dd6d2c02424.zip | |
Merge remote-tracking branch 'origin/master' into 2.3
Diffstat (limited to 'src/Wallabag/UserBundle/Resources')
| -rw-r--r-- | src/Wallabag/UserBundle/Resources/views/Security/login.html.twig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig b/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig index fc0d97e7..32984c84 100644 --- a/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig +++ b/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | <div class="card-content"> | 5 | <div class="card-content"> |
| 6 | 6 | ||
| 7 | {% if error %} | 7 | {% if error %} |
| 8 | <script>Materialize.toast('{{ error.message }}', 4000)</script> | 8 | <script>Materialize.toast('{{ error.messageKey|trans(error.messageData, 'security') }}', 4000)</script> |
| 9 | {% endif %} | 9 | {% endif %} |
| 10 | 10 | ||
| 11 | {% for flashMessage in app.session.flashbag.get('notice') %} | 11 | {% for flashMessage in app.session.flashbag.get('notice') %} |