aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/UserBundle/Resources
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-08-28 16:15:27 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-08-28 16:15:27 +0200
commitcdd3010b478c9ca818dd6d22d03c81ef4a5ab208 (patch)
treeffc9957fc228625501214bbb2e9f4bebe7936982 /src/Wallabag/UserBundle/Resources
parent13d44ca766b1020327f0b9b005dc2e95deb156a1 (diff)
parent985f5f9d05f7ff7e443442b1775923b379c141d6 (diff)
downloadwallabag-cdd3010b478c9ca818dd6d22d03c81ef4a5ab208.tar.gz
wallabag-cdd3010b478c9ca818dd6d22d03c81ef4a5ab208.tar.zst
wallabag-cdd3010b478c9ca818dd6d22d03c81ef4a5ab208.zip
Merge remote-tracking branch 'origin/master' into 2.1
Diffstat (limited to 'src/Wallabag/UserBundle/Resources')
-rw-r--r--src/Wallabag/UserBundle/Resources/translations/wallabag_user.oc.yml11
-rw-r--r--src/Wallabag/UserBundle/Resources/views/Security/login.html.twig2
2 files changed, 12 insertions, 1 deletions
diff --git a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.oc.yml b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.oc.yml
new file mode 100644
index 00000000..53a1afd1
--- /dev/null
+++ b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.oc.yml
@@ -0,0 +1,11 @@
1# Two factor mail
2auth_code:
3 on: 'sus'
4 mailer:
5 subject: "Còdi d'autentificacion wallabag"
6 body:
7 hello: "Bonjorn %user%,"
8 first_para: "Estant qu'avètz activat la dobla autentificacion sus vòtre compte wallabag e que venètz de vos conectar dempuèi un novèl aparelh (ordinador, mobil, etc.) vos mandem un còdi per validar la connexion."
9 second_para: "Vaquí lo còdi a dintrar :"
10 support: "S'avètz un problèma de connexion, dobtetz pas a contacter l'assisténcia : "
11 signature: "La còla de wallabag"
diff --git a/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig b/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig
index 13a903ab..938f1a31 100644
--- a/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig
@@ -41,7 +41,7 @@
41 <i class="material-icons right">send</i> 41 <i class="material-icons right">send</i>
42 </button> 42 </button>
43 </div> 43 </div>
44 <div class="center"> 44 <div class="row center">
45 <a href="{{ path('fos_user_resetting_request') }}">{{ 'security.login.forgot_password'|trans }}</a> 45 <a href="{{ path('fos_user_resetting_request') }}">{{ 'security.login.forgot_password'|trans }}</a>
46 </div> 46 </div>
47</form> 47</form>