summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2011-02-21 13:46:13 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2011-02-21 13:46:13 +0000
commit470d9b2602fe53e8c6cbcd9287cd86048cae67d0 (patch)
tree1a2191679d98c0dcd2c96b554e0706edef93757f
parentb151bccdcc654856b849ab19b6deb68c22794e23 (diff)
Fixed #11852 -- Ensure that a long string in the password reset email can be translated. Thanks to pihentagy for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15606 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/admin/templates/registration/password_reset_email.html3
1 files changed, 1 insertions, 2 deletions
diff --git a/django/contrib/admin/templates/registration/password_reset_email.html b/django/contrib/admin/templates/registration/password_reset_email.html
index 506a1a83dc..de9dc79c52 100644
--- a/django/contrib/admin/templates/registration/password_reset_email.html
+++ b/django/contrib/admin/templates/registration/password_reset_email.html
@@ -1,6 +1,5 @@
{% load i18n %}{% load url from future %}{% autoescape off %}
-{% trans "You're receiving this e-mail because you requested a password reset" %}
-{% blocktrans %}for your user account at {{ site_name }}{% endblocktrans %}.
+{% blocktrans %}You're receiving this e-mail because you requested a password reset for your user account at {{ site_name }}.{% endblocktrans %}
{% trans "Please go to the following page and choose a new password:" %}
{% block reset_link %}