DataObjects/Core_watch.php

[Pman.Core] / Pman.GoogleTranslate.js

diff --git a/Pman.GoogleTranslate.js b/Pman.GoogleTranslate.js
index 49b4b95..1978ccd 100644 (file)
--- a/Pman.GoogleTranslate.js
+++ b/Pman.GoogleTranslate.js
@@ -16,6 +16,35 @@ Pman.GoogleTranslate = function(str, src, dest, cb, force) {
         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);
+                    
+                },
+                failure : function() {
+                    Roo.log("Google key fetch failed");
+                    // do not display error message...
+                    return true;
+                }
+                
+                
+            });
+            
+            
+            
+            
+            return;
+        }
+        
+        
         function escapeDecode(encodedString) {
             var output = encodedString;
             var binVal, thisString;
@@ -86,28 +115,40 @@ Pman.GoogleTranslate = function(str, src, dest, cb, force) {
                 
                 
                 
-                
-        
-        
-        
-        ,
+          
         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'
+            
             
         });
+        
+        src = src.replace('_','-');
+        dest = dest.replace('_','-');
+        // google does not recognize HK...
+        if (src  == 'zh-HK')  src = 'zh-TW';
+        if (dest == 'zh-HK') dest = 'zh-TW';
+     
+         
+        
         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) {
-                    if (!o.responseData) {
+                    Roo.log(o);
+                    if (!o.data) {
                         return o;
                     }
-                    return escapeDecode(o.responseData.translatedText);
+                    return o.data.translations[0].translatedText;
+                    //return escapeDecode(o.data.translations[0].translatedText);
                 }
             }, 
             function (result) {