Skip to content

Fix {% trans %} tags in password reset email. Fixes #3036. #3049

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 17, 2017
Merged

Fix {% trans %} tags in password reset email. Fixes #3036. #3049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b1b7c4
Fix {% trans %} tags in password reset email. Fixes #3036.
jerivas Aug 17, 2017
a791e78
Typo.
jerivas Aug 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
.coverage
.idea
.vagrant
.vscode
.tox
.env
.rope_project/
Expand Down
5 changes: 2 additions & 3 deletions readthedocs/templates/account/email/password_reset_key_message.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@

{% block content %}
<p>
{% trans "A request has been made to reset your Read the Docs password. To confirm
this reset request, please go to:" %}
{% trans "A request has been made to reset your Read the Docs password. To confirm this reset request, please go to:" %}
</p>

<p>
<a href="{{ password_reset_url }}">{{ password_reset_url }}</a>
</p>

<p>
{% trans "If you did not request to reset you password, you can disregard this email." %}
{% trans "If you did not request to reset your password, you can disregard this email." %}
</p>
{% endblock %}
5 changes: 2 additions & 3 deletions readthedocs/templates/account/email/password_reset_key_message.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
{% load i18n %}

{% block content %}
{% trans "A request has been made to reset your Read the Docs password. To confirm
this reset request, please go to:" %}
{% trans "A request has been made to reset your Read the Docs password. To confirm this reset request, please go to:" %}

{{ password_reset_url }}

{% trans "If you did not request to reset you password, you can disregard this email." %}
{% trans "If you did not request to reset your password, you can disregard this email." %}
{% endblock %}