revert previous commit

[osqa.git] / urls.py

diff --git a/urls.py b/urls.py
index 3ebc19e8073bbb10d384d52935213d96de9082f0..fb1fedab00d2624bab6ccb6597ab885702922a8f 100644 (file)
--- a/urls.py
+++ b/urls.py
@@ -2,10 +2,14 @@ from django.conf.urls.defaults import *
 from django.utils.translation import ugettext as _
 from django.conf import settings
 
-from django.contrib import admin
-admin.autodiscover()
-
 urlpatterns = patterns('',
-    (r'^%s' % settings.FORUM_SCRIPT_ALIAS, include('forum.urls')),
-    (r'^admin/', include(admin.site.urls)),
+    (r'', include('forum.urls')),
 )
+
+if 'rosetta' in settings.INSTALLED_APPS:
+    urlpatterns = patterns('',
+        url(r'^rosetta/', include('rosetta.urls')),
+    ) + urlpatterns
+
+handler404 = 'forum.views.meta.page'
+handler500 = 'forum.views.meta.error_handler'