Pman.GoogleTranslate.js

[Pman.Core] / Pman.GoogleTranslate.js

diff --git a/Pman.GoogleTranslate.js b/Pman.GoogleTranslate.js
index b525974..34776e3 100644 (file)
--- a/Pman.GoogleTranslate.js
+++ b/Pman.GoogleTranslate.js
@@ -35,17 +35,26 @@ Pman.GoogleTranslate = function(str, src, dest, cb) {
         
         function transbits()
         {
-            if ((cur +1) > sbits.length) {
-                //Roo.log("CALLING COMPLETED: " + complete);
-                cb(complete);
-                return;
+            while (true) {
+                if ((cur +1) > sbits.length) {
+                    //Roo.log("CALLING COMPLETED: " + complete);
+                    cb(complete);
+                    return;
+                }
+                if (!sbits[cur].length || !sbits[cur].replace(/\s+/).length) {
+                    cur++;
+                    continue;
+                }
+                break;
             }
+            
            // Roo.log("SEND : " + sbits[cur]);
-            Pman.gtranslate( sbits[cur], src, dest, function(result) {
+            Pman.GoogleTranslate( sbits[cur], src, dest, function(result) {
                 if (typeof(result) == 'object') {
                     cb(result);
                     return;
                 }
+                //padding might not be needed...
                 complete += complete.length ? ' ' : ''; 
                 complete += result;
                 cur++;
@@ -55,7 +64,7 @@ Pman.GoogleTranslate = function(str, src, dest, cb) {
         
         // chunk up long strings..
         if (str.length > 200) {
-            var bits = str.split(/\s+/);
+            var bits = str.split(/(\s+|[0-9]+)/);
             sbits[0]  = '';
             for (var i =0; i < bits.length; i++) {
                 if (sbits[cur].length + bits[i].length > 190) {
@@ -63,7 +72,7 @@ Pman.GoogleTranslate = function(str, src, dest, cb) {
                     sbits[cur] = bits[i];
                     continue;
                 }
-                sbits[cur] += sbits[cur].length  ? ' ' : '';
+                //sbits[cur] += sbits[cur].length  ? ' ' : '';
                 sbits[cur] += bits[i] + ' '
                 
             }