Closing OSQA 91. Give admins a way to make users new admins or moderators.

[osqa.git] / settings.py

diff --git a/settings.py b/settings.py
index 246c3177ff526e5c46cca30311a548155c77229f..7b9e1f0f432ed6821051afade6fbbad30d7bdbbd 100644 (file)
--- a/settings.py
+++ b/settings.py
@@ -67,11 +67,11 @@ INSTALLED_APPS = [
     'django.contrib.admin',
     'django.contrib.humanize',
     'django.contrib.sitemaps',
-    #'django.contrib.markup',
+    'django.contrib.markup',
     'forum',
 ]
 
-if DEBUG:
+if DEBUG and False:
     try:
         import debug_toolbar
         MIDDLEWARE_CLASSES.append('debug_toolbar.middleware.DebugToolbarMiddleware')
@@ -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',]