innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #8879 -- Used ungettext instead of ngettext in the comments framework. 

Patch from zgoda.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9116 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2008-10-05 05:05:32 +00:00
parent cf34d1f687
commit 18f13aeeab
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/contrib/comments/forms.py
View File

@ -11,8 +11,7 @@ from models import Comment
from django.utils.encoding import force_unicode from django.utils.encoding import force_unicode
from django.utils.hashcompat import sha_constructor from django.utils.hashcompat import sha_constructor
from django.utils.text import get_text_list from django.utils.text import get_text_list
from django.utils.translation import ngettext from django.utils.translation import ungettext, ugettext_lazy as _
from django.utils.translation import ugettext_lazy as _
COMMENT_MAX_LENGTH = getattr(settings,'COMMENT_MAX_LENGTH', 3000) COMMENT_MAX_LENGTH = getattr(settings,'COMMENT_MAX_LENGTH', 3000)
@ -122,7 +121,7 @@ class CommentForm(forms.Form):
bad_words = [w for w in settings.PROFANITIES_LIST if w in comment.lower()] bad_words = [w for w in settings.PROFANITIES_LIST if w in comment.lower()]
if bad_words: if bad_words:
plural = len(bad_words) > 1 plural = len(bad_words) > 1
raise forms.ValidationError(ngettext( raise forms.ValidationError(ungettext(
"Watch your mouth! The word %s is not allowed here.", "Watch your mouth! The word %s is not allowed here.",
"Watch your mouth! The words %s are not allowed here.", plural) % \ "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 bad_words], 'and')) get_text_list(['"%s%s%s"' % (i[0], '-'*(len(i)-2), i[-1]) for i in bad_words], 'and'))