Addresses OSQA-206: Add some help text to explain what "bootstrap mode" is

[osqa.git] / settings.py

diff --git a/settings.py b/settings.py
index 246c3177ff526e5c46cca30311a548155c77229f..a7c589300508523648a62fe07d68b59b85765799 100644 (file)
--- a/settings.py
+++ b/settings.py
@@ -67,7 +67,7 @@ INSTALLED_APPS = [
     'django.contrib.admin',
     'django.contrib.humanize',
     'django.contrib.sitemaps',
-    #'django.contrib.markup',
+    'django.contrib.markup',
     'forum',
 ]
 
@@ -85,4 +85,11 @@ try:
 except:
     pass
 
+if not DEBUG:
+    try:
+        import rosetta
+        INSTALLED_APPS.append('rosetta')
+    except:
+        pass
+
 AUTHENTICATION_BACKENDS = ['django.contrib.auth.backends.ModelBackend',]