made vote url work with the multilingual setup

6 files changed, 31 insertions, 26 deletions

diff --git a/askbot/media/images/sprites.png b/askbot/media/images/sprites.png
index c4e9029c..78eea747 100644
--- a/askbot/media/images/sprites.png
+++ b/askbot/media/images/sprites.png
diff --git a/askbot/media/js/post.js b/askbot/media/js/post.js
index 6bc37600..e30a0c88 100644
--- a/askbot/media/js/post.js
+++ b/askbot/media/js/post.js
@@ -548,10 +548,8 @@ var Vote = function(){
     var acceptAnonymousMessage = gettext('insufficient privilege');
     var acceptOwnAnswerMessage = gettext('cannot pick own answer as best');
 
-    var pleaseLogin = " <a href='" + askbot['urls']['user_signin']
-                    + "?next=" + askbot['urls']['question_url_template']
-                    + "'>"
-                    + gettext('please login') + "</a>";
+    var pleaseLogin = " <a href='" + askbot['urls']['user_signin'] + ">"
+                        + gettext('please login') + "</a>";
 
     var favoriteAnonymousMessage = gettext('anonymous users cannot follow questions') + pleaseLogin;
     var subscribeAnonymousMessage = gettext('anonymous users cannot subscribe to questions') + pleaseLogin;
@@ -778,7 +776,7 @@ var Vote = function(){
             type: "POST",
             cache: false,
             dataType: "json",
-            url: askbot['urls']['vote_url_template'].replace('{{QuestionID}}', questionId),
+            url: askbot['urls']['vote_url'],
             data: { "type": voteType, "postId": postId },
             error: handleFail,
             success: function(data) {
@@ -1786,6 +1784,7 @@ Comment.prototype.setContent = function(data){
     this._user_link = $('<a></a>').attr('class', 'author');
     this._user_link.attr('href', this._data['user_url']);
     this._user_link.html(this._data['user_display_name']);
+    this._comment_body.append(' ');
     this._comment_body.append(this._user_link);
 
     this._comment_body.append(' (');
@@ -2147,15 +2146,7 @@ QASwapper.prototype.startSwapping = function(){
                 url: askbot['urls']['swap_question_with_answer'],
                 data: data,
                 success: function(data){
-                    var url_template = askbot['urls']['question_url_template'];
-                    new_question_url = url_template.replace(
-                        '{{QuestionID}}',
-                        data['id']
-                    ).replace(
-                        '{{questionSlug}}',
-                        data['slug']
-                    );
-                    window.location.href = new_question_url;
+                    window.location.href = data['question_url'];
                 }
             });
             break;
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:], 
diff --git a/askbot/templates/main_page/javascript.html b/askbot/templates/main_page/javascript.html
index 7ad02e29..55b31d00 100644
--- a/askbot/templates/main_page/javascript.html
+++ b/askbot/templates/main_page/javascript.html
@@ -18,7 +18,6 @@
     askbot['urls']['mark_subscribed_tag'] = '{% url mark_subscribed_tag %}';
     askbot['urls']['unmark_tag'] = '{% url unmark_tag %}';
     askbot['urls']['set_tag_filter_strategy'] = '{% url "set_tag_filter_strategy" %}';
-    askbot['urls']['question_url_template'] = scriptUrl + '{{'question/'|transurl}}{{ "{{QuestionID}}/" }}';
 
     if (Modernizr.history) {
         // history management works!
diff --git a/askbot/templates/question/javascript.html b/askbot/templates/question/javascript.html
index 5871ee5f..8b24655a 100644
--- a/askbot/templates/question/javascript.html
+++ b/askbot/templates/question/javascript.html
@@ -13,8 +13,7 @@
     askbot['urls']['convertAnswer'] = '{% url answer_to_comment %}';
     askbot['urls']['getComment'] = '{% url get_comment %}';
     askbot['urls']['saveDraftAnswer'] = '{% url save_draft_answer %}';
-    askbot['urls']['question_url_template'] = scriptUrl + '{{ 'question/'|transurl }}{{ "{{QuestionID}}/{{questionSlug}}" }}';{# yes it needs to be that whacky #}
-    askbot['urls']['vote_url_template'] = scriptUrl + '{{ 'questions/'|transurl }}{{ "{{QuestionID}}/" }}{{ 'vote/'|transurl }}';
+    askbot['urls']['vote_url'] = '{% url vote question.id %}';
     askbot['urls']['user_signin'] = '{{ settings.LOGIN_URL }}';
     askbot['urls']['swap_question_with_answer'] = '{% url swap_question_with_answer %}';
     askbot['urls']['upvote_comment'] = '{% url upvote_comment %}';
diff --git a/askbot/views/commands.py b/askbot/views/commands.py
index 1663a049..e524b81f 100644
--- a/askbot/views/commands.py
+++ b/askbot/views/commands.py
@@ -822,12 +822,13 @@ def swap_question_with_answer(request):
     """
     if request.user.is_authenticated():
         if request.user.is_administrator() or request.user.is_moderator():
-            answer = models.Post.objects.get_answers(request.user).get(id = request.POST['answer_id'])
+            answer = models.Post.objects.get_answers(
+                                                request.user
+                                            ).get(
+                                                id=request.POST['answer_id']
+                                            )
             new_question = answer.swap_with_question(new_title = request.POST['new_title'])
-            return {
-                'id': new_question.id,
-                'slug': new_question.slug
-            }
+            return {'question_url': new_question.get_absolute_url() }
     raise Http404
 
 @csrf.csrf_exempt