X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=GoogleTranslate.php;h=8d9c464ced5ba920a0a814abec9c43a52f6ab523;hp=cbd6755f6a9398aa4f223b28ae956852ea83208c;hb=8cd2a9237c684aa16bc21e3ac6d3793c49c65400;hpb=c8bb2d61ca6a1fe9be63ca2429a80cd22b722c8d

diff --git a/GoogleTranslate.php b/GoogleTranslate.php
index cbd6755f..8d9c464c 100644
--- a/GoogleTranslate.php
+++ b/GoogleTranslate.php
@@ -20,25 +20,26 @@ class Pman_Core_GoogleTranslate extends Pman
         
         $this->authUser = $au;
     }
-    function get() {
+    function get($v, $opts=array()) {
         // for testing..
         return $this->post();
     }
     
-    function post()
+    function post($v)
     {
         $pc = HTML_FlexyFramework::get()->Pman_Core;
         if (empty($pc['googlekey'])) {
             $this->jerr("Google API Key not configured");
         }
         if (!strlen(trim($_REQUEST['text']))) {
-            $this->jok("");
+            $this->jok(array("translatedText" =>""));
         }
         $param = array(
             'key' => $pc['googlekey'],
-            'q' => rawurlencode($_REQUEST['text']),
+            'q' =>  $_REQUEST['text'],
             'source' => $_REQUEST['src'],
-            'target' => $_REQUEST['dest']
+            'target' => $_REQUEST['dest'],
+            'format' => 'text',
         );
         
         $url = 'https://www.googleapis.com/language/translate/v2';
@@ -46,25 +47,18 @@ class Pman_Core_GoogleTranslate extends Pman
         $handle = curl_init();
         curl_setopt($handle, CURLOPT_URL, $url);
         curl_setopt($handle, CURLOPT_POST, count($param));
-        curl_setopt($handle, CURLOPT_POSTFIELDS, http_build_query($param));
+        curl_setopt($handle, CURLOPT_POSTFIELDS, $param);
         curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($handle, CURLOPT_HTTPHEADER, array('X-HTTP-Method-Override: GET'));
 
         $response = curl_exec($handle);
 
-        $responseDecoded = json_decode($response);
+//        $responseDecoded = json_decode($response);
         curl_close($handle);
         
-        if(!empty($responseDecoded->error)){
-            $this->jerr($responseDecoded->error->message);
-        }
-//        print_r($responseDecoded);
-        if(empty($responseDecoded->data->translations[0]->translatedText)){
-            $this->jerr('does not have translated text.', print_r($responseDecoded, true));
-        }
-        
-        $responseDecoded->data->translations[0]->translatedText = rawurldecode($responseDecoded->data->translations[0]->translatedText);
-        $this->jok($responseDecoded->data->translations[0]);
+        header("content-type: text/json");
+        echo $response;
+        exit;
         
     }