made vote url work with the multilingual setup

1 files changed, 19 insertions, 4 deletions

diff --git a/askbot/setup_templates/urls.py b/askbot/setup_templates/urls.py
index 8c92f6d1..35f1c5b3 100644
--- a/askbot/setup_templates/urls.py
+++ b/askbot/setup_templates/urls.py
@@ -1,18 +1,33 @@
 """
 main url configuration file for the askbot site
 """
-from django.conf.urls.defaults import patterns, include, handler404, handler500, url
 from django.conf import settings
-
+from django.conf.urls.defaults import handler404
+from django.conf.urls.defaults import handler500
+from django.conf.urls.defaults import include
+from django.conf.urls.defaults import patterns
+from django.conf.urls.defaults import url
+from django.conf import settings
 from django.contrib import admin
+
 admin.autodiscover()
 
-urlpatterns = patterns('',
-    (r'%s' % settings.ASKBOT_URL, include('askbot.urls')),
+if getattr(settings, 'ASKBOT_MULTILINGUAL', False) == True:
+    from django.conf.urls.i18n import i18n_patterns
+    urlpatterns = i18n_patterns('',
+        (r'%s' % settings.ASKBOT_URL, include('askbot.urls'))
+    )
+else:
+    urlpatterns = patterns('',
+        (r'%s' % settings.ASKBOT_URL, include('askbot.urls'))
+    )
+
+urlpatterns += patterns('',
     (r'^admin/', include(admin.site.urls)),
     #(r'^cache/', include('keyedcache.urls')), - broken views disable for now
     (r'^settings/', include('askbot.deps.livesettings.urls')),
     (r'^followit/', include('followit.urls')),
+    (r'^tinymce/', include('tinymce.urls')),
     (r'^robots.txt$', include('robots.urls')),
     url( # TODO: replace with django.conf.urls.static ?
         r'^%s(?P<path>.*)$' % settings.MEDIA_URL[1:],