X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/c76406e46e71cb86cfb440667bfbbe21b36e709e..c9c3cb4c714911710f606f8dc47d5e65707aff67:/forum/urls.py diff --git a/forum/urls.py b/forum/urls.py index 3547fc2..30fd5ac 100644 --- a/forum/urls.py +++ b/forum/urls.py @@ -6,14 +6,14 @@ from django.conf.urls.defaults import * from django.conf import settings as djsettings from django.contrib import admin from forum import views as app -from forum.sitemap import QuestionsSitemap +from forum.sitemap import OsqaSitemap from django.utils.translation import ugettext as _ import logging admin.autodiscover() sitemaps = { - 'questions': QuestionsSitemap + 'questions': OsqaSitemap } APP_PATH = os.path.dirname(__file__) @@ -144,7 +144,7 @@ urlpatterns += patterns('', name='user_recent'), url(r'^%s(?P\d+)/(?P.*)/$' % _('users/'), app.users.user_profile, name='user_profile'), url(r'^%s$' % _('badges/'), app.meta.badges, name='badges'), - url(r'^%s(?P\d+)/(?P.*)$' % _('badges/'), app.meta.badge, name='badge'), + url(r'^%s(?P\d+)/(?P[\w-]+)/?$' % _('badges/'), app.meta.badge, name='badge'), # (r'^admin/doc/' % _('admin/doc'), include('django.contrib.admindocs.urls')), url(r'^%s$' % _('upload/'), app.writers.upload, name='upload'),