Changeset 664

Timestamp:

11/02/2011 11:17:01 PM (7 months ago)

Author:

ofer

Message:

Allow using your own MSN API Key, And setting up the Google API Key (not using yet)

Location:

trunk/WordPress/plugin/transposh

Files:

• js/transposh.js (modified) (1 diff)
• transposh.php (modified) (2 diffs)
• wp/transposh_admin.php (modified) (3 diffs)
• wp/transposh_options.php (modified) (5 diffs)

trunk/WordPress/plugin/transposh/js/transposh.js

@@ -35 +35 @@
     // transposh app_id for msn translate, now global
     t_jp.MSN_APPID = 'FACA8E2DF8DCCECE0DC311C6E57DA98EFEFA9BC6';
+    if (t_jp.msn_key) {
+        t_jp.MSN_APPID = t_jp.msn_key;
+    }
     // set base uri for jQueryUI
-    t_jp.jQueryUI = 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/';
+    t_jp.jQueryUI = 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/';
 
     // This function fixes the page, it gets a token and translation and fixes this,

trunk/WordPress/plugin/transposh/transposh.php

@@ -685 +685 @@
             'plugin_url' => $this->transposh_plugin_url,
             'lang' => $this->target_language,
-            //TODO - orig language?
             'olang' => $this->options->get_default_language(),
             // those two options show if the script can support said engines
@@ -691 +690 @@
             'preferred' => $this->options->get_preferred_translator()
         );
-        if (in_array($this->target_language, transposh_consts::$bing_languages))
+
+        if (in_array($this->target_language, transposh_consts::$bing_languages)) {
                 $script_params['msn'] = 1;
-        if (in_array($this->target_language, transposh_consts::$google_languages))
+                if ($this->options->get_msn_key()) {
+                    $script_params['msn_key'] = $this->options->get_msn_key();
+                }
+        }
+        if (in_array($this->target_language, transposh_consts::$google_languages)) {
                 $script_params['google'] = 1;
+                if ($this->options->get_google_key()) {
+                    $script_params['google_key'] = $this->options->get_google_key();
+                }
+        }
         if (in_array($this->target_language, transposh_consts::$apertium_languages))
                 $script_params['apertium'] = 1;

trunk/WordPress/plugin/transposh/wp/transposh_admin.php

@@ -121 +121 @@
         $this->transposh->options->set_transposh_default_locale_override($_POST[TRANSPOSH_DEFAULT_LOCALE_OVERRIDE]);
         $this->transposh->options->set_preferred_translator($_POST[PREFERRED_TRANSLATOR]);
+        $this->transposh->options->set_msn_key($_POST[MSN_TRANSLATE_KEY]);
+        $this->transposh->options->set_google_key($_POST[GOOGLE_TRANSLATE_KEY]);
         $this->transposh->options->set_transposh_key($_POST[TRANSPOSH_KEY]);
 
@@ -232 +234 @@
         }
 
-        if (!(class_exists('Memcache') /*!!&& $this->memcache->connect(TP_MEMCACHED_SRV, TP_MEMCACHED_PORT)*/) && !function_exists('apc_fetch') && !function_exists('xcache_get') && !function_exists('eaccelerator_get')) {
+        if (!(class_exists('Memcache') /* !!&& $this->memcache->connect(TP_MEMCACHED_SRV, TP_MEMCACHED_PORT) */) && !function_exists('apc_fetch') && !function_exists('xcache_get') && !function_exists('eaccelerator_get')) {
             $this->add_warning('tp_cache_warning', __('We were not able to find a supported in-memory caching engine, installing one can improve performance.', TRANSPOSH_TEXT_DOMAIN) . ' <a href="http://transposh.org/faq#performance">' . __('Check Transposh FAQs', TRANSPOSH_TEXT_DOMAIN) . '</a>');
         }
@@ -497 +499 @@
         __('Do automatic translation immediately after a post has been published', TRANSPOSH_TEXT_DOMAIN);
 
+        /**
+         * Allow users to insert their own API keys
+         */
+        echo '<h4>' . __('MSN API key', TRANSPOSH_TEXT_DOMAIN) . '</h4>';
+        echo __('API Key', TRANSPOSH_TEXT_DOMAIN).': <input type="text" size="35" class="regular-text" value="' . $this->transposh->options->get_msn_key() . '" id="'.MSN_TRANSLATE_KEY.'" name="'.MSN_TRANSLATE_KEY.'"/>';
+
+          /**
+         * Allow users to insert their own API keys
+         */
+        echo '<h4>' . __('Google API key', TRANSPOSH_TEXT_DOMAIN) . '</h4>';
+        echo __('API Key', TRANSPOSH_TEXT_DOMAIN).': <input type="text" size="35" class="regular-text" value="' . $this->transposh->options->get_google_key() . '" id="'.GOOGLE_TRANSLATE_KEY.'" name="'.GOOGLE_TRANSLATE_KEY.'"/>';
+
         /*
          * Choose default translator... TODO (explain better in wiki)

trunk/WordPress/plugin/transposh/wp/transposh_options.php

@@ -24 +24 @@
 define('OLD_ENABLE_MSN_TRANSLATE', 'enable_msntranslate');
 //Option to store the msn API key
-define('OLD_MSN_TRANSLATE_KEY', 'msn_key');
+define('MSN_TRANSLATE_KEY', 'msn_key');
+//Option to store the msn API key
+define('GOOGLE_TRANSLATE_KEY', 'google_key');
 
 //defines are used to avoid typos
@@ -115 +117 @@
         $this->set_default_option_value(WIDGET_REMOVE_LOGO_FOR_AD);
         $this->set_default_option_value(WIDGET_THEME, 'ui-lightness');
+        $this->set_default_option_value(MSN_TRANSLATE_KEY);
+        $this->set_default_option_value(GOOGLE_TRANSLATE_KEY);
         $this->set_default_option_value(TRANSPOSH_KEY);
         $this->set_default_option_value(TRANSPOSH_BACKUP_SCHEDULE);
@@ -142 +146 @@
             unset($this->options[OLD_WIDGET_IN_LIST]);
             unset($this->options[OLD_WIDGET_STYLE]);
-            unset($this->options[OLD_MSN_TRANSLATE_KEY]);
             unset($this->options[OLD_ENABLE_MSN_TRANSLATE]);
             logger($this->options);
@@ -229 +232 @@
         // default is true
         return $this->options[ENABLE_AUTO_TRANSLATE];
+    }
+
+    function get_msn_key() {
+        return $this->options[MSN_TRANSLATE_KEY];
+    }
+
+    function get_google_key() {
+        return $this->options[GOOGLE_TRANSLATE_KEY];
     }
 
@@ -377 +388 @@
     }
 
+      function set_msn_key($val) {
+        $this->set_value($val, $this->options[MSN_TRANSLATE_KEY]);
+    }
+
+          function set_google_key($val) {
+        $this->set_value($val, $this->options[GOOGLE_TRANSLATE_KEY]);
+    }
+
     function set_enable_auto_post_translate($val) {
         $val = ($val) ? 1 : 0;