From ee77d4b25360a9fc050c32769a334fd69a011a63 Mon Sep 17 00:00:00 2001 From: Loic Bistuer Date: Wed, 5 Jun 2013 14:55:05 -0400 Subject: Fixed #20199 -- Allow ModelForm fields to override error_messages from model fields --- django/core/exceptions.py | 4 +--- django/core/validators.py | 8 ++------ 2 files changed, 3 insertions(+), 9 deletions(-) (limited to 'django/core') diff --git a/django/core/exceptions.py b/django/core/exceptions.py index 5975164d07..829d6e774e 100644 --- a/django/core/exceptions.py +++ b/django/core/exceptions.py @@ -117,9 +117,7 @@ class ValidationError(Exception): message = message.message if params: message %= params - message = force_text(message) - else: - message = force_text(message) + message = force_text(message) messages.append(message) return messages diff --git a/django/core/validators.py b/django/core/validators.py index d0b713be32..200d28fe02 100644 --- a/django/core/validators.py +++ b/django/core/validators.py @@ -76,7 +76,7 @@ def validate_integer(value): try: int(value) except (ValueError, TypeError): - raise ValidationError('') + raise ValidationError(_('Enter a valid integer.'), code='invalid') class EmailValidator(object): @@ -188,11 +188,7 @@ class BaseValidator(object): cleaned = self.clean(value) params = {'limit_value': self.limit_value, 'show_value': cleaned} if self.compare(cleaned, self.limit_value): - raise ValidationError( - self.message % params, - code=self.code, - params=params, - ) + raise ValidationError(self.message, code=self.code, params=params) class MaxValueValidator(BaseValidator): -- cgit v1.3