Merging the experimental branch back to trunk.

[osqa.git] / forum / settings / extkeys.py

diff --git a/forum/settings/extkeys.py b/forum/settings/extkeys.py
index b57147220d00b242bdb438942e385a185aaf86d6..abe860bb9b369d1044c54272a17364555e3f3232 100644 (file)
--- a/forum/settings/extkeys.py
+++ b/forum/settings/extkeys.py
@@ -5,14 +5,23 @@ EXT_KEYS_SET = SettingSet('extkeys', _('External Keys'), _("Keys for various ext
 \r
 GOOGLE_SITEMAP_CODE = Setting('GOOGLE_SITEMAP_CODE', '', EXT_KEYS_SET, dict(\r
 label = _("Google sitemap code"),\r
-help_text = """\r
-This is the code you get when you register your site at <a href="https://www.google.com/webmasters/tools/">Google webmaster central</a>.\r
-""",\r
+help_text = _("This is the code you get when you register your site at <a href='https://www.google.com/webmasters/tools/'>Google webmaster central</a>."),\r
 required=False))\r
 \r
 GOOGLE_ANALYTICS_KEY = Setting('GOOGLE_ANALYTICS_KEY', '', EXT_KEYS_SET, dict(\r
 label = _("Google analytics key"),\r
-help_text = """\r
-Your Google analytics key. You can get one at the <a href="http://www.google.com/analytics/">Google analytics official website</a>\r
-""",\r
-required=False))
\ No newline at end of file
+help_text = _("Your Google analytics key. You can get one at the <a href='http://www.google.com/analytics/'>Google analytics official website</a>"),\r
+required=False))\r
+WORDPRESS_API_KEY = Setting('WORDPRESS_API_KEY', '', EXT_KEYS_SET, dict(\r
+label = _("Wordpress API key"),\r
+help_text = _("Your Wordpress API key. You can get one at <a href='http://wordpress.com/'>http://wordpress.com/</a>"),\r
+required=False))\r
+\r
+WORDPRESS_BLOG_URL = Setting('WORDPRESS_BLOG_URL', '', EXT_KEYS_SET, dict(\r
+label = _("Wordpress blog url"),\r
+help_text = _("Your Wordpress blog url. You can get one at <a href='http://wordpress.com/'>http://wordpress.com/</a>"),\r
+required=False))\r
+\r
+\r
+\r
+\r