pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Update HTML 2FA template

Browse Source 
Split paragraph in translation
Inject wallabag_url for image in HTML template
Remove username & password from config_dev.yml (null are already the default value)
This commit is contained in:
Jeremy Benoist
2016-01-20 17:43:10 +01:00
parent 5f736213af
commit abd454c456
7 changed files with 51 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Wallabag/UserBundle/Resources/config/services.yml
View File

@ -7,3 +7,4 @@ services:
- "%scheb_two_factor.email.sender_email%"
- "%scheb_two_factor.email.sender_name%"
- "%wallabag_support_url%"
- "%wallabag_url%"

10
src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml
View File

@ -1,9 +1,7 @@
# Two factor mail
auth_code.mailer.subject: 'Wallabag authentication Code'
auth_code.mailer.body.hello: "Hi %user%,"
auth_code.mailer.body.content: |
Since you enable two factor authentication on your wallabag account and you just logged in from a new device (computer, phone, etc.), we send you a code to validate your connection.
Here is the code: %code%
auth_code.mailer.body.signature: |
Please don't hesitate to contact us if you have any problems: %support%
The wallabag team
auth_code.mailer.body.first_para: "Since you enable two factor authentication on your wallabag account and you just logged in from a new device (computer, phone, etc.), we send you a code to validate your connection."
auth_code.mailer.body.second_para: "Here is the code:"
auth_code.mailer.body.support: "Please don't hesitate to contact us if you have any problems:"
auth_code.mailer.body.signature: "The wallabag team"

10
src/Wallabag/UserBundle/Resources/translations/wallabag_user.fr.yml
View File

@ -1,9 +1,7 @@
# Two factor mail
auth_code.mailer.subject: "Code d'authentification wallabag"
auth_code.mailer.body.hello: "Bonjour %user%,"
auth_code.mailer.body.content: |
Comme vous avez activé la double authentification sur votre compte wallabag et que vous venez de vous connecter depuis un nouvel appareil (ordinateur, téléphone, etc.), nous vous envoyons un code pour valider votre connexion.
Voici le code à renseigner: %code%
auth_code.mailer.body.signature: |
Si vous avez un problème de connexion, n'hésitez pas à contacter le support: %support%
L'équipe wallabag
auth_code.mailer.body.first_para: "Comme vous avez activé la double authentification sur votre compte wallabag et que vous venez de vous connecter depuis un nouvel appareil (ordinateur, téléphone, etc.), nous vous envoyons un code pour valider votre connexion."
auth_code.mailer.body.second_para: "Voici le code à renseigner :"
auth_code.mailer.body.support: "Si vous avez un problème de connexion, n'hésitez pas à contacter le support :"
auth_code.mailer.body.signature: "L'équipe wallabag"

35
src/Wallabag/UserBundle/Resources/views/TwoFactor/email_auth_code.html.twig
View File

@ -2,6 +2,17 @@
{{ "auth_code.mailer.subject"|trans({}, 'wallabag_user') }}
{% endblock %}
{% block body_text %}
{{ "auth_code.mailer.body.hello"|trans({'%user%': user}, 'wallabag_user') }}
{{ "auth_code.mailer.body.first_para"|trans({}, 'wallabag_user') }}
{{ "auth_code.mailer.body.second_para"|trans({}, 'wallabag_user') }} {{ code }}
{{ "auth_code.mailer.body.support"|trans({}, 'wallabag_user') }} {{ support_url }}
{{ "auth_code.mailer.body.signature"|trans({}, 'wallabag_user') }}
{% endblock %}
{% block body_html %}
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@ -63,10 +74,10 @@
<table cellpadding="0" cellspacing="0" border="0" align="center" id="card">
<tr>
<td style="padding: 20px;" width="96px" valign="top"><img class="image_fix" src="{ wallabag_url }/themes/material/img/logo-other_themes.png" alt="logo" title="{ wallabag_url }" style="width: 96px; height: 96px;" /></td>
<td style="padding: 20px;" width="96px" valign="top"><img class="image_fix" src="{{ wallabag_url }}/themes/material/img/logo-other_themes.png" alt="logo" title="{{ wallabag_url }}" style="width: 96px; height: 96px;" /></td>
<td style="padding: 20px; padding-left: 0;" valign="top" id="cell_desc">
<h1>Wallabag</h1>
<h5>{% trans %}on{% endtrans %} { wallabag_url }</h5>
<h1>wallabag</h1>
<h5>{% trans %}on{% endtrans %} {{ wallabag_url }}</h5>
</td>
</tr>
<tr><td colspan="2" style="padding: 0;"><div style="height: 0; border-top: 1px solid #c5c5c5;">&nbsp;</div></td></tr>
@ -75,10 +86,11 @@
<p><b>{{ "auth_code.mailer.body.hello"|trans({'%user%': user}, 'wallabag_user') }}</b></p>
<p>{{ "auth_code.mailer.body.content"|trans({'%code%': code}, 'wallabag_user') }}</p>
<p>{{ "auth_code.mailer.body.signature"|trans({'%support%': support}, 'wallabag_user') }}</p>
<p>{{ "auth_code.mailer.body.first_para"|trans({}, 'wallabag_user') }}</p>
<p>{{ "auth_code.mailer.body.second_para"|trans({}, 'wallabag_user') }} <b>{{ code }}</b></p>
<p>{{ "auth_code.mailer.body.support"|trans({}, 'wallabag_user') }} <a href="{{ support_url }}">{{ support_url }}</a></p>
<p>{{ "auth_code.mailer.body.signature"|trans({}, 'wallabag_user') }}</p>
</td>
</tr>
<tr><td colspan="2" style="padding: 0;"><div style="height: 0; border-top: 1px solid #c5c5c5;">&nbsp;</div></td></tr>
@ -87,8 +99,8 @@
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<tr>
<td valign="top" style="padding: 20px; text-align: center"><a href="{ wallabag_url }">{ wallabag_url }</a></td>
<td valign="top" style="padding: 20px; text-align: center">Powered by <a href="https://www.wallabag.org/">Wallabag</a></td>
<td valign="top" style="padding: 20px; text-align: center"><a href="{{ wallabag_url }}">{{ wallabag_url }}</a></td>
<td valign="top" style="padding: 20px; text-align: center">Powered by <a href="https://www.wallabag.org/">wallabag</a></td>
</tr>
</table>
@ -103,10 +115,3 @@
</body>
</html>
{% endblock %}
{% block body_text %}
{{ "auth_code.mailer.body.hello"|trans({'%user%': user}, 'wallabag_user') }}
{{ "auth_code.mailer.body.content"|trans({'%code%': code}, 'wallabag_user') }}
{{ "auth_code.mailer.body.signature"|trans({'%support%': support}, 'wallabag_user') }}
{% endblock %}