Changeset 370 for trunk

Timestamp:

01/27/2010 10:09:19 AM (2 years ago)

Author:

ofer

Message:

Pre-calculate bing and google support for scripts

Location:

trunk/WordPress/plugin/transposh

Files:

• js/transposh.js (modified) (3 diffs)
• js/transposhedit.js (modified) (3 diffs)
• transposh.php (modified) (1 diff)

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

@@ -28 +28 @@
     source = 1,
     //Ajax translation
-    done_posted = 0, /*Timer for translation aggregation*/ timer, tokens = [], translations = [],
+    done_posted = 0, /*Timer for translation aggregation*/ timer, tokens = [], translations = []
     // the languages supported externally
     // extracted using function above + he|zh-tw|pt that we know
-    google_langs = 'af|sq|ar|be|bg|ca|zh|zh-CN|zh-TW|hr|cs|da|nl|en|et|tl|fi|fr|gl|de|el|iw|hi|hu|is|id|ga|it|ja|ko|lv|lt|mk|ms|mt|no|fa|pl|pt-PT|ro|ru|sr|sk|sl|es|sw|sv|tl|th|tr|uk|vi|cy|yi|he|zh-tw|pt',
+    //google_langs = 'af|sq|ar|be|bg|ca|zh|zh-CN|zh-TW|hr|cs|da|nl|en|et|tl|fi|fr|gl|de|el|iw|hi|hu|is|id|ga|it|ja|ko|lv|lt|mk|ms|mt|no|fa|pl|pt-PT|ro|ru|sr|sk|sl|es|sw|sv|tl|th|tr|uk|vi|cy|yi|he|zh-tw|pt',
     // got this using Microsoft.Translator.GetLanguages() with added zh and zh-tw for our needs
-    bing_langs = 'ar,bg,zh-chs,zh-cht,cs,da,nl,en,ht,fi,fr,de,el,he,it,ja,ko,pl,pt,ru,es,sv,th,zh,zh-tw';
-
+    //bing_langs = 'ar,bg,zh-chs,zh-cht,cs,da,nl,en,ht,fi,fr,de,el,he,it,ja,ko,pl,pt,ru,es,sv,th,zh,zh-tw';
+    ;
     // This function fixes the page, it gets a token and translation and fixes this,
     // since here we only get the automated source, we use this to reduce the code size
@@ -234 +234 @@
             // we'll only auto-translate and load the stuff if we either have more than 5 candidate translations, or more than one at 4am, and this language is supported...
             if ((possibly_translateable > 5 || (now.getHours() === 4 && possibly_translateable > 0)) &&
-                (google_langs.indexOf(t_jp.lang) > -1 || bing_langs.indexOf(t_jp.lang) > -1)) {
+                (t_jp.google || t_jp.msn)) {
                 // if we have a progress bar, we need to load the jqueryui before the auto translate, after the google was loaded, otherwise we can just go ahead
                 langLoaded = function () {
@@ -259 +259 @@
                 // we now start the chain that leads to auto-translate (with or without progress)
                 //if supported in msn and msn is prefered or not supported in google than msn and we have the msn key
-                if (((bing_langs.indexOf(t_jp.lang) > -1 && t_jp.preferred === 2) || (google_langs.indexOf(t_jp.lang) < 0)) &&  t_jp.msnkey !== '') {
+                if ((t_jp.msn && t_jp.preferred === 2) || !t_jp.google) {
                     source = 2;
                     getMSN = function () {

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

@@ -19 +19 @@
 // fetch translation from google translate...
 (function () { // closure
-    var loadLang, langLoaded,
-    google_langs = 'af|sq|ar|be|bg|ca|zh|zh-CN|zh-TW|hr|cs|da|nl|en|et|tl|fi|fr|gl|de|el|iw|hi|hu|is|id|ga|it|ja|ko|lv|lt|mk|ms|mt|no|fa|pl|pt-PT|ro|ru|sr|sk|sl|es|sw|sv|tl|th|tr|uk|vi|cy|yi|he|zh-tw|pt',
+    var loadLang, langLoaded;
+    //google_langs = 'af|sq|ar|be|bg|ca|zh|zh-CN|zh-TW|hr|cs|da|nl|en|et|tl|fi|fr|gl|de|el|iw|hi|hu|is|id|ga|it|ja|ko|lv|lt|mk|ms|mt|no|fa|pl|pt-PT|ro|ru|sr|sk|sl|es|sw|sv|tl|th|tr|uk|vi|cy|yi|he|zh-tw|pt',
     // got this using Microsoft.Translator.GetLanguages() with added zh and zh-tw for our needs
-    bing_langs = 'ar,bg,zh-chs,zh-cht,cs,da,nl,en,ht,fi,fr,de,el,he,it,ja,ko,pl,pt,ru,es,sv,th,zh,zh-tw';
+    //bing_langs = 'ar,bg,zh-chs,zh-cht,cs,da,nl,en,ht,fi,fr,de,el,he,it,ja,ko,pl,pt,ru,es,sv,th,zh,zh-tw';
 
     function fix_page_human(token, translation) {
@@ -175 +175 @@
         var tButtons = {}, hButtons = {};
         //only add button is bing support is defined for the language (and we got some key)
-        if (bing_langs.indexOf(t_jp.lang) > -1 && t_jp.msnkey !== '') {
+        if (t_jp.msn) {
             //ar,zh-chs,zh-cht,nl,en,fr,de,he,it,ja,ko,pl,pt,ru,es
             tButtons['Suggest - Bing'] = function () {
@@ -183 +183 @@
 
         // Only add button if google supports said language
-        if (google_langs.indexOf(t_jp.lang) > -1) {
+        if (t_jp.google) {
             tButtons['Suggest - Google'] = function () {
                 getgt();

trunk/WordPress/plugin/transposh/transposh.php

@@ -507 +507 @@
         //echo "t_jp.rtl=".(in_array ($this->target_language, $GLOBALS['rtl_languages'])? 'true' : 'false').";";
         echo "t_jp.lang='{$this->target_language}';";
+        // those two options show if the script can support said engines
+        echo "t_jp.msn=".(in_array($this->target_language,$GLOBALS['bing_languages']) && $this->options->get_msn_key()  ? 'true' : 'false').";";
+        echo "t_jp.google=".(in_array($this->target_language,$GLOBALS['google_languages']) ? 'true' : 'false').";";
         echo "t_jp.prefix='".SPAN_PREFIX."';";
         echo "t_jp.msnkey='{$this->options->get_msn_key()}';";