Fixed issue #5870: Progress indicator in Quick-translate hiding too e…

…arly. Some languages (like Irish or Chinese) did not translate.
LimeSurvey · Mar 6, 2012 · 3decdd3 · 3decdd3
1 parent 514c9df
commit 3decdd3
Showing 1 changed file with 33 additions and 5 deletions.
diff --git a/scripts/admin/translation.js b/scripts/admin/translation.js
@@ -1,8 +1,9 @@
 // $Id: tokens.js 8633 2010-04-25 12:57:33Z c_schmitz
+var iRunningThreads=0;
+
 $(document).ready(function(){
 
     intThrottlingRate = 550; // 1 request per 550 ms
-
     $('#translationtabs').tabs();
     $('#translationtabs').show();
     $('#translationloading').hide();
@@ -14,6 +15,23 @@ $(document).ready(function(){
         var sBaseLang    = $("[name=baselang]").val();
         var sToLang      = $("[name=tolang]").val();
 
+        switch (sToLang)
+        {
+            case 'he': sToLang='iw'; break;
+            case 'zh-Hans': sToLang='zh-CN'; break;
+            case 'zh-Hant-TW': sToLang='zh-TW'; break;
+            case 'zh-Hant-HK': sToLang='zh-TW'; break;
+            case 'nl-informal': sToLang='nl'; break;
+            case 'de-informal': sToLang='de'; break;
+            case 'ie': sToLang='ga'; break;
+            case 'it-formal': sToLang='it'; break;
+            case 'nb': sToLang='no'; break;
+            case 'nn': sToLang='no'; break;
+            case 'pt-BR': sToLang='pt'; break;
+            case 'es-MX': sToLang='es'; break;
+            zh-Hans
+        }
+
         $("._from_",$(ui.target).parent()).each(function(index,element)
         {
             var sToConvert = $(element).html();
@@ -48,38 +66,48 @@ $(document).ready(function(){
             }
 
             if (!bIgnore){
+
                 sToConvert = sToConvert.replace( new RegExp( "\\n", "g" ),'\\n');
                 sToConvert = sToConvert.replace(/"/g,'\\"');
                 setTimeout('fDoTranslateAjax("'+sBaseLang+'","'+sToLang+'","'+sToConvert+'","'+sId+'");',index*intThrottlingRate)
             }
 
         });
 
-        setTimeout('fHideAjaxLoader();',($("._from_",$(ui.target).parent()).length)*intThrottlingRate)
 
         return false;
     });
 });
 function fHideAjaxLoader(){
-    $('.ajax-loader').css('display','none');
+    iRunningThreads--;
+    if (iRunningThreads<=0)
+    {
+        $('.ajax-loader').css('display','none');
+    }
 }
 
 function fDoTranslateAjax(sBaseLang,sToLang,sToConvert,sId)
   {
       $('.ajax-loader').css('display','inline');
+      iRunningThreads++;
       $.ajax({
-            // url:'admin.php',
+            url:'admin.php',
             datatype: 'json',
             async: true,
-            type: 'POST',
             data:{
                 action: 'ajaxtranslategoogleapi',
                 baselang:sBaseLang,
                 tolang:sToLang,
                 text:sToConvert
             },
+            error: function()
+            {
+                fHideAjaxLoader();
+            },
             success: function(aData)
             {
+                fHideAjaxLoader();
+
                 if (aData.error)
                 {
                     alert(sGoogleApiError + " " + sDetailedError + ": " + aData.error);