Ticket #19034: 19034.diff

django/core/validators.py

@@ -7 +7 @@
     from urlparse import urlsplit, urlunsplit
 
 from django.core.exceptions import ValidationError
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ugettext_lazy as _, ungettext
 from django.utils.encoding import force_text
 from django.utils.ipv6 import is_valid_ipv6_address
 from django.utils import six
@@ -186 +186 @@
 class MinLengthValidator(BaseValidator):
     compare = lambda self, a, b: a < b
     clean = lambda self, x: len(x)
-    message = _('Ensure this value has at least %(limit_value)d characters (it has %(show_value)d).')
     code = 'min_length'
 
+    def __call__(self, value):
+        self.message = ungettext(
+            'Ensure this value has at least %(limit_value)d character (it has %(show_value)d).',
+            'Ensure this value has at least %(limit_value)d characters (it has %(show_value)d).',
+            self.limit_value
+        )
+        super(MinLengthValidator, self).__call__(value)
+
 
 class MaxLengthValidator(BaseValidator):
     compare = lambda self, a, b: a > b
     clean = lambda self, x: len(x)
-    message = _('Ensure this value has at most %(limit_value)d characters (it has %(show_value)d).')
     code = 'max_length'
+
+    def __call__(self, value):
+        self.message = ungettext(
+            'Ensure this value has at most %(limit_value)d character (it has %(show_value)d).',
+            'Ensure this value has at most %(limit_value)d characters (it has %(show_value)d).',
+            self.limit_value
+        )
+        super(MaxLengthValidator, self).__call__(value)