p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Adrian Holovaty 2006-09-25 17:38:35 +00:00
parent 61a1a1864d
commit 321a59a36a
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/conf/global_settings.py
View File

@ -274,8 +274,8 @@ CACHE_MIDDLEWARE_KEY_PREFIX = ''
COMMENTS_ALLOW_PROFANITIES = False COMMENTS_ALLOW_PROFANITIES = False
# The profanities that will trigger a validation error in the # The profanities that will trigger a validation error in the
# 'hasNoProfanities' validator. All of these should be in lower-case. # 'hasNoProfanities' validator. All of these should be in lowercase.
PROFANITIES_LIST = ['asshat', 'asshead', 'asshole', 'cunt', 'fuck', 'gook', 'nigger', 'shit'] PROFANITIES_LIST = ('asshat', 'asshead', 'asshole', 'cunt', 'fuck', 'gook', 'nigger', 'shit')
# The group ID that designates which users are banned. # The group ID that designates which users are banned.
# Set to None if you're not using it. # Set to None if you're not using it.

2
django/core/validators.py
View File

@ -249,7 +249,7 @@ def hasNoProfanities(field_data, all_data):
Watch your mouth! The words "f--k" and "s--t" are not allowed here. Watch your mouth! The words "f--k" and "s--t" are not allowed here.
""" """
field_data = field_data.lower() # normalize 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: if words_seen:
from django.utils.text import get_text_list from django.utils.text import get_text_list
plural = len(words_seen) > 1 plural = len(words_seen) > 1

7
docs/settings.txt
View File

@ -599,8 +599,11 @@ See also ``APPEND_SLASH``.
PROFANITIES_LIST PROFANITIES_LIST
---------------- ----------------
A list of profanities that will trigger a validation error when the A tuple of profanities, as strings, that will trigger a validation error when
``hasNoProfanities`` validator is called. 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 ROOT_URLCONF
------------ ------------