0001-registration-simplify-post-registration-message-3805.patch
src/authentic2/templates/registration/registration_complete.html | ||
---|---|---|
7 | 7 | |
8 | 8 |
{% block content %} |
9 | 9 |
{% block instructions %} |
10 |
<p><strong> |
|
10 | 11 |
{% blocktrans with email=request.session.registered_email %} |
11 |
<p>An email was sent to {{ email }}.</p>
|
|
12 |
An email was sent to {{ email }}.
|
|
12 | 13 |
{% endblocktrans %} |
14 |
</strong></p> |
|
15 |
<p><strong> |
|
13 | 16 |
{% blocktrans %} |
14 |
<p>Follow the instructions in this email to continue your registration.</p>
|
|
17 |
Follow the instructions in that email to continue your registration.
|
|
15 | 18 |
{% endblocktrans %} |
19 |
</strong></p> |
|
16 | 20 |
{% endblock %} |
17 | 21 |
{% block advice %} |
18 |
{% blocktrans with from_email=from_email %}
|
|
19 |
<p>To be sure to receive this email we recommend you to add the
|
|
20 |
{{ from_email }} email address to your addressbook or list of authorised senders
|
|
21 |
otherwise the message may end up in your spam folder.</p>
|
|
22 |
<p>
|
|
23 |
{% blocktrans %}
|
|
24 |
The email may take several minutes to be received. It can also be
|
|
25 |
considered as spam: please look in your "junk mail" folder.
|
|
22 | 26 |
{% endblocktrans %} |
27 |
</p> |
|
28 |
<p> |
|
23 | 29 |
{% blocktrans with from_email=from_email %} |
24 |
<p>If you cannot find the email you should check your spam folder and if |
|
25 |
you find it there you should mark it as "non-spam" and add the {{from_email }} |
|
26 |
address to your addressbook, this should prevent further emails to be |
|
27 |
sorted as spams.</p> |
|
30 |
If you still have not received the instructions, add {{from_email}} |
|
31 |
to your address book or authorized sender list, and then repeat the |
|
32 |
registration process. |
|
28 | 33 |
{% endblocktrans %} |
34 |
</p> |
|
29 | 35 |
{% endblock %} |
30 | 36 |
{% block back %} |
31 | 37 |
<p><a href="{{ next_url }}">{% trans "Back" %}</a></p> |
tests/test_registration.py | ||
---|---|---|
54 | 54 | |
55 | 55 |
assert 'Follow the instructions' in response.text |
56 | 56 |
assert 'testbot@entrouvert.com' in response.text |
57 |
assert 'spam folder' in response.text
|
|
57 |
assert 'considered as spam' in response.text
|
|
58 | 58 |
assert settings.DEFAULT_FROM_EMAIL in response.text |
59 | 59 |
assert len(mailoutbox) == 1 |
60 | 60 | |
61 |
- |