merged with the master branch

2 files changed, 20 insertions, 34 deletions

diff --git a/askbot/conf/sidebar_question.py b/askbot/conf/sidebar_question.py
index 8d38692a..fbd6b19e 100644
--- a/askbot/conf/sidebar_question.py
+++ b/askbot/conf/sidebar_question.py
@@ -42,7 +42,7 @@ settings.register(
         description = _('Answers banner'),
         default = '',
         help_text = _(
-            'This banner will show above the second answer. '
+            'This banner will show under the first answer. '
             'When using this option, please '
             'use the HTML validation service to make sure that '
             'your input is valid and works well in all browsers.'
@@ -59,6 +59,15 @@ settings.register(
     )
 )
 
+settings.register(
+    values.BooleanValue(
+        SIDEBAR_QUESTION,
+        'QUESTION_PAGE_ALWAYS_SHOW_ANSWER_BANNER',
+        default=False,
+        description=_('Show answers banner even if there are no answers')
+    )
+)
+
 
 settings.register(
     values.LongStringValue(
diff --git a/askbot/conf/skin_general_settings.py b/askbot/conf/skin_general_settings.py
index f14b3733..11d201ad 100644
--- a/askbot/conf/skin_general_settings.py
+++ b/askbot/conf/skin_general_settings.py
@@ -30,41 +30,18 @@ settings.register(
     )
 )
 
-LANGUAGE_CHOICES = (
-            ('en', _("English")),
-            ('es', _("Spanish")),
-            ('ca', _("Catalan")),
-            ('de', _("German")),
-            ('el', _("Greek")),
-            ('fi', _("Finnish")),
-            ('fr', _("French")),
-            ('hi', _("Hindi")),
-            ('hu', _("Hungarian")),
-            ('it', _("Italian")),
-            ('ja', _("Japanese")),
-            ('ko', _("Korean")),
-            ('pt', _("Portuguese")),
-            ('pt_BR', _("Brazilian Portuguese")),
-            ('ro', _("Romanian")),
-            ('ru', _("Russian")),
-            ('sr', _("Serbian")),
-            ('tr', _("Turkish")),
-            ('vi', _("Vietnamese")),
-            ('zh_CN', _("Chinese")),
-            ('zh_TW', _("Chinese (Taiwan)")),
+#cannot use HAS_ASKBOT_LOCALE_MIDDLEWARE due to circular import error
+if not getattr(django_settings, 'ASKBOT_MULTILINGUAL', False) and \
+        'askbot.middleware.locale.LocaleMiddleware' in django_settings.MIDDLEWARE_CLASSES:
+    settings.register(
+        values.StringValue(
+            GENERAL_SKIN_SETTINGS,
+            'ASKBOT_LANGUAGE',
+            default = django_settings.LANGUAGE_CODE,
+            choices =  django_settings.LANGUAGES,
+            description = _('Select Language'),
         )
-
-"""
-settings.register(
-    values.StringValue(
-        GENERAL_SKIN_SETTINGS,
-        'ASKBOT_LANGUAGE',
-        default = 'en',
-        choices =  LANGUAGE_CHOICES,
-        description = _('Select Language'),
     )
-)
-"""
 
 settings.register(
     values.BooleanValue(