From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Fri, 26 Jul 2019 11:22:48 +0000 (+0200)
Subject: Upgrade to 4.0
X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=62665a32bb15ea2330e840c11adc2b5a0c9cb854

Upgrade to 4.0
---

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 @@
                 <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>
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 @@
                                 <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>
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 @@
             {% 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>