Fixes the translation callback not being called and allow for suggest…

…ions on "zh-tw" and "zh-cn".
jmoiron · Feb 24, 2012 · b34d249 · b34d249
1 parent 9fbf953
commit b34d249
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/rosetta/templates/rosetta/js/rosetta.js b/rosetta/templates/rosetta/js/rosetta.js
@@ -1,3 +1,5 @@
+{% load rosetta %}
+
 google.setOnLoadCallback(function() {
     $('.location a').show().toggle(function() {
         $('.hide', $(this).parent()).show();
@@ -13,7 +15,7 @@ google.setOnLoadCallback(function() {
         var orig = $('.original .message', a.parents('tr')).html();
         var trans=$('textarea',a.parent());
         var sourceLang = '{{ MESSAGES_SOURCE_LANGUAGE_CODE }}';
-        var destLang = '{{ rosetta_i18n_lang_code|slice:":2" }}';
+        var destLang = '{{ rosetta_i18n_lang_code }}';
         var app_id = '{{ BING_APP_ID }}';
         var apiUrl = "http://api.microsofttranslator.com/V2/Ajax.svc/Translate";
 
@@ -31,13 +33,13 @@ google.setOnLoadCallback(function() {
             appid: app_id,
             from: sourceLang,
             to: destLang,
+            oncomplete: "onTranslationComplete",
             text: orig
         };
         $.ajax({
             url: apiUrl,
             data: apiData,
-            dataType: 'jsonp',
-            jsonpCallback: 'onTranslationComplete'});
+            dataType: 'jsonp'});
     });
 {% endif %}
 

diff --git a/rosetta/templatetags/rosetta.py b/rosetta/templatetags/rosetta.py
@@ -4,6 +4,7 @@
 import re
 from django.template import Node
 from django.utils.encoding import smart_str, smart_unicode
+from django.template.defaultfilters import stringfilter
 
 register = template.Library()
 rx = re.compile(r'(%(\([^\s\)]*\))?[sd])')
@@ -27,7 +28,6 @@ def minus(a,b):
     except:
         return 0
 minus=register.filter(minus)
-
 
 def gt(a,b):
     try: