Merge a2d5a07ae7 into 650a91ac24

rest_framework/fields.py

@@ -260,6 +260,7 @@ class WritableField(Field):
     default_error_messages = {
         'required': _('This field is required.'),
         'invalid': _('Invalid value.'),
+        'invalid_data': _('Invalid data.'),
     }
     widget = widgets.TextInput
     default = None

rest_framework/serializers.py

@@ -278,7 +278,7 @@ class BaseSerializer(WritableField):
         reverted_data = {}
 
         if data is not None and not isinstance(data, dict):
-            self._errors['non_field_errors'] = ['Invalid data']
+            self._errors['non_field_errors'] = [self.error_messages['invalid_data']]
             return None
 
         for field_name, field in self.fields.items():