From fcec755f01cfaba2a85bfc9511876debbce98631 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 17 Aug 2007 15:05:54 +0000 Subject: newforms-admin: Merged from trunk up to [5916] git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@5918 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/core/validators.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'django/core/validators.py') diff --git a/django/core/validators.py b/django/core/validators.py index fde4f052cb..8a93462b21 100644 --- a/django/core/validators.py +++ b/django/core/validators.py @@ -269,10 +269,10 @@ def hasNoProfanities(field_data, all_data): words_seen = [w for w in settings.PROFANITIES_LIST if w in field_data] if words_seen: from django.utils.text import get_text_list - plural = len(words_seen) > 1 + plural = len(words_seen) raise ValidationError, ungettext("Watch your mouth! The word %s is not allowed here.", "Watch your mouth! The words %s are not allowed here.", plural) % \ - get_text_list(['"%s%s%s"' % (i[0], '-'*(len(i)-2), i[-1]) for i in words_seen], 'and') + get_text_list(['"%s%s%s"' % (i[0], '-'*(len(i)-2), i[-1]) for i in words_seen], _('and')) class AlwaysMatchesOtherField(object): def __init__(self, other_field_name, error_message=None): -- cgit v1.3