Pman.GoogleTranslate.js

[Pman.Core] / Pman.GoogleTranslate.js

diff --git a/Pman.GoogleTranslate.js b/Pman.GoogleTranslate.js
index e4c3411..9d3c5ac 100644 (file)
--- a/Pman.GoogleTranslate.js
+++ b/Pman.GoogleTranslate.js
@@ -1,21 +1,45 @@
 //<script type="text/javascript">
 /**
-     * 
-     * GoogleTranslate
-     * Translate a string using google translate API
-     * 
-     * Note: this does not handle html input at present - 
-     * @param str {String} input string
-     * @param src {String} source language (or '' for autoguess)
-     * @param str {String} target language
-     * @param str {String} callback - calls back with result or an error object.
-     */
-Pman.GoogleTranslate = function(str, src, dest, cb) {
+ * 
+ * GoogleTranslate
+ * Translate a string using google translate API
+ * 
+ * Note: this does not handle html input at present - 
+ * @param str {String} input string
+ * @param src {String} source language (or '' for autoguess)
+ * @param str {String} target language
+ * @param str {String} callback - calls back with result or an error object.
+ */
+Pman.GoogleTranslate = function(str, src, dest, cb, force) {
         // load script: 
         var cur = 0;
         var sbits = [];
         var complete = '';
         
+        
+        if (!Pman.GoogleTranslate.key) {
+            
+            new Pman.Request({
+                method : 'POST',
+                url : baseURL + '/Core/GoogleKey',
+                success : function(data)
+                {
+                    Pman.GoogleTranslate.key = data.data;
+                    
+                    Pman.GoogleTranslate(str, src, dest, cb, force);
+                    
+                }
+                
+                
+            });
+            
+            
+            
+            
+            return;
+        }
+        
+        
         function escapeDecode(encodedString) {
             var output = encodedString;
             var binVal, thisString;
@@ -31,39 +55,48 @@ Pman.GoogleTranslate = function(str, src, dest, cb) {
             return Roo.util.Format.htmlDecode( output);
         }
         
-        
-        
+         
         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++;
                 transbits();
-            });
+            }, true);
         }
         
         // chunk up long strings..
-        if (str.length > 300) {
-            var bits = str.split(/\s+/);
+        // we should roo.encode to test lenght..
+        if (!force && str.length > 200) {
+            var bits = str.split(/(\s+|[0-9\u3002\uff0c\u3001\u201c\u201d]+)/);
             sbits[0]  = '';
             for (var i =0; i < bits.length; i++) {
-                if (sbits[cur].length + bits[i].length > 290) {
+                if (sbits[cur].length + bits[i].length > 190) {
                     cur++;
                     sbits[cur] = bits[i];
                     continue;
                 }
-                sbits[cur] += sbits[cur].length  ? ' ' : '';
+                //sbits[cur] += sbits[cur].length  ? ' ' : '';
                 sbits[cur] += bits[i] + ' '
                 
             }
@@ -77,28 +110,38 @@ Pman.GoogleTranslate = function(str, src, dest, cb) {
                 
                 
                 
-                
-        
-        
-        
-        
+          
         var x = new Roo.data.ScriptTagProxy({ 
-            url:  'http://ajax.googleapis.com/ajax/services/language/translate', 
-            callbackParam : 'callback' 
+            url:   'https://www.googleapis.com/language/translate/v2',
+                  //'http://ajax.googleapis.com/ajax/services/language/translate', 
+            callbackParam : 'callback'
+            
             
         });
+        /// fix some of the languages..
+        //switch (dest) {
+        //        case 'zh-CN' : dest = 'zh-CN'; break;
+         //       case 'zh-HK' : dest = 'zh-TW'; break;
+         //           
+        //}
+         
+        
         x.load(
             {
-                v: '1.0',
+                key :  Pman.GoogleTranslate.key,
+              //  v: '1.0',
                 q : str,
-                langpair : src + '|' +dest
+                source : src,
+                target : dest
+                //langpair : src + '|' +dest
             }, // end params.
             { // reader
                 readRecords : function (o) {
+                    Roo.log(o);
                     if (!o.responseData) {
                         return o;
                     }
-                    return escapeDecode(o.responseData.translatedText);
+                    return escapeDecode(o.responseData.translations[0].translatedText);
                 }
             }, 
             function (result) {