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 0919646ec3e7a51ffbd727fa736a6bbceafbf520..1d3685ae6539e923ac061ee0871d5377abfe5d63 100644 (file)
--- 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 7875d78775a7e0048c4b7cda0a83678f147265f6..6f405d7f31531915e303bb7239636128f71f8ad5 100644 (file)
--- 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 47a5cb784cfd2c1f7a6ce362ce640bf224612b87..c16a6eaf5917ca13505b44cecca61b39c6739df1 100644 (file)
--- 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>