X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/db07af419adf62af077ffb55c7b4027f6fd5e9b2..83decf4390facb76eddc78f75826c5a5332507c6:/forum/urls.py

diff --git a/forum/urls.py b/forum/urls.py
index c2720e5..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__)
@@ -90,6 +90,7 @@ urlpatterns += patterns('',
                         url(r'^%s(?P<id>\d+)/(?P<user>\d+)?$' % _('subscribe/'), app.commands.subscribe, name="subscribe"),
                         url(r'^%s(?P<id>\d+)/$' % _('subscribe/'), app.commands.subscribe, name="subscribe_simple"),
                         url(r'^%s' % _('matching_tags/'), app.commands.matching_tags, name='matching_tags'),
+                        url(r'^%s' % _('matching_users/'), app.commands.matching_users, name='matching_users'),
                         url(r'^%s(?P<id>\d+)/' % _('node_markdown/'), app.commands.node_markdown, name='node_markdown'),
                         url(r'^%s(?P<id>\d+)/' % _('convert/'), app.commands.convert_to_comment,
                             name='convert_to_comment'),
@@ -143,7 +144,7 @@ urlpatterns += patterns('',
                             name='user_recent'),
                         url(r'^%s(?P<id>\d+)/(?P<slug>.*)/$' % _('users/'), app.users.user_profile, name='user_profile'),
                         url(r'^%s$' % _('badges/'), app.meta.badges, name='badges'),
-                        url(r'^%s(?P<id>\d+)/(?P<slug>.*)$' % _('badges/'), app.meta.badge, name='badge'),
+                        url(r'^%s(?P<id>\d+)/(?P<slug>[\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'),