X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/7f4982393567a5f6827c12a089363d91338f9f13..d273a5bb2bdf640687ecb431be28e5abc21b80ca:/urls.py diff --git a/urls.py b/urls.py index aa8bdf9..e56bc01 100644 --- a/urls.py +++ b/urls.py @@ -1,4 +1,4 @@ -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 @@ -7,11 +7,9 @@ urlpatterns = patterns('', ) 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' - -