diff --git a/.gitignore b/.gitignore index 11559d57a55..1ba2202c15d 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ .coverage .idea .vagrant +.vscode .tox .env .rope_project/ diff --git a/readthedocs/templates/account/email/password_reset_key_message.html b/readthedocs/templates/account/email/password_reset_key_message.html index 424e846c20d..d692788f67a 100644 --- a/readthedocs/templates/account/email/password_reset_key_message.html +++ b/readthedocs/templates/account/email/password_reset_key_message.html @@ -4,8 +4,7 @@ {% 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:" %}
@@ -13,6 +12,6 @@
- {% 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 %} diff --git a/readthedocs/templates/account/email/password_reset_key_message.txt b/readthedocs/templates/account/email/password_reset_key_message.txt index 507e688b760..11ef558468a 100644 --- a/readthedocs/templates/account/email/password_reset_key_message.txt +++ b/readthedocs/templates/account/email/password_reset_key_message.txt @@ -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 %}