Merging jambazov --> trunk.

[osqa.git] / forum / urls.py

diff --git a/forum/urls.py b/forum/urls.py
index e964bc48960b329c3ba0afd29d21c410c5036424..28175216aa20c91d0f31c7fbd15b74503d1ac3c4 100644 (file)
--- a/forum/urls.py
+++ b/forum/urls.py
@@ -34,7 +34,7 @@ urlpatterns += patterns('',
                         url(r'^%s(.*)' % _('nimda/'), admin.site.root),
                         
                         url(r'^sitemap.xml$', 'forum.sitemap.index', {'sitemaps': sitemaps}),
-                        url(r'^sitemap-(?P<section>.+)\.xml$', 'django.contrib.sitemaps.views.sitemap', {'sitemaps': sitemaps}),
+                        url(r'^sitemap-(?P<section>.+)\.xml$', 'forum.sitemap.sitemap', {'sitemaps': sitemaps}),
 
                         (r'^favicon\.ico$', app.meta.favicon),
                         url(r'^cstyle\.css$', app.meta.custom_css, name="custom_css"),
@@ -210,6 +210,9 @@ urlpatterns += patterns('',
                         url(r'^%s%s(?P<set_name>\w+)/$' % (_('admin/'), _('settings/')), app.admin.settings_set,
                             name="admin_set"),
 
+                        url(r'%s%s' % (_('admin/'), _('test_email_settings/')), app.admin.test_email_settings,
+                            name="test_email_settings"),
+
                         url(r'^feeds/rss[/]?$', app.readers.feed, name="latest_questions_feed"),
 
                         url(r'^(?P<path>.+)$', app.meta.page, name="static_page"),