oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-08-01 17:38:38 +00:00
Code Wiki Activity

Merge pull request #4068 from wallabag/dependabot/composer/scheb/two-factor-bundle-4.4.0

Browse source 
Bump scheb/two-factor-bundle from 3.21.0 to 4.4.0
This commit is contained in:
Jérémy Benoist 2019-07-26 14:10:17 +02:00 • committed by GitHub
commit 13fddc353e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 159 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/otp_app.html.twig
View file

@ -35,7 +35,7 @@
<div class="card-content">
<div class="row">
<div class="input-field col s12">
<label for="_auth_code">{{ "scheb_two_factor.auth_code"|trans }}</label>
<label for="_auth_code">{{ "auth_code"|trans({}, 'SchebTwoFactorBundle') }}</label>
<input id="_auth_code" type="text" autocomplete="off" name="_auth_code" />
</div>
</div>

2
src/Wallabag/CoreBundle/Resources/views/themes/material/Config/otp_app.html.twig
View file

@ -39,7 +39,7 @@
<div class="card-content">
<div class="row">
<div class="input-field col s12">
<label for="_auth_code">{{ "scheb_two_factor.auth_code"|trans }}</label>
<label for="_auth_code">{{ "auth_code"|trans({}, 'SchebTwoFactorBundle') }}</label>
<input id="_auth_code" type="text" autocomplete="off" name="_auth_code" />
</div>
</div>

6
src/Wallabag/UserBundle/Resources/views/Authentication/form.html.twig
View file

@ -16,14 +16,14 @@
{% endif %}
<div class="input-field col s12">
<label for="_auth_code">{{ "scheb_two_factor.auth_code"|trans }}</label>
<label for="_auth_code">{{ "auth_code"|trans({}, 'SchebTwoFactorBundle') }}</label>
<input id="_auth_code" type="text" autocomplete="off" name="{{ authCodeParameterName }}" />
</div>
{% if displayTrustedOption %}
<div class="input-field col s12">
<input id="_trusted" type="checkbox" name="{{ trustedParameterName }}" />
<label for="_trusted">{{ "scheb_two_factor.trusted"|trans }}</label>
<label for="_trusted">{{ "trusted"|trans({}, 'SchebTwoFactorBundle') }}</label>
</div>
{% endif %}
</div>
@ -31,7 +31,7 @@
<div class="card-action center">
<a href="{{ path('fos_user_security_logout') }}" class="waves-effect waves-light grey btn">{{ 'security.login.cancel'|trans }}</a>
<button class="btn waves-effect waves-light" type="submit" name="send">
{{ "scheb_two_factor.login"|trans }}
{{ "login"|trans({}, 'SchebTwoFactorBundle') }}
<i class="material-icons right">send</i>
</button>
</div>