diff options
| author | Stephan Groß | 2013-07-24 02:00:30 -0700 |
|---|---|---|
| committer | Stephan Groß | 2013-07-24 02:00:30 -0700 |
| commit | dbc8bddd7456639f8ea6f212fa70c298a3b62fc6 (patch) | |
| tree | e3f4f68fca0ba3b411176c7d96892d95ce1b06c0 /rest_framework | |
| parent | 0eec692f9a884a1b303910e2595eefcd5215dfff (diff) | |
| parent | b6d6feaa0210bef225f2dad0d5765b32ecfc8cd0 (diff) | |
| download | django-rest-framework-dbc8bddd7456639f8ea6f212fa70c298a3b62fc6.tar.bz2 | |
Merge pull request #995 from pzinovkin/patch-1
Updated EmailField error message.
Diffstat (limited to 'rest_framework')
| -rw-r--r-- | rest_framework/fields.py | 2 | ||||
| -rw-r--r-- | rest_framework/tests/test_serializer.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 6e5ee470..f9931887 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -512,7 +512,7 @@ class EmailField(CharField): form_field_class = forms.EmailField default_error_messages = { - 'invalid': _('Enter a valid e-mail address.'), + 'invalid': _('Enter a valid email address.'), } default_validators = [validators.validate_email] diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py index 38acc354..c2497660 100644 --- a/rest_framework/tests/test_serializer.py +++ b/rest_framework/tests/test_serializer.py @@ -494,7 +494,7 @@ class CustomValidationTests(TestCase): } serializer = self.CommentSerializerWithFieldValidator(data=wrong_data) self.assertFalse(serializer.is_valid()) - self.assertEqual(serializer.errors, {'email': ['Enter a valid e-mail address.']}) + self.assertEqual(serializer.errors, {'email': ['Enter a valid email address.']}) class PositiveIntegerAsChoiceTests(TestCase): |