moved akismet settings to "Spam and moderation"

4 files changed, 35 insertions, 24 deletions

diff --git a/askbot/conf/__init__.py b/askbot/conf/__init__.py
index d51be698..1d2d7240 100644
--- a/askbot/conf/__init__.py
+++ b/askbot/conf/__init__.py
@@ -13,6 +13,7 @@ import askbot.conf.skin_general_settings
 import askbot.conf.sidebar_main
 import askbot.conf.sidebar_question
 import askbot.conf.sidebar_profile
+import askbot.conf.spam_and_moderation
 import askbot.conf.user_settings
 import askbot.conf.markup
 import askbot.conf.social_sharing
diff --git a/askbot/conf/external_keys.py b/askbot/conf/external_keys.py
index c5138be0..8912b0ff 100644
--- a/askbot/conf/external_keys.py
+++ b/askbot/conf/external_keys.py
@@ -1,6 +1,4 @@
-"""
-External service key settings
-"""
+"""External service key settings"""
 from askbot import const
 from askbot.conf.settings_wrapper import settings
 from askbot.deps import livesettings
@@ -77,27 +75,6 @@ settings.register(
 )
 
 settings.register(
-    livesettings.BooleanValue(
-        EXTERNAL_KEYS,
-        'USE_AKISMET',
-        description=_('Enable Akismet spam detection(keys below are required)'),
-        default=False,
-        help_text = _(
-                         'To get an Akismet key please visit '
-                         '<a href="%(url)s">Akismet site</a>'
-                     ) % {'url': const.DEPENDENCY_URLS['akismet']}
-    )
-)
-
-settings.register(
-    livesettings.StringValue(
-        EXTERNAL_KEYS,
-        'AKISMET_API_KEY',
-        description=_('Akismet key for spam detection')
-    )
-)
-
-settings.register(
     livesettings.StringValue(
         EXTERNAL_KEYS,
         'FACEBOOK_KEY',
diff --git a/askbot/conf/spam_and_moderation.py b/askbot/conf/spam_and_moderation.py
new file mode 100644
index 00000000..375fbdd5
--- /dev/null
+++ b/askbot/conf/spam_and_moderation.py
@@ -0,0 +1,32 @@
+"""Settings for content moderation and spam control"""
+from django.utils.translation import ugettext as _
+from askbot import const
+from askbot.deps import livesettings
+from askbot.conf.settings_wrapper import settings
+
+SPAM_AND_MODERATION = livesettings.ConfigurationGroup(
+                    'SPAM_AND_MODERATION',
+                    _('Spam control and content moderation')
+                )
+
+settings.register(
+    livesettings.BooleanValue(
+        SPAM_AND_MODERATION,
+        'USE_AKISMET',
+        description=_('Enable Akismet spam detection(keys below are required)'),
+        default=False,
+        help_text = _(
+                         'To get an Akismet key please visit '
+                         '<a href="%(url)s">Akismet site</a>'
+                     ) % {'url': const.DEPENDENCY_URLS['akismet']}
+    )
+)
+
+settings.register(
+    livesettings.StringValue(
+        SPAM_AND_MODERATION,
+        'AKISMET_API_KEY',
+        description=_('Akismet key for spam detection')
+    )
+)
+
diff --git a/askbot/doc/source/changelog.rst b/askbot/doc/source/changelog.rst
index ade7421c..c1eaa158 100644
--- a/askbot/doc/source/changelog.rst
+++ b/askbot/doc/source/changelog.rst
@@ -3,6 +3,7 @@ Changes in Askbot
 
 Development version
 -------------------
+* Added support for Akismet spam detection service (Adolfo Fitoria)
 * Added noscript message (Arun SAG)
 * Support for url shortening with TinyUrl on link sharing (Rtnpro)
 * Allowed logging in with password and email in the place of login name (Evgeny)