Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Small improvements to profanities-to-settings move from [3784]

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3837 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 321a59a36a545cc90000e1661ba0ed145585eea9 1 parent 61a1a18
@adrianholovaty adrianholovaty authored
View
4 django/conf/global_settings.py
@@ -274,8 +274,8 @@
COMMENTS_ALLOW_PROFANITIES = False
# The profanities that will trigger a validation error in the
-# 'hasNoProfanities' validator. All of these should be in lower-case.
-PROFANITIES_LIST = ['asshat', 'asshead', 'asshole', 'cunt', 'fuck', 'gook', 'nigger', 'shit']
+# 'hasNoProfanities' validator. All of these should be in lowercase.
+PROFANITIES_LIST = ('asshat', 'asshead', 'asshole', 'cunt', 'fuck', 'gook', 'nigger', 'shit')
# The group ID that designates which users are banned.
# Set to None if you're not using it.
View
2  django/core/validators.py
@@ -249,7 +249,7 @@ def hasNoProfanities(field_data, all_data):
Watch your mouth! The words "f--k" and "s--t" are not allowed here.
"""
field_data = field_data.lower() # normalize
- words_seen = [w for w in settings.PROFANITIES_LIST if field_data.find(w) > -1]
+ 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
View
7 docs/settings.txt
@@ -599,8 +599,11 @@ See also ``APPEND_SLASH``.
PROFANITIES_LIST
----------------
-A list of profanities that will trigger a validation error when the
-``hasNoProfanities`` validator is called.
+A tuple of profanities, as strings, that will trigger a validation error when
+the ``hasNoProfanities`` validator is called.
+
+We don't list the default values here, because that would be profane. To see
+the default values, see the file ``django/conf/global_settings.py``.
ROOT_URLCONF
------------
Please sign in to comment.
Something went wrong with that request. Please try again.