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

diff --git a/GoogleTranslate.php b/GoogleTranslate.php
index 75c857b3..8d9c464c 100644
--- a/GoogleTranslate.php
+++ b/GoogleTranslate.php
@@ -20,12 +20,12 @@ 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'])) {
@@ -36,11 +36,10 @@ class Pman_Core_GoogleTranslate extends Pman
         }
         $param = array(
             'key' => $pc['googlekey'],
-            'q' => rawurlencode($_REQUEST['text']),
+            'q' =>  $_REQUEST['text'],
             'source' => $_REQUEST['src'],
             'target' => $_REQUEST['dest'],
-            'ie' => 'UTF-8',
-            'oe' => 'UTF-8',
+            'format' => 'text',
         );
         
         $url = 'https://www.googleapis.com/language/translate/v2';
@@ -48,7 +47,7 @@ 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'));
 
@@ -60,16 +59,6 @@ class Pman_Core_GoogleTranslate extends Pman
         header("content-type: text/json");
         echo $response;
         exit;
-        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));
-        }
-//        var_dump($responseDecoded->data->translations[0]->translatedText);
-        $responseDecoded->data->translations[0]->translatedText = rawurldecode(str_replace(' ', '', $responseDecoded->data->translations[0]->translatedText));
-        $this->jok($responseDecoded->data->translations[0]);
         
     }