Changeset 3784

Timestamp:

09/21/06 21:48:19 (2 years ago)

Author:

mtredinnick

Message:

Fixed #2678 -- Moved the list of profanities for the hasNoProfanities validator
into global_settings. Patch from Matt Croydon.

Files:

• django/trunk/django/conf/global_settings.py (modified) (1 diff)
• django/trunk/django/core/validators.py (modified) (1 diff)
• django/trunk/docs/settings.txt (modified) (1 diff)

django/trunk/django/conf/global_settings.py

@@ -273 +273 @@
-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']
+
-# The group ID that designates which users are banned.
-# Set to None if you're not using it.

django/trunk/django/core/validators.py

@@ -228 +228 @@
-        Watch your mouth! The words "f--k" and "s--t" are not allowed here.
-    """
-    bad_words = ['asshat', 'asshead', 'asshole', 'cunt', 'fuck', 'gook', 'nigger', 'shit'] # all in lower case
-    field_data = field_data.lower() # normalize
-bad_words
+settings.PROFANITIES_LIST
-    if words_seen:
-        from django.utils.text import get_text_list

django/trunk/docs/settings.txt

@@ -597 +597 @@
-See also ``APPEND_SLASH``.
-
+PROFANITIES_LIST
+----------------
+
+A list of profanities that will trigger a validation error when the
+``hasNoProfanities`` validator is called.
+
-ROOT_URLCONF
-------------