merge hernani > trunk

[osqa.git] / urls.py

diff --git a/urls.py b/urls.py
index e929254c1538076eed5689ad9f48ba170e458ee9..aa8bdf98d3e8051069fe9f05f873ea89c128d419 100644 (file)
--- a/urls.py
+++ b/urls.py
@@ -3,6 +3,15 @@ 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('',
+        url(r'^rosetta/', include('rosetta.urls')),
+    )
+
+handler404 = 'forum.views.meta.page'
+handler500 = 'forum.views.meta.error_handler'
+
+