diff options
| author | Adrien Lemaire <lemaire.adrien@gmail.com> | 2012-09-26 14:14:51 +0200 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2012-09-26 14:14:51 +0200 |
| commit | 2c8267bf3db608b99c04ae903c424b60cafaaf93 (patch) | |
| tree | 4010acc82f31fa252b48a5fcb896a88695823b22 /django/contrib/auth | |
| parent | 70a0de37d132e5f1514fb939875f69649f103124 (diff) | |
Fixed #17899 -- Rewrote [Ee]-mail to [Ee]mail
Diffstat (limited to 'django/contrib/auth')
| -rw-r--r-- | django/contrib/auth/forms.py | 6 | ||||
| -rw-r--r-- | django/contrib/auth/tests/forms.py | 2 | ||||
| -rw-r--r-- | django/contrib/auth/tests/templates/registration/password_reset_done.html | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/django/contrib/auth/forms.py b/django/contrib/auth/forms.py index a430f042e9..c114c18afe 100644 --- a/django/contrib/auth/forms.py +++ b/django/contrib/auth/forms.py @@ -193,12 +193,12 @@ class AuthenticationForm(forms.Form): class PasswordResetForm(forms.Form): error_messages = { - 'unknown': _("That e-mail address doesn't have an associated " + 'unknown': _("That email address doesn't have an associated " "user account. Are you sure you've registered?"), - 'unusable': _("The user account associated with this e-mail " + 'unusable': _("The user account associated with this email " "address cannot reset the password."), } - email = forms.EmailField(label=_("E-mail"), max_length=75) + email = forms.EmailField(label=_("Email"), max_length=75) def clean_email(self): """ diff --git a/django/contrib/auth/tests/forms.py b/django/contrib/auth/tests/forms.py index 7c6410da0f..6be6249711 100644 --- a/django/contrib/auth/tests/forms.py +++ b/django/contrib/auth/tests/forms.py @@ -344,4 +344,4 @@ class PasswordResetFormTest(TestCase): form = PasswordResetForm(data) self.assertFalse(form.is_valid()) self.assertEqual(form["email"].errors, - [_("The user account associated with this e-mail address cannot reset the password.")]) + [_("The user account associated with this email address cannot reset the password.")]) diff --git a/django/contrib/auth/tests/templates/registration/password_reset_done.html b/django/contrib/auth/tests/templates/registration/password_reset_done.html index d56b10f0d5..c3d1d0c7b0 100644 --- a/django/contrib/auth/tests/templates/registration/password_reset_done.html +++ b/django/contrib/auth/tests/templates/registration/password_reset_done.html @@ -1 +1 @@ -E-mail sent
\ No newline at end of file +Email sent
\ No newline at end of file |