merge hernani > trunk

[osqa.git] / forum_modules / oauthauth / settings.py

diff --git a/forum_modules/oauthauth/settings.py b/forum_modules/oauthauth/settings.py
old mode 100755 (executable)
new mode 100644 (file)
index d503fef..7e9ef8c
--- a/forum_modules/oauthauth/settings.py
+++ b/forum_modules/oauthauth/settings.py
@@ -1,3 +1,19 @@
-TWITTER_CONSUMER_KEY = "sAAGwWILliIbgbrG37GztQ"\r
-TWITTER_CONSUMER_SECRET = "AZv0pHTZQaf4rxxZOrj3Jm1RKgmlV4MnYJAsrY7M0"\r
-\r
+from forum.settings import EXT_KEYS_SET
+from forum.settings.base import Setting
+
+TWITTER_CONSUMER_KEY = Setting('TWITTER_CONSUMER_KEY', '', EXT_KEYS_SET, dict(
+label = "Twitter consumer key",
+help_text = """
+Get this key at the <a href="http://twitter.com/apps/">Twitter apps</a> to enable
+authentication in your site through Twitter.
+""",
+required=False))
+
+TWITTER_CONSUMER_SECRET = Setting('TWITTER_CONSUMER_SECRET', '', EXT_KEYS_SET, dict(
+label = "Twitter consumer secret",
+help_text = """
+This your Twitter consumer secret that you'll get in the same place as the consumer key.
+""",
+required=False))
+
+