X-Git-Url: https://git.openstreetmap.org/osqa.git/blobdiff_plain/b25d38d030d7cc51b68999150bfb4cd0b050e136..3223ab3b10da1eac0f6f608a2619ffe53d5a0889:/urls.py

diff --git a/urls.py b/urls.py
index 51fa720..e56bc01 100644
--- a/urls.py
+++ b/urls.py
@@ -1,13 +1,15 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url, include
 from django.utils.translation import ugettext as _
 from django.conf import settings
 
 urlpatterns = patterns('',
-    (r'^%s' % settings.FORUM_SCRIPT_ALIAS, include('forum.urls')),
+    (r'', include('forum.urls')),
 )
 
 if 'rosetta' in settings.INSTALLED_APPS:
-    urlpatterns += patterns('',
+    urlpatterns = patterns('',
         url(r'^rosetta/', include('rosetta.urls')),
-    )
+    ) + urlpatterns
 
+handler404 = 'forum.views.meta.page'
+handler500 = 'forum.views.meta.error_handler'