Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.0.X] Fixed #8879 -- Used ungettext instead of ngettext in the comm…

…ents framework.

Patch from zgoda.

Backport of r9116 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9123 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 769709e994a9d2cdb1f34750bcc6c130faffcfb8 1 parent 3e2803f
@malcolmt malcolmt authored
Showing with 2 additions and 3 deletions.
  1. +2 −3 django/contrib/comments/forms.py
View
5 django/contrib/comments/forms.py
@@ -11,8 +11,7 @@
from django.utils.encoding import force_unicode
from django.utils.hashcompat import sha_constructor
from django.utils.text import get_text_list
-from django.utils.translation import ngettext
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ungettext, ugettext_lazy as _
COMMENT_MAX_LENGTH = getattr(settings,'COMMENT_MAX_LENGTH', 3000)
@@ -122,7 +121,7 @@ def clean_comment(self):
bad_words = [w for w in settings.PROFANITIES_LIST if w in comment.lower()]
if bad_words:
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 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'))
Please sign in to comment.
Something went wrong with that request. Please try again.