diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2019-07-26 14:10:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-26 14:10:17 +0200 |
commit | 13fddc353ef71db56d478d6f969d2984e247739d (patch) | |
tree | 331594a590ea6f82ba15457f0f86e9491d1f85da /src/Wallabag | |
parent | 02a7eb84354cce56c73b4e8fb8294dc67909513f (diff) | |
parent | 1ebc8e1f024ae0f13a495872ba7b3705251bfc1f (diff) | |
download | wallabag-13fddc353ef71db56d478d6f969d2984e247739d.tar.gz wallabag-13fddc353ef71db56d478d6f969d2984e247739d.tar.zst wallabag-13fddc353ef71db56d478d6f969d2984e247739d.zip |
Merge pull request #4068 from wallabag/dependabot/composer/scheb/two-factor-bundle-4.4.0
Bump scheb/two-factor-bundle from 3.21.0 to 4.4.0
Diffstat (limited to 'src/Wallabag')
3 files changed, 5 insertions, 5 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/otp_app.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/otp_app.html.twig index 0919646e..1d3685ae 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/otp_app.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/otp_app.html.twig | |||
@@ -35,7 +35,7 @@ | |||
35 | <div class="card-content"> | 35 | <div class="card-content"> |
36 | <div class="row"> | 36 | <div class="row"> |
37 | <div class="input-field col s12"> | 37 | <div class="input-field col s12"> |
38 | <label for="_auth_code">{{ "scheb_two_factor.auth_code"|trans }}</label> | 38 | <label for="_auth_code">{{ "auth_code"|trans({}, 'SchebTwoFactorBundle') }}</label> |
39 | <input id="_auth_code" type="text" autocomplete="off" name="_auth_code" /> | 39 | <input id="_auth_code" type="text" autocomplete="off" name="_auth_code" /> |
40 | </div> | 40 | </div> |
41 | </div> | 41 | </div> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/otp_app.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/otp_app.html.twig index 7875d787..6f405d7f 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/otp_app.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/otp_app.html.twig | |||
@@ -39,7 +39,7 @@ | |||
39 | <div class="card-content"> | 39 | <div class="card-content"> |
40 | <div class="row"> | 40 | <div class="row"> |
41 | <div class="input-field col s12"> | 41 | <div class="input-field col s12"> |
42 | <label for="_auth_code">{{ "scheb_two_factor.auth_code"|trans }}</label> | 42 | <label for="_auth_code">{{ "auth_code"|trans({}, 'SchebTwoFactorBundle') }}</label> |
43 | <input id="_auth_code" type="text" autocomplete="off" name="_auth_code" /> | 43 | <input id="_auth_code" type="text" autocomplete="off" name="_auth_code" /> |
44 | </div> | 44 | </div> |
45 | </div> | 45 | </div> |
diff --git a/src/Wallabag/UserBundle/Resources/views/Authentication/form.html.twig b/src/Wallabag/UserBundle/Resources/views/Authentication/form.html.twig index 47a5cb78..c16a6eaf 100644 --- a/src/Wallabag/UserBundle/Resources/views/Authentication/form.html.twig +++ b/src/Wallabag/UserBundle/Resources/views/Authentication/form.html.twig | |||
@@ -16,14 +16,14 @@ | |||
16 | {% endif %} | 16 | {% endif %} |
17 | 17 | ||
18 | <div class="input-field col s12"> | 18 | <div class="input-field col s12"> |
19 | <label for="_auth_code">{{ "scheb_two_factor.auth_code"|trans }}</label> | 19 | <label for="_auth_code">{{ "auth_code"|trans({}, 'SchebTwoFactorBundle') }}</label> |
20 | <input id="_auth_code" type="text" autocomplete="off" name="{{ authCodeParameterName }}" /> | 20 | <input id="_auth_code" type="text" autocomplete="off" name="{{ authCodeParameterName }}" /> |
21 | </div> | 21 | </div> |
22 | 22 | ||
23 | {% if displayTrustedOption %} | 23 | {% if displayTrustedOption %} |
24 | <div class="input-field col s12"> | 24 | <div class="input-field col s12"> |
25 | <input id="_trusted" type="checkbox" name="{{ trustedParameterName }}" /> | 25 | <input id="_trusted" type="checkbox" name="{{ trustedParameterName }}" /> |
26 | <label for="_trusted">{{ "scheb_two_factor.trusted"|trans }}</label> | 26 | <label for="_trusted">{{ "trusted"|trans({}, 'SchebTwoFactorBundle') }}</label> |
27 | </div> | 27 | </div> |
28 | {% endif %} | 28 | {% endif %} |
29 | </div> | 29 | </div> |
@@ -31,7 +31,7 @@ | |||
31 | <div class="card-action center"> | 31 | <div class="card-action center"> |
32 | <a href="{{ path('fos_user_security_logout') }}" class="waves-effect waves-light grey btn">{{ 'security.login.cancel'|trans }}</a> | 32 | <a href="{{ path('fos_user_security_logout') }}" class="waves-effect waves-light grey btn">{{ 'security.login.cancel'|trans }}</a> |
33 | <button class="btn waves-effect waves-light" type="submit" name="send"> | 33 | <button class="btn waves-effect waves-light" type="submit" name="send"> |
34 | {{ "scheb_two_factor.login"|trans }} | 34 | {{ "login"|trans({}, 'SchebTwoFactorBundle') }} |
35 | <i class="material-icons right">send</i> | 35 | <i class="material-icons right">send</i> |
36 | </button> | 36 | </button> |
37 | </div> | 37 | </div> |