X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/410bfa05ee36ed1d99356c443a5f3f6aa3ee9578..0ea3cdb937d3d53c38b2e1c4b3a3205560e537cb:/forum/urls.py diff --git a/forum/urls.py b/forum/urls.py index 7975644..0155406 100644 --- a/forum/urls.py +++ b/forum/urls.py @@ -1,7 +1,7 @@ import startup import os.path -from django.conf import settings +from forum import settings from django.conf.urls.defaults import * from django.contrib import admin from forum import views as app @@ -51,7 +51,7 @@ urlpatterns += patterns('', url(r'^%s$' % _('privacy/'), app.meta.privacy, name='privacy'), url(r'^%s$' % _('logout/'), app.meta.logout, name='logout'), url(r'^%s(?P\d+)/%s$' % (_('answers/'), _('edit/')), app.writers.edit_answer, name='edit_answer'), - url(r'^%s(?P\d+)/%s$' % (_('answers/'), _('revisions/')), app.readers.revisions, name='answer_revisions'), + url(r'^%s(?P\d+)/$' % _('revisions/'), app.readers.revisions, name='revisions'), url(r'^%s$' % _('questions/'), app.readers.questions, name='questions'), url(r'^%s%s$' % (_('questions/'), _('ask/')), app.writers.ask, name='ask'), url(r'^%s%s$' % (_('questions/'), _('unanswered/')), app.readers.unanswered, name='unanswered'), @@ -72,8 +72,6 @@ urlpatterns += patterns('', url(r'^%s' % _('matching_tags/'), app.commands.matching_tags, name='matching_tags'), url(r'^%s(?P\d+)/' % _('node_markdown/'), app.commands.node_markdown, name='node_markdown'), - url(r'^%s(?P\d+)/%s$' % (_('questions/'), _('revisions/')), app.readers.revisions, name='question_revisions'), - #place general question item in the end of other operations url(r'^%s(?P\d+)/(?P[\w-]*)$' % _('question/'), app.readers.question, name='question'), url(r'^%s$' % _('tags/'), app.readers.tags, name='tags'), @@ -136,8 +134,3 @@ urlpatterns += patterns('', url(r'^feeds/rss/$', RssLastestQuestionsFeed, name="latest_questions_feed"), ) - -if 'rosetta' in settings.INSTALLED_APPS: - urlpatterns += patterns('', - url(r'^rosetta/', include('rosetta.urls')), - ) \ No newline at end of file