Ticket #12467: 12467.3.diff

django/db/models/fields/__init__.py

@@ -597 +597 @@
 
     empty_strings_allowed = False
     default_error_messages = {
-        'invalid': _('Enter a valid date in YYYY-MM-DD format.'),
-        'invalid_date': _('Invalid date: %s'),
+        'invalid': _(u"'%s' value has an invalid date format. It must be "
+                     u"in YYYY-MM-DD format."),
+        'invalid_date': _(u"'%s' value has the correct format (YYYY-MM-DD) "
+                          u"but is an invalid date."),
     }
     def __init__(self, verbose_name=None, name=None, auto_now=False, auto_now_add=False, **kwargs):
         self.auto_now, self.auto_now_add = auto_now, auto_now_add
@@ -620 +622 @@
             return value
 
         if not ansi_date_re.search(value):
-            raise exceptions.ValidationError(self.error_messages['invalid'])
+            msg = self.error_messages['invalid'] % str(value)
+            raise exceptions.ValidationError(msg)
         # Now that we have the date string in YYYY-MM-DD format, check to make
         # sure it's a valid date.
         # We could use time.strptime here and catch errors, but datetime.date
@@ -629 +632 @@
         try:
             return datetime.date(year, month, day)
         except ValueError, e:
-            msg = self.error_messages['invalid_date'] % _(str(e))
+            msg = self.error_messages['invalid_date'] % str(value)
             raise exceptions.ValidationError(msg)
 
     def pre_save(self, model_instance, add):
@@ -679 +682 @@
 
 class DateTimeField(DateField):
     default_error_messages = {
-        'invalid': _(u'Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format.'),
+        'invalid': _(u"'%s' value has an invalid valid date/time format. "
+                     u"It must be in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."),
     }
     description = _("Date (with time)")
 
@@ -702 +706 @@
                 value, usecs = value.split('.')
                 usecs = int(usecs)
             except ValueError:
-                raise exceptions.ValidationError(self.error_messages['invalid'])
+                raise exceptions.ValidationError(
+                    self.error_messages['invalid'] % str(value))
         else:
             usecs = 0
         kwargs = {'microsecond': usecs}
         try: # Seconds are optional, so try converting seconds first.
-            return datetime.datetime(*time.strptime(value, '%Y-%m-%d %H:%M:%S')[:6],
-                                     **kwargs)
+            return datetime.datetime(
+                *time.strptime(value, '%Y-%m-%d %H:%M:%S')[:6], **kwargs)
 
         except ValueError:
             try: # Try without seconds.
-                return datetime.datetime(*time.strptime(value, '%Y-%m-%d %H:%M')[:5],
-                                         **kwargs)
+                return datetime.datetime(
+                    *time.strptime(value, '%Y-%m-%d %H:%M')[:5], **kwargs)
             except ValueError: # Try without hour/minutes/seconds.
                 try:
-                    return datetime.datetime(*time.strptime(value, '%Y-%m-%d')[:3],
-                                             **kwargs)
+                    return datetime.datetime(
+                        *time.strptime(value, '%Y-%m-%d')[:3], **kwargs)
                 except ValueError:
-                    raise exceptions.ValidationError(self.error_messages['invalid'])
+                    raise exceptions.ValidationError(
+                        self.error_messages['invalid'] % str(value))
 
     def pre_save(self, model_instance, add):
         if self.auto_now or (self.auto_now_add and add):

tests/modeltests/validation/test_error_messages.py

@@ -55 +55 @@
         except ValidationError, e:
             self.assertEqual(e.messages,
                         [u"'foo' value must be either None, True or False."])
+
+    def test_date_field_raises_error_message(self):
+        f = models.DateField()
+        self.assertRaises(ValidationError, f.clean, 'foo', None)
+        try:
+            f.clean('foo', None)
+        except ValidationError, e:
+            self.assertEqual(e.messages, [
+                u"'foo' value has an invalid date format. "
+                u"It must be in YYYY-MM-DD format."])
+
+        self.assertRaises(ValidationError, f.clean, 'aaaa-10-10', None)
+        try:
+            f.clean('aaaa-10-10', None)
+        except ValidationError, e:
+            self.assertEqual(e.messages, [
+                u"'aaaa-10-10' value has an invalid date format. "
+                u"It must be in YYYY-MM-DD format."])
+
+        self.assertRaises(ValidationError, f.clean, '2011-13-10', None)
+        try:
+            f.clean('2011-13-10', None)
+        except ValidationError, e:
+            self.assertEqual(e.messages, [
+                u"'2011-13-10' value has the correct format (YYYY-MM-DD) "
+                u"but is an invalid date."])
+
+        self.assertRaises(ValidationError, f.clean, '2011-10-32', None)
+        try:
+            f.clean('2011-10-32', None)
+        except ValidationError, e:
+            self.assertEqual(e.messages, [
+                u"'2011-10-32' value has the correct format (YYYY-MM-DD) "
+                u"but is an invalid date."])
+
+    def test_datetime_field_raises_error_message(self):
+        f = models.DateTimeField()
+        self.assertRaises(ValidationError, f.clean, 'foo', None)
+        try:
+            f.clean('foo', None)
+        except ValidationError, e:
+            self.assertEqual(e.messages, [
+                u"'foo' value has an invalid valid date/time format. "
+                u"It must be in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."])
+ No newline at end of file

tests/modeltests/validation/tests.py

@@ -12 +12 @@
 from modeltests.validation.test_unique import (GetUniqueCheckTests,
     PerformUniqueChecksTest)
 from modeltests.validation.test_custom_messages import CustomMessagesTest
-
+from modeltests.validation.test_error_messages import ValidationMessagesTest
 
 class BaseModelValidationTests(ValidationTestCase):