Changeset 667 for trunk

Timestamp:

11/20/2011 10:20:48 AM (6 months ago)

Author:

ofer

Message:

Attack of the paid APIs! This commit changes the ways Transposh handles MSN and Google translate, improving the google proxy and allowing use of external keys. Keys are OPTIONAL! We have also improved the translate all feature and changed the entire ajax workflow to the wordpress engine. Should prove less 500 error prune. And we want more money too!

Location:

trunk/WordPress/plugin/transposh

Files:

• core/constants.php (modified) (3 diffs)
• core/parser.php (modified) (2 diffs)
• core/utils.php (modified) (1 diff)
• js/transposh.js (modified) (15 diffs)
• js/transposhbackend.js (moved) (moved from trunk/WordPress/plugin/transposh/js/transposhadmin.js) (10 diffs)
• js/transposhedit.js (modified) (7 diffs)
• js/transposhsettings.js (moved) (moved from trunk/WordPress/plugin/transposh/js/transposhcontrol.js) (5 diffs)
• transposh.php (modified) (10 diffs)
• wp/transposh_admin.php (modified) (7 diffs)
• wp/transposh_ajax.php (modified) (1 diff)
• wp/transposh_backup.php (modified) (3 diffs)
• wp/transposh_db.php (modified) (2 diffs)
• wp/transposh_postpublish.php (modified) (8 diffs)
• wp/transposh_widget.php (modified) (1 diff)

trunk/WordPress/plugin/transposh/core/constants.php

@@ -61 +61 @@
         'cs' => 'Czech,Čeština,cz,cs_CZ',
         'da' => 'Danish,Dansk,dk,da_DK',
-        'nl' => 'Dutch,Nederlands,nl,',
+        'nl' => 'Dutch,Nederlands,nl,nl_NL',
         'eo' => 'Esperanto,Esperanto,esperanto,',
         'et' => 'Estonian,Eesti keel,ee,',
@@ -116 +116 @@
     // (got using - var langs =''; jQuery.each(google.language.Languages,function(){if (google.language.isTranslatable(this)) {langs += this +'|'}}); console.log(langs); - fixed for our codes)
     // @updated 2010-Oct-01 (hy,az,eu,ka,la,ur)
+    // @updated 2011-Nov-04
     // $google_languages = array('en', 'af', 'sq', 'ar', 'hy', 'az', 'eu', 'be', 'bg', 'ca', 'zh', 'zh-tw', 'hr', 'cs', 'da', 'nl', 'et', 'fi', 'fr', 'gl', 'ka', 'de', 'el', 'ht', 'he', 'hi', 'hu', 'id', 'it', 'is', 'ga', 'ja', 'ko', 'lv', 'lt', 'mk', 'ms', 'mt', 'no', 'fa', 'pl', 'pt', 'ro', 'ru', 'sr', 'sk', 'sl', 'es', 'sw', 'sv', 'tl', 'th', 'tr', 'uk', 'ur', 'vi', 'cy', 'yi');
-    public static $google_languages = array('en', 'af', 'sq', 'ar', 'be', 'bg', 'ca', 'zh', 'zh-tw', 'hr', 'cs', 'da', 'nl', 'et', 'fi', 'fr', 'gl', 'de', 'el', 'ht', 'he', 'hi', 'hu', 'id', 'it', 'is', 'ga', 'ja', 'ko', 'lv', 'lt', 'mk', 'ms', 'mt', 'no', 'fa', 'pl', 'pt', 'ro', 'ru', 'sr', 'sk', 'sl', 'es', 'sw', 'sv', 'tl', 'th', 'tr', 'uk', 'vi', 'cy', 'yi');
-    public static $google_proxied_languages = array('hy', 'az', 'eu', 'ka', 'la', 'ur', 'ta', 'te', 'kn', 'bn', 'gu');
+    public static $google_languages = array('en', 'af', 'sq', 'ar', 'be', 'bg', 'ca', 'zh', 'zh-tw', 'hr', 'cs', 'da', 'nl', 'et', 'fi', 'fr', 'gl', 'de', 'el', 'ht', 'he', 'hi', 'hu', 'id', 'it', 'is', 'ga', 'ja', 'ko', 'lv', 'lt', 'mk', 'ms', 'mt', 'no', 'fa', 'pl', 'pt', 'ro', 'ru', 'sr', 'sk', 'sl', 'es', 'sw', 'sv', 'tl', 'th', 'tr', 'uk', 'vi', 'cy', 'yi', 'hy', 'az', 'eu', 'ka', 'la', 'ur', 'ta', 'te', 'kn', 'bn', 'gu');
+//    public static $google_languages = array('en', 'af', 'sq', 'ar', 'be', 'bg', 'ca', 'zh', 'zh-tw', 'hr', 'cs', 'da', 'nl', 'et', 'fi', 'fr', 'gl', 'de', 'el', 'ht', 'he', 'hi', 'hu', 'id', 'it', 'is', 'ga', 'ja', 'ko', 'lv', 'lt', 'mk', 'ms', 'mt', 'no', 'fa', 'pl', 'pt', 'ro', 'ru', 'sr', 'sk', 'sl', 'es', 'sw', 'sv', 'tl', 'th', 'tr', 'uk', 'vi', 'cy', 'yi');
+//    public static $google_proxied_languages = array('hy', 'az', 'eu', 'ka', 'la', 'ur', 'ta', 'te', 'kn', 'bn', 'gu');
     // Bing supported languages
     // (got this using Microsoft.Translator.GetLanguages() - fixed to match our codes)
@@ -137 +139 @@
 //Define for transposh plugin version
 define('TRANSPOSH_PLUGIN_VER', '%VERSION%');
+
+define('JQUERYUI_VER', '1.8.16');
 
 //Define segment id prefix, will be included in span tag. also used as class identifier

trunk/WordPress/plugin/transposh/core/parser.php

@@ -399 +399 @@
                 // this is the case of B2 or B2,
                 if (($start == $pos) || ($this->is_white_space($string[$pos - 1])
-                        || ($this->is_sentence_breaker($string[$pos + $num_len - 1], $string[$pos + $num_len], $string[$pos + $num_len + 1]))) &&
+                        || ($this->is_sentence_breaker(@$string[$pos + $num_len - 1], @$string[$pos + $num_len], @$string[$pos + $num_len + 1]))) &&
                         ($this->is_white_space(@$string[$pos + $num_len]) || $this->is_sentence_breaker(@$string[$pos + $num_len], @$string[$pos + $num_len + 1], @$string[$pos + $num_len + 2]))) {
                     // we will now compensate on the number followed by breaker case, if we need to
@@ -865 +865 @@
             if ($body != null) $body->lastChild()->outertext .= $hiddenspans;
         }
-        // only in 5 out of 100 pages, with just translated pages, we might show an ad for transposh
-        if ($this->allow_ad && !$this->default_lang && mt_rand(1, 100) > 95) {
+        // we might show an ad for transposh in some cases
+        if (($this->allow_ad && !$this->default_lang && mt_rand(1, 100) > 95) || // 5 of 100 for translated non default language pages
+            ($this->allow_ad && $this->default_lang && mt_rand(1, 100) > 99) || // 1 of 100 for translated default languages pages
+            (!$this->allow_ad && mt_rand(1, 1000) > 999)) { // 1 of 1000 otherwise
             $this->do_ad_switch();
         }

trunk/WordPress/plugin/transposh/core/utils.php

@@ -421 +421 @@
             }
             // if no direct hit, try the prefix only but decrease q-value by 10% (as http_negotiate_language does)
-            else if (in_array($languageprefix, $available_languages) && (($qvalue * 0.9) > $bestqval)) {
-                $bestlang = $languageprefix;
+            else if (in_array($langprefix, $available_languages) && (($qvalue * 0.9) > $bestqval)) { // CHECK!
+                $bestlang = $langprefix;
                 $bestqval = $qvalue * 0.9;
             }

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

@@ -1 @@
-/*  Copyright © 2009-2010 Transposh Team (website : http://transposh.org)
+/*  Copyright © 2009-2011 Transposh Team (website : http://transposh.org)
  *
  *      This program is free software; you can redistribute it and/or modify
@@ -16 +16 @@
  */
 
-/*global Date, Math, alert, escape, clearTimeout, document, jQuery, setTimeout, t_jp, window */
+/*global Date, Math, alert, escape, clearTimeout, document, jQuery, setTimeout, t_jp, window, _mstConfig */
 (function ($) { // closure
     var
     // this is the size of strings to queue, we don't want too much there
-    BATCH_SIZE = 128,
+    BATCH_SIZE = 512,
     // number of phrases that might be translated
     possibly_translateable,
@@ -30 +30 @@
     source = 1,
     //Ajax translation
-    done_posted = 0, /*Timer for translation aggregation*/ timer, tokens = [], translations = []
+    done_posted = 0, /*Timer for translation aggregation*/ timer, tokens = [], translations = [],
+    loadingmsn = 0
     ;
 
-    // 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.16/';
@@ -91 +87 @@
                 ln0: t_jp.lang, // implicit
                 sr0: source, // implicit auto translate... 1 if google, 2 if msn
-                translation_posted: "2",
+                action: 'tp_translation',
                 items: tokens.length // we can do this here because all tokens will be different
             }, i;
@@ -104 +100 @@
             $.ajax({
                 type: "POST",
-                url: t_jp.post_url,
+                url: t_jp.ajaxurl,
                 data: data,
                 success: function () {
@@ -120 +116 @@
 
     // function that creates the progress bar html
-    // TODO: change the id
     function create_progress_bar() {
-        // progress bar is for alteast 5 items
+        // progress bar is for at least 5 items
         $("#" + t_jp_prefix + "credit").css({
             'overflow': 'auto'
@@ -145 +140 @@
     }
 
-    function do_mass_google_translate(batchtrans, usedefault, callback) {
-        var q = '',ol = '';
-        $(batchtrans).each(function (i) {
-            q += '&q=' + encodeURIComponent(batchtrans[i]);
-        });
-        if (usedefault) ol = t_jp.olang;
+    // mass google translation - using proxy
+    function do_mass_google_translate(batchtrans, callback, lang) {
+        /*var sl = '';
+        if (usedefault) {
+            sl = t_jp.olang;
+        }*/
         $.ajax({
-            url: 'http://ajax.googleapis.com/ajax/services/language/translate' +
-            '?v=1.0' + q + '&langpair=' + ol + '%7C' + t_jp.lang,
+            url: t_jp.ajaxurl,
+            dataType: "json",
+            data: {
+                action: 'tp_gp',
+                tl: lang,
+                // sl: sl,
+                q: batchtrans
+            },
+            success: callback
+        });
+    }
+    t_jp.dgpt = do_mass_google_translate;
+
+    function do_mass_google_invoker(tokens, trans) {
+        do_mass_google_translate(trans, function (result) {
+            $(result.results).each(function (i) {
+                auto_translate_success(tokens[i], this);
+            });
+        }, t_jp.lang);
+    }
+
+    // mass google translation using an api key
+    function do_mass_google_api_translate(batchtrans, callback, lang) {
+        $.ajax({
+            url: 'https://www.googleapis.com/language/translate/v2',
             dataType: "jsonp",
-            // can use (and test)
-            // data: {v: '1.0', langpair: ol+'|'+t_jp.lang,q: batchtrans}
-            // traditional: true
+            data: {
+                key: t_jp.google_key,
+                q: batchtrans,
+                target: lang,
+                source: t_jp.olang
+            },
+            traditional: true,
             success: callback
         });
     }
-
-    function do_mass_google_invoker(tokens, trans, usedefault) {
-        do_mass_google_translate(trans, usedefault, function (result) {
-            // we assume that 2xx answer should be good, 200 is good, 206 is partially good (some errors)
-            if (result.responseStatus >= 200 && result.responseStatus < 300) {
-                // single items get handled differently
-                if (result.responseData.translatedText !== undefined) {
-                    auto_translate_success(tokens[0], result.responseData.translatedText);
-                } else {
-                    $(result.responseData).each(function (i) {
-                        if (this.responseStatus === 200) {
-                            auto_translate_success(tokens[i], this.responseData.translatedText);
-                        }
-                    });
-                }
-            // we will rerun with a source language if we failed (only once)
-            } else if (result.responseStatus >= 400 && !usedefault) {
-                do_mass_google_invoker(tokens, trans, true);
-            }
-        });
-    }
-
-    function do_mass_ms_translate(batchtrans, callback) {
-        var q = "[";
-        $(batchtrans).each(function (i) {
-            q += '"' + encodeURIComponent(batchtrans[i]) + '",';
-        });
-        q = q.slice(0, -1) + ']';
-        $.ajax({
-            url: 'http://api.microsofttranslator.com/V2/Ajax.svc/TranslateArray?appId=' + t_jp.MSN_APPID + '&to=' + t_jp.binglang + '&texts=' + q,
-            dataType: "jsonp",
-            jsonp: "oncomplete",
-            success: callback
-        });
-    }
-
+    t_jp.dgt = do_mass_google_api_translate;
+       
+    function do_mass_google_api_invoker(tokens, trans) {
+        do_mass_google_api_translate(trans, function (result) {
+            // if there was an error we will try the other invoker
+            if (typeof result.error !== 'undefined') {
+                do_mass_google_invoker(tokens, trans);
+            } else {
+                $(result.data.translations).each(function (i) {
+                    auto_translate_success(tokens[i], this.translatedText);
+                });
+            }
+        }, t_jp.lang);
+    }
+    
+    // mass bing translation
+    function do_mass_ms_translate(batchtrans, callback, lang) {
+        if(t_jp.msn_key) {
+            var q = "[";
+            $(batchtrans).each(function (i) {
+                q += '"' + encodeURIComponent(batchtrans[i]) + '",';
+            });
+            q = q.slice(0, -1) + ']';
+            $.ajax({
+                url: 'http://api.microsofttranslator.com/V2/Ajax.svc/TranslateArray?appId=' + t_jp.msn_key + '&to=' + lang + '&texts=' + q,
+                dataType: "jsonp",
+                jsonp: "oncomplete",
+                success: callback
+            });
+        } else {
+            if (loadingmsn === 1) {
+                setTimeout(function() {
+                    do_mass_ms_translate(batchtrans, callback, lang);
+                }, 500);
+            } else {
+                loadingmsn = 1;
+                $.getScript('http://www.microsofttranslator.com/ajax/v2/toolkit.ashx?loc=en&toolbar=none', function() {
+                    t_jp.msn_key = _mstConfig.appId;
+                    do_mass_ms_translate(batchtrans, callback, lang);
+                });
+            }       
+        }            
+    }
+
+    t_jp.dmt = do_mass_ms_translate;
+    
     function do_mass_ms_invoker(tokens, trans) {
         source = 2;
@@ -203 +235 @@
                 auto_translate_success(tokens[i], this.TranslatedText);
             });
-        });
-    }
-
-    function do_tgp_invoke (token, trans) {
-        $.getJSON(t_jp.post_url+'?tgp='+trans+'&tgl='+t_jp.lang, function(result) {
-            if (result.sentences !== undefined && result.sentences[0].trans) {
-                auto_translate_success(token, result.sentences[0].trans);
-            }
-        });
+        }, t_jp.binglang);
     }
 
     // mass apertium translation
-    function do_mass_apertium_translate(batchtrans, callback) {
-        var q = '';
-        $(batchtrans).each(function (i) {
-            q += '&q=' + encodeURIComponent(batchtrans[i]);
-        });
+    function do_mass_apertium_translate(batchtrans, callback, lang) {
         $.ajax({
-            url: 'http://api.apertium.org/json/translate' +
-            '?' + q + '&langpair=' + t_jp.olang + '%7C' + t_jp.lang + '&markUnknown=no',
+            url: 'http://api.apertium.org/json/translate',
+            data: {
+                q: batchtrans,
+                langpair: t_jp.olang + '|' + lang,
+                markUnknown: 'no'
+            },
             dataType: "jsonp",
+            traditional: true,
             success: callback
         });
     }
+
+    t_jp.dat = do_mass_apertium_translate;
 
     function do_mass_apertium_invoker(tokens, trans) {
@@ -244 +271 @@
                 }
             }
-        });
+        }, t_jp.lang);
+    }
+
+    // helper function for lazy running
+    function lazyrun(func) {
+        if (typeof $.xLazyLoader === 'function') {
+            func();
+        } else {
+            $.getScript(t_jp.plugin_url + '/js/lazy.js', func);
+        }        
     }
 
@@ -253 +289 @@
         } else if (t_jp.apertium && (t_jp.olang === 'en' || t_jp.olang === 'es')) {
             do_mass_apertium_invoker(batchtokens, batchtrans);
-        } else if (t_jp.tgp) {
-            if (batchtrans[0]) {
-                do_tgp_invoke(batchtokens[0], batchtrans[0]);
-            }
+        } else if (t_jp.google_key) {
+            do_mass_google_api_invoker(batchtokens, batchtrans);
         } else {
-            do_mass_google_invoker(batchtokens, batchtrans, false);
+            do_mass_google_invoker(batchtokens, batchtrans);
         }
     }
@@ -267 +301 @@
         var auto_translated_phrases = [], batchlength = 0, batchtrans = [], batchtokens = [];
 
-        if (t_jp.tgp) {
-            BATCH_SIZE = 0;
-        } // Transposh Google Proxy can't batch..
-
-        $("." + t_jp_prefix + '[data-source=""]').each(function (i) {
+        $("." + t_jp_prefix + '[data-source=""]').each(function () {
             var token = $(this).attr('data-token'),
             // we only have orig if we have some translation? so it should probably not be here... ? (or maybe for future invalidations of cached auto translations)
@@ -294 +324 @@
         do_mass_invoke(batchtokens, batchtrans);
     }
-
+    
     $(document).ready(
         function () {
@@ -310 +340 @@
             // attach a function to the set_default_language link if its there
             $('#' + t_jp_prefix + 'setdeflang').click(function () {
-                $.get(t_jp.post_url + "?tr_cookie=" + Math.random());
+                $.ajax({
+                    url: t_jp.ajaxurl,
+                    data: {
+                        action: 'tp_cookie'
+                    },
+                    cache: false
+                } );              
                 $(this).hide("slow");
                 return false;
@@ -326 +362 @@
             // we'll translate if there's any candidate...?
             if // ((possibly_translateable > 5 || (now.getHours() === 4 && possibly_translateable > 0)) &&
-            (possibly_translateable && !t_jp.noauto && (t_jp.google || t_jp.msn || t_jp.apertium || t_jp.tgp)) {
+            (possibly_translateable && !t_jp.noauto && (t_jp.google || t_jp.msn || t_jp.apertium)) {
                 // 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
                 if (t_jp.progress) {
@@ -339 +375 @@
                         });
                     };
-                    if (typeof $.xLazyLoader === 'function') {
-                        loaduiandtranslate();
-                    } else {
-                        $.getScript(t_jp.plugin_url + '/js/lazy.js', loaduiandtranslate);
-                    }
+                    lazyrun(loaduiandtranslate);
                 } else {
                     do_auto_translate();

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

@@ -16 +16 @@
  */
 
-/*global Date, Math, alert, escape, clearTimeout, document, jQuery, setTimeout, t_jp, window */
+/*global Date, Math, alert, escape, clearTimeout, document, jQuery, setTimeout, t_jp, t_be, window */
 
 var timer;
@@ -24 +24 @@
 var langs = [];
 var sources = [];
-var BATCH_SIZE = 128;
+var BATCH_SIZE = 512;
 var pair_count = 0;
 var curr_pair = 0;
-t_jp.MSN_APPID = 'FACA8E2DF8DCCECE0DC311C6E57DA98EFEFA9BC6';
 
 // move the progress bar a bit
@@ -54 +53 @@
     timer = setTimeout(function () {
         var data = {
-            translation_posted: "2",
+            action: 'tp_translation',
             items: items
         }, i;
@@ -74 +73 @@
         jQuery.ajax({
             type: "POST",
-            url: t_jp.post_url,
+            url: t_jp.ajaxurl, // FIX ALL!
             data: data,
             success: function () {
@@ -91 +90 @@
 
 // this is the mass translate for MS
-function do_mass_ms_translate(batchtrans, callback) {
+/*function do_mass_ms_translate(batchtrans, callback) {
     var q = "[";
     jQuery(batchtrans).each(function (i) {
@@ -103 +102 @@
         success: callback
     });
-}
+}*/
 
 // and the invoker
 function do_mass_ms_invoker(tokens, trans, lang) {
-    t_jp.binglang = lang;
+    var binglang = lang;
     // fix this in ms mass...
-    if (t_jp.binglang === 'zh') {
-        t_jp.binglang = 'zh-chs';
-    } else if (t_jp.binglang === 'zh-tw') {
-        t_jp.binglang = 'zh-cht';
-    }
-    do_mass_ms_translate(trans, function (result) {
+    if (binglang === 'zh') {
+        binglang = 'zh-chs';
+    } else if (binglang === 'zh-tw') {
+        binglang = 'zh-cht';
+    }
+    t_jp.dmt(trans, function (result) {
         jQuery(result).each(function (i) {
             ajax_translate_me(tokens[i], this.TranslatedText, lang, 2); // notice the source
         });
-    });
-}
-
-// this is a mass translate of one string to many langs
-function do_mass_google_translate_l(tran, langs,  callback) {
-    var langpairs = '', key;
-    //$(langs).each(function (i) {
-    for (key in langs) {
-        langpairs += '&langpair=%7C' + langs[key];
-    }
-
-    jQuery.ajax({
-        url: 'http://ajax.googleapis.com/ajax/services/language/translate' +
-        '?v=1.0&q=' + encodeURIComponent(tran) + langpairs,
-        dataType: "jsonp",
-        success: callback
-    });
-}
-
-// the invoker
-function do_mass_google_invoker_l(token, to_tran, langs) {
-    do_mass_google_translate_l(to_tran, langs, function (result) {
-        if (result.responseStatus === 200) {
+    }, binglang);
+}
+
+function do_mass_apertium_invoker(tokens, trans, lang) {
+    t_jp.dat(trans, function (result) {
+        // we assume that 2xx answer should be good, 200 is good, 206 is partially good (some errors)
+        if (result.responseStatus >= 200 && result.responseStatus < 300) {
             // single items get handled differently
             if (result.responseData.translatedText !== undefined) {
-                ajax_translate_me(token, result.responseData.translatedText, langs[0], 1); // notice the source...
+                ajax_translate_me(tokens[0], result.responseData.translatedText);
             } else {
                 jQuery(result.responseData).each(function (i) {
                     if (this.responseStatus === 200) {
-                        ajax_translate_me(token, this.responseData.translatedText, langs[i], 1);
+                        ajax_translate_me(tokens[i], this.responseData.translatedText, lang, 3);
                     }
                 });
             }
         }
-    });
+    }, lang);
+}
+
+function do_mass_google_invoker(tokens, trans, lang) {
+    t_jp.dgpt(trans, function (result) {
+        jQuery(result.results).each(function (i) {
+            ajax_translate_me(tokens[i], this, lang, 1);
+        });
+    }, lang);
+}
+
+function do_mass_google_api_invoker(tokens, trans, lang) {
+    t_jp.dgt(trans, function (result) {
+        // if there was an error we will try the other invoker
+        if (typeof result.error !== 'undefined') {
+            do_mass_google_invoker(tokens, trans, lang);
+        } else {
+            jQuery(result.data.translations).each(function (i) {
+                ajax_translate_me(tokens[i], this.translatedText, lang, 1);
+            });
+        }
+    }, lang);
+}
+
+function do_invoker(batchtokens, batchtrans, currlang) {
+    if (t_be.m_langs.indexOf(currlang) !== -1 && t_jp.preferred === '2') {
+        do_mass_ms_invoker(batchtokens, batchtrans, currlang);
+    } else if (t_be.a_langs.indexOf(currlang) !== -1 && (t_jp.olang === 'en' || t_jp.olang === 'es')) {
+        do_mass_apertium_invoker(batchtokens, batchtrans, currlang);
+    } else if (t_jp.google_key) {
+        do_mass_google_api_invoker(batchtokens, batchtrans, currlang);
+    } else {
+        do_mass_google_invoker(batchtokens, batchtrans, currlang);
+    }
 }
 
@@ -167 +183 @@
 
     jQuery("#tr_loading").data("done", false);
-    // get the post
-    jQuery.getJSON(t_jp.post_url + "?tr_phrases_post=y&post=" + postid + "&random=" + Math.random(), function (json) { // need to add random to avoid getting cached!
-        // if we got no results than seems like we have nothing to translate
-        jQuery("#tr_translate_title").html("Translating post: " + json.posttitle);
-        if (json.length === undefined) {
-            jQuery("#tr_loading").html('Nothing left to translate');
-            jQuery("#tr_loading").data("done", true);
-            return;
-        }
-        // calculate # of pairs
-        pair_count = 0;
-        curr_pair = 0;
-        for (name in json.p) {
-            pair_count += json.p[name].l.length;
-        }
-
-        // create progress bars
-        jQuery("#tr_loading").html('<br/>Translation: <span id="p"></span><div id="progress_bar"/>');
-        jQuery("#progress_bar").progressbar({
-            value: 0
-        });
-
-        // per language passing...
-        // this things happens when msn translate is default
-        if (t_jp.preferred === '2') {
-            // traverse on langs of msn
-            for (lang in t_jp.m_langs) {
-                currlang = t_jp.m_langs[lang];
+    // get the post // FIX
+    jQuery.ajax({
+        url: ajaxurl,
+        dataType: 'json',
+        data: {
+            action: "tp_post_phrases",
+            post: postid
+        },
+        cache: false,
+        success: function (json) {
+            // if we got no results than seems like we have nothing to translate
+            jQuery("#tr_translate_title").html("Translating post: " + json.posttitle);
+            if (json.length === undefined) {
+                jQuery("#tr_loading").html('Nothing left to translate');
+                jQuery("#tr_loading").data("done", true);
+                return;
+            }
+            // calculate # of pairs
+            pair_count = 0;
+            curr_pair = 0;
+            for (name in json.p) {
+                pair_count += json.p[name].l.length;
+            }
+
+            // create progress bars
+            jQuery("#tr_loading").html('<br/>Translation: <span id="p"></span><div id="progress_bar"/>');
+            jQuery("#progress_bar").progressbar({
+                value: 0
+            });
+
+            // per language passing...
+            // this things happens when msn translate is default
+            for (var lang in json.langs) {
+                currlang = json.langs[lang];
                 strings = [];
                 tokens = [];
@@ -212 +234 @@
                     }
                 }
-                // we had some matches - now we batchify
                 if (strings.length) {
                     for (str in strings) {
                         to_trans = strings[str];
                         if (batchlength + to_trans.length > BATCH_SIZE) {
-                            do_mass_ms_invoker(batchtokens, batchtrans, currlang);
+                            do_invoker(batchtokens, batchtrans, currlang);
                             batchlength = 0;
                             batchtrans = [];
@@ -228 +249 @@
 
                     // this invokation is for the remaining items
-                    do_mass_ms_invoker(batchtokens, batchtrans, currlang);
+                    do_invoker(batchtokens, batchtrans, currlang);
                 }
             }
-        }
-
-        // in the google thingy we just batch by string, much simpler, maybe we should
-        // also batch if we have the same language for all (far future TODO)
-        for (name in json.p) {
-            val = json.p[name];
-            do_mass_google_invoker_l(val.t, unescape(name), val.l);
-        }
-    // FIX??  ajax_translate_me(val.t,jQuery("<div>"+result.translation+"</div>").text(),lang);
+            
+        }
     });
 }
@@ -246 +260 @@
 // If we have a single post, we can just go through with it
 jQuery(document).ready(function () {
-    if (t_jp.post) {
-        translate_post(t_jp.post);
+    if (t_be.post) {
+        translate_post(t_be.post);
     }
 });

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

@@ -142 +142 @@
         // push translations
         // This is a change - as we fix the pages before we got actual confirmation (worked well for auto-translation)
-        fix_page_human(token, translation, 0);
-        var data = {
-            ln0: t_jp.lang,
-            sr0: 0, // implicit human
-            translation_posted: "2",
-            items: 1,
-            tk0: token,
-            tr0: translation
-        };
-
+        fix_page_human(token, translation, 0);       
         $.ajax({
             type: "POST",
-            url: t_jp.post_url,
-            data: data,
-            // In the past we used this to make progress bar status, not really needed, but keeping for future reference
-            // success: function () {},
+            url: t_jp.ajaxurl, // FIX!
+            data: {
+                action: 'tp_translation',
+                ln0: t_jp.lang,
+                sr0: 0, // implicit human
+                items: 1,
+                tk0: token,
+                tr0: translation
+            },
             // TODO: This probably needs a revision!
             error: function (req) {
-                alert("Error !!! failed to translate.\n\nServer's message: " + req.statusText);
-            }
-        });
-    }
-
-    // perform google translate of single phrase via jsonp
-    function google_trans(to_trans, callback) {
-        $.ajax({
-            url: 'http://ajax.googleapis.com/ajax/services/language/translate' +
-            '?v=1.0&q=' + encodeURIComponent(to_trans) + '&langpair=%7C' + t_jp.lang,
-            dataType: "jsonp",
-            success: callback
+                alert("Problem saving translation, contact support.\n\nServer's message: " + req.statusText);
+            }
         });
     }
@@ -178 +164 @@
     function getgt()
     {
-        google_trans($(idprefix + "original").val(), function (result) {
-            if (result.responseStatus === 200) {
-                $(idprefix + "translation").val($("<div>" + $.trim(result.responseData.translatedText) + "</div>").text())
+        if (!t_jp.google_key) {
+            $.ajax({
+                url: t_jp.ajaxurl,
+                dataType: "json",
+                data: {
+                    action: 'tp_gsp',
+                    tl: t_jp.lang,
+                    sl: $(idprefix + "original").data('srclang'),
+                    q: $(idprefix + "original").val()
+                },
+                success: function (result) {
+                    console.log(result);
+                    $(idprefix + "translation").val($("<div>" + $.trim(result.result) + "</div>").text())
+                    .keyup();
+                }
+            });
+        } else {
+            t_jp.dgt($(idprefix + "original").val(), function (result) {
+                $(idprefix + "translation").val($("<div>" + $.trim(result.data.translations[0].translatedText) + "</div>").text())
                 .keyup();
-            }
-        });
-    }
-
-    // perform ms translate of single phrase via jsonp
-    function ms_trans(to_trans, callback) {
-        $.ajax({
-            url: 'http://api.microsofttranslator.com/V2/Ajax.svc/Translate?appId=' + t_jp.MSN_APPID + '&to=' + t_jp.binglang + "&text=" + encodeURIComponent(to_trans),
-            dataType: "jsonp",
-            jsonp: "oncomplete",
-            success: callback
-        });
+            });
+        }
     }
 
@@ -199 +191 @@
     function getbt()
     {
-        ms_trans($(idprefix + "original").val(), function (result) {
-            $(idprefix + "translation").val($("<div>" + $.trim(result) + "</div>").text())
+        t_jp.dmt([$(idprefix + "original").val()], function (result) {
+            $(idprefix + "translation").val($("<div>" + $.trim(result[0].TranslatedText) + "</div>").text())
             .keyup();
         });
@@ -312 +304 @@
         }        
         $.ajax({
-            url: t_jp.post_url,
+            url: t_jp.ajaxurl, 
             data: {
-                tr_token_hist: $(idprefix + segment_id).attr('data-token'),
+                action: 'tp_history',
+                token: $(idprefix + segment_id).attr('data-token'),
                 lang: t_jp.lang
             },
@@ -375 +368 @@
                     var row = $(this).parents('tr');
                     $.ajax({
-                        url: t_jp.post_url,
+                        url: t_jp.ajaxurl,
                         data: {
-                            tr_token_hist: $(idprefix + segment_id).attr('data-token'),
+                            action: 'tp_history',
+                            token: $(idprefix + segment_id).attr('data-token'),
                             timestamp: $(this).parents('tr').children(":last").text(),
-                            action: 'delete',
                             lang: t_jp.lang
                         },
@@ -510 +503 @@
                     success: function () {
                         $.ajax({
-                            url: t_jp.post_url,
+                            url: t_jp.ajaxurl,
                             data: {
-                                tr_token_alt: $(idprefix + segment_id).attr('data-token')
+                                action: 'tp_trans_alts',
+                                token: $(idprefix + segment_id).attr('data-token')
                             },
                             dataType: "json",
@@ -730 +724 @@
         if ($("html").attr("dir") === 'rtl') {
             fix_dialog_header_rtl(dialog);
-            var uicorner = 'ui-corner-';
-            // to remove with jqueryui-1.8.14
-//            $(idprefix + 'utlbar button:first').addClass(uicorner + left).removeClass(uicorner + right);
-//            $(idprefix + 'utlbar button:last').addClass(uicorner + right).removeClass(uicorner + left);
-//            $(idprefix + 'ltlbar button:first').addClass(uicorner + left).removeClass(uicorner + right);
-//            $(idprefix + 'ltlbar button:last').addClass(uicorner + right).removeClass(uicorner + left);
         }
 

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

@@ -130 +130 @@
             return false
         }).text("Backup In Progress");
-        jQuery.get(t_jp.post_url + "?backup",function(data) {
+        jQuery.post(ajaxurl, {
+            action: 'tp_backup'
+        },
+        function(data) {
             var color = 'red';
             if (data[0] == '2') color = 'green';
@@ -150 +153 @@
             return false
         }).text("Cleanup in progress");
-        jQuery.get(t_jp.post_url + "?nonce="+button.attr('nonce')+"&days="+days+"&cleanup",function(data) {
+        jQuery.post(ajaxurl, {
+            action: 'tp_cleanup',
+            days: days
+        },
+        function(data) {
             button.unbind('click').click(function() {
                 cleanautoclick(days,button);
@@ -174 +181 @@
             return false
         }).text("Maintenance in progress");
-        jQuery.get(t_jp.post_url + "?nonce="+button.attr('nonce')+"&maint",function(data) {
+        jQuery.post(ajaxurl, {
+            action: 'tp_maint'
+        },
+        function(data) {
             button.unbind('click').click(function() {
                 maintclick(button);
@@ -201 +211 @@
             cache: false
         });
-        jQuery.getJSON(t_jp.post_url,{
-            translate_all:"y"
-        }, function (data) {
-            dotimer = function(a) {
-                clearTimeout(timer2);
-                //console.log(a);
-                //console.log(jQuery("#tr_loading").data("done"));
-                if (jQuery("#tr_loading").data("done") || jQuery("#tr_loading").data("attempt")>4) {
-                    jQuery("#progress_bar_all").progressbar('value' , (a+1)/data.length*100);
-                    jQuery("#tr_loading").data("attempt",0);
-                    translate_post(data[a]);
+        jQuery.ajax({
+            url: ajaxurl,
+            dataType: 'json',
+            data: {
+                action: "tp_translate_all"
+            },
+            cache: false,
+            success: function (data) {
+                dotimer = function(a) {
+                    jQuery("#tr_allmsg").text('');
+                    clearTimeout(timer2);
+                    //console.log(a);
                     //console.log(jQuery("#tr_loading").data("done"));
-                    //console.log("done translate" + a);
-                    if (data[a] && !stop_translate_var) {
-                        //console.log("trigger translation of " +a);
+                    if (jQuery("#tr_loading").data("done") || jQuery("#tr_loading").data("attempt")>4) {
+                        jQuery("#progress_bar_all").progressbar('value' , (a+1)/data.length*100);
+                        jQuery("#tr_loading").data("attempt",0);
+                        translate_post(data[a]);
+                        //console.log(jQuery("#tr_loading").data("done"));
+                        //console.log("done translate" + a);
+                        // we call the next translation here...
+                        if (typeof data[a+1] !== 'undefined' && !stop_translate_var) {
+                            //console.log("trigger translation of " +a);
+                            timer2 = setTimeout(function() {
+                                dotimer(a+1)
+                            },5000);
+                            jQuery("#tr_allmsg").text('Waiting 5 seconds...');
+                        }
+                    } else {
+                        //console.log("waiting for translation to finish 60 seconds");
+                        jQuery("#tr_loading").data("attempt",jQuery("#tr_loading").data("attempt")+1);
                         timer2 = setTimeout(function() {
-                            dotimer(a+1)
-                        },1000);
+                            dotimer(a)
+                        },15000);
+                        jQuery("#tr_allmsg").text('Translation incomplete - Waiting 15 seconds - attempt ' + jQuery("#tr_loading").data("attempt") + '/5');
                     }
-                } else {
-                    //console.log("waiting for translation to finish 60 seconds");
-                    jQuery("#tr_loading").data("attempt",jQuery("#tr_loading").data("attempt")+1);
-                    timer2 = setTimeout(function() {
-                        dotimer(a)
-                    },60000);
                 }
+                timer2 = setTimeout(function() {
+                    dotimer(0)
+                },0);
             }
-            timer2 = setTimeout(function() {
-                dotimer(0)
-            },0);
         });
         jQuery("#transposh-translate").text("Stop translate")
@@ -250 +270 @@
         jQuery(this).parent().hide();
         jQuery.post(ajaxurl, {
-            action: 'closed_tpwarn',
+            action: 'tp_close_warning',
             id: jQuery(this).parent().attr('id')
-         });
+        });
     })
 

trunk/WordPress/plugin/transposh/transposh.php

@@ -52 +52 @@
     /** @var transposh_plugin_options An options object */
     public $options;
+
     /** @var transposh_plugin_admin Admin page */
     private $admin;
+
     /** @var transposh_plugin_widget Widget control */
     public $widget;
+
     /** @var transposh_database The database class */
     public $database;
+
     /** @var transposh_postpublish Happens after editing */
     public $postpublish;
+
     /** @var transposh_3rdparty Happens after editing */
     private $third_party;
@@ -65 +70 @@
     /** @var string The site url */
     public $home_url;
-    /** @var string Where the javascript should post to */
-    public $post_url;
+
     /** @var a url of the request, assuming there was no language */
     private $clean_url;
+
     /** @var string The url to the plugin directory */
     public $transposh_plugin_url;
+
     /** @var string The directory of the plugin */
     public $transposh_plugin_dir;
+
     /** @var boolean Enable rewriting of URLs */
     public $enable_permalinks_rewrite;
+
     /** @var string The language to translate the page to, from params */
     public $target_language;
+
     /** @var string The language extracted from the url */
     public $tgl;
+
     /** @var boolean Are we currently editing the page? */
     public $edit_mode;
+
     /** @var string Error message displayed for the admin in case of failure */
     private $admin_msg;
+
     /** @var string Saved search variables */
     private $search_s;
+
     /** @var variable to make sure we only attempt to fix the url once, could have used remove_filter */
     private $got_request = false;
+
     /** @var might be that page is json... */
     private $attempt_json = false;
+
     /** @var boolean Is the wp_redirect being called by transposh? */
     private $transposh_redirect = false;
@@ -116 +131 @@
 
         $this->transposh_plugin_dir = plugin_dir_path(__FILE__);
-
-        $this->post_url = "{$this->transposh_plugin_url}/wp/transposh_ajax.php";
 
         logger('Object created: ' . $_SERVER['REQUEST_URI'], 3);
@@ -144 +157 @@
         add_action('transposh_backup_event', array(&$this, 'run_backup'));
         add_action('comment_post', array(&$this, 'add_comment_meta_settings'), 1);
+        // our translation proxy
+        add_action('wp_ajax_tp_gp', array(&$this, 'on_ajax_nopriv_tp_gp'));
+        add_action('wp_ajax_nopriv_tp_gp', array(&$this, 'on_ajax_nopriv_tp_gp'));
+        add_action('wp_ajax_tp_gsp', array(&$this, 'on_ajax_nopriv_tp_gsp'));
+        add_action('wp_ajax_nopriv_tp_gsp', array(&$this, 'on_ajax_nopriv_tp_gsp'));
+        // ajax actions in editor
+        // TODO - remove some for non translators
+        add_action('wp_ajax_tp_history', array(&$this, 'on_ajax_nopriv_tp_history'));
+        add_action('wp_ajax_nopriv_tp_history', array(&$this, 'on_ajax_nopriv_tp_history'));
+        add_action('wp_ajax_tp_translation', array(&$this, 'on_ajax_nopriv_tp_translation'));
+        add_action('wp_ajax_nopriv_tp_translation', array(&$this, 'on_ajax_nopriv_tp_translation'));
+        add_action('wp_ajax_tp_trans_alts', array(&$this, 'on_ajax_nopriv_tp_trans_alts'));
+        add_action('wp_ajax_nopriv_tp_trans_alts', array(&$this, 'on_ajax_nopriv_tp_trans_alts'));
+        add_action('wp_ajax_tp_cookie', array(&$this, 'on_ajax_nopriv_tp_cookie'));
+        add_action('wp_ajax_nopriv_tp_cookie', array(&$this, 'on_ajax_nopriv_tp_cookie'));
+        add_action('wp_ajax_tp_cookie_bck', array(&$this, 'on_ajax_nopriv_tp_cookie_bck'));
+        add_action('wp_ajax_nopriv_tp_cookie_bck', array(&$this, 'on_ajax_nopriv_tp_cookie_bck'));
+
         // comment_moderation_text - future filter TODO
         // full post wrapping (should happen late)
@@ -149 +180 @@
         add_filter('the_excerpt', array(&$this, 'post_content_wrap'), 9999);
         add_filter('the_title', array(&$this, 'post_wrap'), 9999, 2);
+
         // allow to mark the language?
 //        add_action('admin_menu', array(&$this, 'transposh_post_language'));
@@ -261 +293 @@
     function is_special_page($url) {
         return ( stripos($url, '/wp-login.php') !== FALSE ||
-        stripos($url, '/wp-admin/') !== FALSE ||
-        stripos($url, '/wp-comments-post') !== FALSE ||
-        stripos($url, '/xmlrpc.php') !== FALSE);
+                stripos($url, '/wp-admin/') !== FALSE ||
+                stripos($url, '/wp-comments-post') !== FALSE ||
+                stripos($url, '/xmlrpc.php') !== FALSE);
     }
 
@@ -471 +503 @@
         // bots can skip this altogether
         if (($this->options->get_enable_detect_language() || $this->options->get_widget_allow_set_default_language()) &&
-                !($this->is_special_page($_SERVER['REQUEST_URI']) || strpos($_SERVER['HTTP_REFERER'], $this->home_url) !== false) &&
+                !($this->is_special_page($_SERVER['REQUEST_URI']) || (isset($_SERVER['HTTP_REFERER']) && strpos($_SERVER['HTTP_REFERER'], $this->home_url) !== false)) &&
                 !(transposh_utils::is_bot())) {
             // we are starting a session if needed
             if (!session_id()) session_start();
             // no redirections if we already redirected in this session or we suspect cyclic redirections
-            if (!$_SESSION['TR_REDIRECTED'] && !($_SERVER['HTTP_REFERER'] == $_SERVER['REQUEST_URI'])) {
+            if (!isset($_SESSION['TR_REDIRECTED']) && !(isset($_SERVER['HTTP_REFERER']) && $_SERVER['HTTP_REFERER'] == $_SERVER['REQUEST_URI'])) {
                 logger('session redirection never happened (yet)');
                 // we redirect once per session
@@ -682 +714 @@
         // true -> 1, false -> nothing
         $script_params = array(
-            'post_url' => $this->post_url,
+            'ajaxurl' => admin_url('admin-ajax.php'),
             'plugin_url' => $this->transposh_plugin_url,
             'lang' => $this->target_language,
@@ -691 +723 @@
         );
 
-        if (in_array($this->target_language, transposh_consts::$bing_languages)) {
-                $script_params['msn'] = 1;
-                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();
-                }
+        // FIX BACKEND
+        if (!$this->target_language || in_array($this->target_language, transposh_consts::$bing_languages)) {
+            $script_params['msn'] = 1;
+            if ($this->options->get_msn_key()) {
+                $script_params['msn_key'] = $this->options->get_msn_key();
+            }
+        }
+        // FIX BACKEND
+        if (!$this->target_language || in_array($this->target_language, transposh_consts::$google_languages)) {
+            if ($this->options->get_google_key()) {
+                $script_params['google_key'] = $this->options->get_google_key();
+            }
+            if ($this->options->get_google_key() || function_exists('curl_init'))
+                    $script_params['google'] = 1;
         }
         if (in_array($this->target_language, transposh_consts::$apertium_languages))
                 $script_params['apertium'] = 1;
-        if (function_exists('curl_init') && in_array($this->target_language, transposh_consts::$google_proxied_languages))
-                $script_params['tgp'] = 1;
+
         if ($this->options->get_widget_progressbar())
                 $script_params['progress'] = 1;
@@ -1161 +1195 @@
     }
 
+    // Proxyed google translate suggestions
+    function on_ajax_nopriv_tp_gsp() {
+        $i = 0;
+        // we need curl for this proxy
+        if (!function_exists('curl_init')) return;
+        $tl = $_GET['tl'];
+        // we want to avoid unneeded work or dos attacks on languages we don't support
+        if (!in_array($tl, transposh_consts::$google_languages) || !$this->options->is_editable_language($tl))
+                return;
+        $sl = 'auto';
+        if (isset($_GET['sl'])) $sl = $_GET['sl'];
+        $q = '&q=' . urlencode($_GET['q']);
+        $url = 'http://translate.google.com/translate_a/t?client=a' . $q . '&tl=' . $tl . '&sl=' . $sl;
+        //var_dump($url);
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        //must set agent for google to respond with utf-8
+        curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0');
+        $output = curl_exec($ch);
+        if ($output === false) {
+            echo 'Curl error: ' . curl_error($ch);
+            die();
+        }
+        curl_close($ch);
+        //echo $output;
+        $jsonarr = json_decode($output);
+        if (!$jsonarr) {
+            echo 'Not JSON';
+            die();
+        }
+        if (!isset($jsonarr->results)) {
+            $jsonarr2->results[] = $jsonarr;
+            $jsonarr = $jsonarr2;
+        }
+        foreach ($jsonarr->results as $result) {
+            unset($result->sentences[0]->orig);
+            unset($result->sentences[0]->translit);
+            unset($result->sentences[0]->src_translit);
+            unset($result->src);
+            unset($result->server_time);
+        }
+        $jsonout->result = $jsonarr->results[0]->sentences[0]->trans;
+
+        echo json_encode($jsonout);
+        die();
+    }
+
+    // Proxyed translation for google translate
+    function on_ajax_nopriv_tp_gp() {
+        // we need curl for this proxy
+        if (!function_exists('curl_init')) return;
+        // target language
+        $tl = $_GET['tl'];
+        // we want to avoid unneeded work or dos attacks on languages we don't support
+        if (!in_array($tl, transposh_consts::$google_languages) || !$this->options->is_editable_language($tl))
+                return;
+        // source language
+        $sl = 'auto';
+        if (isset($_GET['sl'])) $sl = $_GET['sl'];
+        // item count
+        $i = 0;
+        $q = '';
+        foreach ($_GET['q'] as $p) {
+            list($source, $trans) = $this->database->fetch_translation($p, $tl);
+            if (!$trans) {
+                $q .= '&q=' . urlencode($p);
+            } else {
+                // holds cached results
+                $r[$i] = $trans;
+            }
+            $i++;
+        }
+        // we avoid curling we had all results prehand
+        if ($q) {
+            $url = 'http://translate.google.com/translate_a/t?client=a' . $q . '&tl=' . $tl . '&sl=' . $sl;
+            //var_dump($url);
+            $ch = curl_init();
+            curl_setopt($ch, CURLOPT_URL, $url);
+            curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+            //must set agent for google to respond with utf-8
+            curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0');
+            $output = curl_exec($ch);
+            if ($output === false) {
+                echo 'Curl error: ' . curl_error($ch);
+                die();
+            }
+            curl_close($ch);
+            //echo $output;
+            $jsonarr = json_decode($output);
+            if (!$jsonarr) {
+                echo 'Not JSON';
+                die();
+            }
+            if (!isset($jsonarr->results)) {
+                $jsonarr2->results[] = $jsonarr;
+                $jsonarr = $jsonarr2;
+            }
+            foreach ($jsonarr->results as $result) {
+                unset($result->sentences[0]->orig);
+                unset($result->sentences[0]->translit);
+                unset($result->sentences[0]->src_translit);
+                unset($result->src);
+                unset($result->server_time);
+            }
+            //die();
+        }
+        header('Content-type: text/html; charset=utf-8');
+
+        // here we match online results with cached ones
+        $k = 0;
+        for ($j = 0; $j < $i; $j++) {
+            if (isset($r[$j])) {
+                $jsonout->results[] = $r[$j];
+            } else {
+                if (isset($jsonarr->results[$k]->sentences[0]->trans)) {
+                    $jsonout->results[] = $jsonarr->results[$k]->sentences[0]->trans;
+                } else {
+                    $jsonout->results[] = $_GET['q' . $j];
+                }
+                $k++;
+            }
+        }
+        echo json_encode($jsonout);
+
+        // do the db dance - a bit hackish way to insert downloaded translations directly to the db without having
+        // to pass through the user and collect $200
+        if ($k) {
+            $_POST['items'] = $k;
+            $_POST['ln0'] = $tl;
+            $_POST['sr0'] = 1; // google, hmm hmm,
+            $k = 0;
+            for ($j = 0; $j < $i; $j++) {
+                if (!isset($r[$j])) {
+                    $_POST["tk$k"] = transposh_utils::base64_url_encode($_GET['q'][$j]); // stupid, but should work
+                    $_POST["tr$k"] = $jsonout->results[$j];
+                    $k++;
+                }
+            }
+            $this->database->update_translation();
+        }
+
+        die();
+    }
+
+    // getting translation history
+    function on_ajax_nopriv_tp_history() {
+        // deleting
+        if (isset($_GET['timestamp'])) {
+            $this->database->del_translation_history($_GET['token'], $_GET['lang'], $_GET['timestamp']);
+        }
+        $this->database->get_translation_history($_GET['token'], $_GET['lang']);
+        die();
+    }
+
+    //  the case of posted translation
+    function on_ajax_nopriv_tp_translation() {
+        do_action('transposh_translation_posted');
+        $this->database->update_translation();
+        die();
+    }
+
+    // getting translation alternates
+    function on_ajax_nopriv_tp_trans_alts() {
+        $this->database->get_translation_alt($_GET['token']);
+        die();
+    }
+
+    // set the cookie with ajax, no redirect needed
+    function on_ajax_nopriv_tp_cookie() {
+        setcookie('TR_LNG', transposh_utils::get_language_from_url($_SERVER['HTTP_REFERER'], $this->home_url), time() + 90 * 24 * 60 * 60, COOKIEPATH, COOKIE_DOMAIN);
+        logger('Cookie ' . transposh_utils::get_language_from_url($_SERVER['HTTP_REFERER'], $this->home_url));
+        die();
+    }
+
+    // Set our cookie and return (if no js works - or we are in the default language)
+    function on_ajax_nopriv_tp_cookie_bck() {
+        setcookie('TR_LNG', transposh_utils::get_language_from_url($_SERVER['HTTP_REFERER'], $this->home_url), time() + 90 * 24 * 60 * 60, COOKIEPATH, COOKIE_DOMAIN);
+        if ($_SERVER['HTTP_REFERER']) {
+            $this->tp_redirect($_SERVER['HTTP_REFERER']);
+        } else {
+            $this->tp_redirect($my_transposh_plugin->home_url);
+        }
+        die();
+    }
+
 }
 

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

@@ -29 +29 @@
     private $localeleft = 'left';
 
-// constructor of class, PHP4 compatible construction for backward compatibility
+    // constructor of class, PHP4 compatible construction for backward compatibility
     function transposh_plugin_admin(&$transposh) {
         $this->transposh = &$transposh;
@@ -40 +40 @@
         // register the callback been used if options of page been submitted and needs to be processed
         add_action('admin_post_save_transposh', array(&$this, 'on_save_changes'));
-        // register a callback to allow admin removal of warnings
-        add_action('wp_ajax_closed_tpwarn', array(&$this, 'on_closed_tpwarn'));
+        // register ajax callbacks
+        add_action('wp_ajax_tp_close_warning', array(&$this, 'on_ajax_tp_close_warning'));
+        add_action('wp_ajax_tp_backup', array(&$this, 'on_ajax_tp_backup'));
+        add_action('wp_ajax_tp_restore', array(&$this, 'on_ajax_tp_restore'));
+        add_action('wp_ajax_tp_maint', array(&$this, 'on_ajax_tp_maint'));
+        add_action('wp_ajax_tp_cleanup', array(&$this, 'on_ajax_tp_cleanup'));
+        add_action('wp_ajax_tp_translate_all', array(&$this, 'on_ajax_tp_translate_all'));
+        add_action('wp_ajax_tp_post_phrases', array(&$this, 'on_ajax_tp_post_phrases'));
     }
 
@@ -171 +177 @@
         //TODO - make up my mind on using .css flags here (currently no)
         //if ($this->transposh->options->get_widget_css_flags())
-//            wp_enqueue_style("transposh_flags",$this->transposh->transposh_plugin_url."/widgets/flags/tpw_flags.css",array(),TRANSPOSH_PLUGIN_VER);
+        //            wp_enqueue_style("transposh_flags",$this->transposh->transposh_plugin_url."/widgets/flags/tpw_flags.css",array(),TRANSPOSH_PLUGIN_VER);
         wp_enqueue_script('jquery-ui-droppable');
-        wp_enqueue_script('transposh_control', $this->transposh->transposh_plugin_url . '/' . TRANSPOSH_DIR_JS . '/transposhcontrol.js', array(), TRANSPOSH_PLUGIN_VER, true);
-        wp_localize_script('transposh_control', 't_jp', array(
-            'post_url' => $this->transposh->post_url,
-            'preferred' => $this->transposh->options->get_preferred_translator(),
-            'l10n_print_after' => 't_jp.g_langs = ' . json_encode(transposh_consts::$google_languages) . '; t_jp.m_langs = ' . json_encode(transposh_consts::$bing_languages) . ';'/*
-                  /* ,
-                  'plugin_url' => $this->transposh_plugin_url,
-                  'edit' => ($this->edit_mode? '1' : ''),
-                  //'rtl' => (in_array ($this->target_language, $GLOBALS['rtl_languages'])? 'true' : ''),
-                  'lang' => $this->target_language,
-                  // those two options show if the script can support said engines
-                  'prefix' => SPAN_PREFIX,
-                  'preferred'=> $this->options->get_preferred_translator(),
-                  'progress'=>$this->edit_mode || $this->options->get_widget_progressbar() ? '1' : '') */
-//      ,'l10n_print_after' => 'try{convertEntities(inlineEditL10n);}catch(e){};'
-                // need to do this because the way wordpress encodes stuff
-        ));
-        wp_enqueue_script('google', "http://www.google.com/jsapi", array(), '1', true);
-        wp_enqueue_script('transposh_admin', $this->transposh->transposh_plugin_url . '/' . TRANSPOSH_DIR_JS . '/transposhadmin.js', array(), TRANSPOSH_PLUGIN_VER, true);
-        wp_enqueue_style('jqueryui', 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.2/themes/ui-lightness/jquery-ui.css', array(), '1.8.2');
-        wp_enqueue_script('jqueryui', 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.2/jquery-ui.min.js', array('jquery'), '1.8.2', true);
+        wp_enqueue_script('transposh_settings', $this->transposh->transposh_plugin_url . '/' . TRANSPOSH_DIR_JS . '/transposhsettings.js', array(), TRANSPOSH_PLUGIN_VER, true);
+        // MAKESURE 3.3+ css
+        // wp_enqueue_script('jquery-ui-progressbar');
+
+        wp_enqueue_style('jqueryui', 'http://ajax.googleapis.com/ajax/libs/jqueryui/' . JQUERYUI_VER . '/themes/ui-lightness/jquery-ui.css', array(), JQUERYUI_VER);
+        wp_enqueue_script('jqueryui', 'http://ajax.googleapis.com/ajax/libs/jqueryui/' . JQUERYUI_VER . '/jquery-ui.min.js', array('jquery'), JQUERYUI_VER, true);
+        wp_enqueue_script('transposh_backend', $this->transposh->transposh_plugin_url . '/' . TRANSPOSH_DIR_JS . '/transposhbackend.js', array(), TRANSPOSH_PLUGIN_VER, true);
+        $script_params = array(
+            'l10n_print_after' =>
+            't_be.g_langs = ' . json_encode(transposh_consts::$google_languages) . ';' .
+            't_be.m_langs = ' . json_encode(transposh_consts::$bing_languages) . ';' .
+            't_be.a_langs = ' . json_encode(transposh_consts::$apertium_languages) . ';'
+        );
+        wp_localize_script("transposh_backend", "t_be", $script_params);
 
         //add several metaboxes now, all metaboxes registered during load page can be switched off/on at "Screen Options" automatically, nothing special to do therefore
@@ -322 +321 @@
         echo '<div id="progress_bar_all"></div><div id="tr_translate_title"></div>';
         echo '<div id="tr_loading" style="margin: 0 0 10px 0">' . __('Translate by clicking the button below', TRANSPOSH_TEXT_DOMAIN) . '</div>';
-        echo '<a id="transposh-translate" href="' . $this->transposh->post_url . '?translate_all&offset=1" onclick="return false;" class="button">' . __('Translate All Now', TRANSPOSH_TEXT_DOMAIN) . '</a><br/>';
+        echo '<div id="tr_allmsg" style="margin: 0 0 10px 0"></div>';
+        echo '<a id="transposh-translate" href="#" onclick="return false;" class="button">' . __('Translate All Now', TRANSPOSH_TEXT_DOMAIN) . '</a><br/>';
         //get_posts
     }
@@ -503 +503 @@
          */
         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.'"/>';
-
-          /**
+        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.'"/>';
+        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 . '"/>';
 
         /*
@@ -593 +593 @@
     }
 
-    function on_closed_tpwarn() {
+    // ajax stuff!
+    function on_ajax_tp_close_warning() {
         $this->transposh->options->set_transposh_admin_hide_warning($_POST['id']);
         $this->transposh->options->update_options();
@@ -599 +600 @@
     }
 
+    function on_ajax_tp_backup() {
+        $this->transposh->run_backup();
+        die();
+    }
+
+    // Start restore on demand
+    function on_ajax_tp_restore() {
+        $this->transposh->run_restore();
+        die();
+    }
+
+    // Start cleanup on demand
+    function on_ajax_tp_cleanup() {
+        $this->transposh->database->cleanup($_POST['days']);
+        die();
+    }
+
+    // Start maint
+    function on_ajax_tp_maint() {
+        $this->transposh->database->db_maint();
+        die();
+    }
+
+    // Start full translation
+    function on_ajax_tp_translate_all() {
+        // get all ids in need of translation
+        global $wpdb;
+        $page_ids = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE (post_type='page' OR post_type='post') AND (post_status='publish' OR post_status='private') ORDER BY ID DESC");
+        // only high capabilities users can...
+        // add a fake post to translate things such as tags
+        if (!current_user_can('edit_post', $page_ids[0])) return;
+        $page_ids[] = "-555";
+        echo json_encode($page_ids);
+        die();
+    }
+
+    // getting phrases of a post (if we are in admin)
+    function on_ajax_tp_post_phrases() {
+        $this->transposh->postpublish->get_post_phrases($_GET['post']);
+        die();
+    }
+
 }
 

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

@@ -15 +15 @@
  * This file handles various AJAX needs of our plugin
  */
-// The following headers allow for cross-domain posting here, which is useful for some weird sites
-header('Access-Control-Allow-Origin: *');
-header('Access-Control-Allow-Methods: GET, POST, OPTIONS');
-header('Access-Control-Allow-Headers: X-Requested-With');
-header('Access-Control-Max-Age: 86400');
 
-// Exit early so the page isn't fully loaded for options requests
-if (strtolower($_SERVER['REQUEST_METHOD']) == 'options') {
-    exit();
-}
+echo "This file was removed in 0.8.0 and is only kept for debugging";
 
-// we need wordpress and us...
-$root = $_SERVER["DOCUMENT_ROOT"];
-$self = $_SERVER["SCRIPT_NAME"];
-// go down 4 dirs...
-for ($i = 0; $i < 5; $i++)
-    $self = substr($self, 0, -strlen(strrchr($self, '/')));
-if (file_exists($root . $self . '/wp-load.php')) {
-    require_once $root . $self . '/wp-load.php';
-} else {
-    // fallback plan
-    require_once('../../../../wp-load.php');
-}
-//  the case of posted translation
-if (isset($_POST['translation_posted'])) {
-    do_action('transposh_translation_posted');
-    $my_transposh_plugin->database->update_translation();
-}
-// getting translation history
-elseif (isset($_GET['tr_token_hist'])) {
-    // deleting
-    if (isset($_GET['action']) && $_GET['action'] == 'delete') {
-        $my_transposh_plugin->database->del_translation_history($_GET['tr_token_hist'], $_GET['lang'], $_GET['timestamp']);
-    }
-    $my_transposh_plugin->database->get_translation_history($_GET['tr_token_hist'], $_GET['lang']);
-}
-// getting translation alternates
-elseif (isset($_GET['tr_token_alt'])) {
-    $my_transposh_plugin->database->get_translation_alt($_GET['tr_token_alt']);
-}
-// getting phrases of a post (if we are in admin)
-elseif (isset($_GET['tr_phrases_post'])) {
-    $my_transposh_plugin->postpublish->get_post_phrases($_GET['post']);
-}
-// set the cookie with ajax, no redirect needed
-elseif (isset($_GET['tr_cookie'])) {
-    setcookie('TR_LNG', transposh_utils::get_language_from_url($_SERVER['HTTP_REFERER'], $my_transposh_plugin->home_url), time() + 90 * 24 * 60 * 60, COOKIEPATH, COOKIE_DOMAIN);
-    logger('Cookie ' . transposh_utils::get_language_from_url($_SERVER['HTTP_REFERER'], $my_transposh_plugin->home_url));
-}
-// Set our cookie and return (if no js works - or we are in the default language)
-elseif (isset($_GET['tr_cookie_bck'])) {
-    setcookie('TR_LNG', transposh_utils::get_language_from_url($_SERVER['HTTP_REFERER'], $my_transposh_plugin->home_url), time() + 90 * 24 * 60 * 60, COOKIEPATH, COOKIE_DOMAIN);
-    if ($_SERVER['HTTP_REFERER']) {
-        $this->transposh->tp_redirect($_SERVER['HTTP_REFERER']);
-    } else {
-        $this->transposh->tp_redirect($my_transposh_plugin->home_url);
-    }
-}
-// Start full translation
-elseif (isset($_GET['translate_all'])) {
-    // get all ids in need of translation
-    $page_ids = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE (post_type='page' OR post_type='post') AND (post_status='publish' OR post_status='private') ORDER BY ID DESC");
-    // only high capabilities users can...
-    if (!current_user_can('edit_post', $page_ids[0])) return;
-    // add a fake post to translate things such as tags
-    $page_ids[] = "-555";
-    echo json_encode($page_ids);
-}
-// Proxyed translation for google translate
-elseif (isset($_GET['tgp'])) {
-    // we need curl for this proxy
-    if (!function_exists('curl_init')) return;
-    // we want to avoid unneeded work or dos attacks on languages we don't support
-    if (!in_array($_GET['tgl'], transposh_consts::$google_proxied_languages) || !$my_transposh_plugin->options->is_editable_language($_GET['tgl']))
-            return;
-    $url = 'http://translate.google.com/translate_a/t?client=a&text=' . urlencode($_GET['tgp']) . '&tl=' . $_GET['tgl'] . '&sl=auto';
-    $ch = curl_init();
-    curl_setopt($ch, CURLOPT_URL, $url);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-    //must set agent for google to respond with utf-8
-    curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0');
-    $output = curl_exec($ch);
-    curl_close($ch);
-    header('Content-type: text/html; charset=utf-8');
-    echo $output;
-}
-// Start backup on demand
-elseif (isset($_GET['backup'])) {
-    $my_transposh_plugin->run_backup();
-}
-// Start restore on demand
-elseif (isset($_GET['restore'])) {
-    $my_transposh_plugin->run_restore();
-}
-// Start cleanup on demand
-elseif (isset($_GET['cleanup'])) {
-    // just make sure the admin started this... recently enough
-    check_ajax_referer('transposh-clean', 'nonce');
-    $my_transposh_plugin->database->cleanup($_GET['days']);
-}
-// Start maint
-elseif (isset($_GET['maint'])) {
-    // just make sure the admin started this... recently enough
-    check_ajax_referer('transposh-clean', 'nonce');
-    $my_transposh_plugin->database->db_maint();
-}
 ?>

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

@@ -47 +47 @@
             return;
         }
-        if ($result['headers']['fail']) {
+        if (isset($result['headers']['fail'])) {
             echo '500 - ' . $result['headers']['fail'];
             return;
@@ -57 +57 @@
             $this->transposh->options->update_options();
         }
-        if ($result['headers']['lastitem']) {
+        if (isset($result['headers']['lastitem'])) {
             $rowstosend = $this->transposh->database->get_all_human_translation_history($result['headers']['lastitem'], 500);
             while ($rowstosend) {
@@ -82 +82 @@
                     return;
                 }
-                if ($result['headers']['fail']) {
+                if (isset($result['headers']['fail'])) {
                     echo "500 - " . $result['headers']['fail'];
                     return;

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

@@ -69 +69 @@
           //@$this->memcache->connect(TP_MEMCACHED_SRV, TP_MEMCACHED_PORT) or $this->memcache_working = false;
           } */
-        logger($this->memcache_working);
+        logger($this->memcache_working); // TODO!! make sure it does something
     }
 
@@ -604 +604 @@
      */
     function get_all_human_translation_history($date ="null", $limit = "") {
+        $limitterm = '';
+        $dateterm = '';
         if ($date != "null")
                 $dateterm = "and UNIX_TIMESTAMP(timestamp) > $date";

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

@@ -23 +23 @@
     /** @var transposh_plugin Container class */
     private $transposh;
+
     /** @var boolean Did we just edited/saved? */
     private $just_published = false;
@@ -53 +54 @@
         if (!isset($_GET['post'])) return;
         if (get_post_meta($_GET['post'], 'transposh_can_translate', true)) { // do isdefined stuff
-            $this->just_published = true; // this is later used in the meta boxes
-            wp_enqueue_script("transposhadmin", $this->transposh->transposh_plugin_url . '/' . TRANSPOSH_DIR_JS . '/transposhadmin.js', array('jquery'), TRANSPOSH_PLUGIN_VER, true);
-            wp_localize_script("transposhadmin", "t_jp", array(
-                'post_url' => $this->transposh->post_url,
+            $this->just_published = true; // this is later used in the meta boxes //XXXXXXXXXXXXXXXXXXXXXXXXXXXX
+            wp_enqueue_script("transposh_backend", $this->transposh->transposh_plugin_url . '/' . TRANSPOSH_DIR_JS . '/transposhbackend.js', array('jquery'), TRANSPOSH_PLUGIN_VER, true);
+            $script_params = array(
                 'post' => $_GET['post'],
-                'preferred' => $this->transposh->options->get_preferred_translator(),
-                'l10n_print_after' => 't_jp.g_langs = ' . json_encode(transposh_consts::$google_languages) . '; t_jp.m_langs = ' . json_encode(transposh_consts::$bing_languages) . ';'
-            ));
-            wp_enqueue_style('jqueryui', 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/themes/ui-lightness/jquery-ui.css', array(), '1.8.14');
-            wp_enqueue_script('jqueryui', 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js', array('jquery'), '1.8.14', true);
+                'l10n_print_after' =>
+                't_be.g_langs = ' . json_encode(transposh_consts::$google_languages) . ';' .
+                't_be.m_langs = ' . json_encode(transposh_consts::$bing_languages) . ';' .
+                't_be.a_langs = ' . json_encode(transposh_consts::$apertium_languages) . ';'
+            );
+            wp_localize_script("transposh_backend", "t_be", $script_params);
+            // MAKESURE 3.3
+//        wp_enqueue_script('jquery-ui-progressbar');
+
+            wp_enqueue_style('jqueryui', 'http://ajax.googleapis.com/ajax/libs/jqueryui/' . JQUERYUI_VER . '/themes/ui-lightness/jquery-ui.css', array(), JQUERYUI_VER);
+            wp_enqueue_script('jqueryui', 'http://ajax.googleapis.com/ajax/libs/jqueryui/' . JQUERYUI_VER . '/jquery-ui.min.js', array('jquery'), JQUERYUI_VER, true);
+
             delete_post_meta($_GET['post'], 'transposh_can_translate'); // as we have used the meta - it can go now, another option would have been to put this in the getphrases
         }
@@ -86 +93 @@
     function get_post_phrases($postID) {
         // Some security, to avoid others from seeing private posts
-        if (!current_user_can('edit_post', $postID)) return;
         // fake post for tags
         if ($postID == -555) {
@@ -94 +100 @@
         // a normal post
         else {
+            if (!current_user_can('edit_post', $postID)) return;
+            global $post; // thid is needed because some of the functions below expect it...
             $post = get_post($postID);
             // Display filters
@@ -127 +135 @@
             }
         }
+        // We provide the post title here
+        $json['posttitle'] = $title;
+        // and all languages we might want to target
+        $json['langs'] = array();
+
         foreach ($phrases as $key) {
             foreach (explode(',', $this->transposh->options->get_editable_langs()) as $lang) {
@@ -133 +146 @@
                 if (!$this->transposh->options->is_default_language($lang) || $this->transposh->options->get_enable_default_translate()) {
                     // There is no point in returning phrases, languages pairs that cannot be translated
-                    if (in_array($lang, transposh_consts::$bing_languages) || in_array($lang, transposh_consts::$google_languages)) {
+                    if (in_array($lang, transposh_consts::$bing_languages) ||
+                            in_array($lang, transposh_consts::$google_languages) ||
+                            in_array($lang, transposh_consts::$apertium_languages)) {
                         list($source, $translation) = $this->transposh->database->fetch_translation($key, $lang);
                         if (!$translation) {
@@ -141 +156 @@
                             }
                             array_push($json['p'][$key]['l'], $lang);
+                            if (!in_array($lang, $json['langs'])) {
+                                array_push($json['langs'], $lang);
+                            }
                         }
                     }
@@ -152 +170 @@
         }
 
-        // add the title
-        //        if ($json['length'])
-        $json['posttitle'] = $title;
 
         // the header helps with debugging

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

@@ -223 +223 @@
             if ($this->transposh->options->get_widget_allow_set_default_language()) {
                 If ((isset($_COOKIE['TR_LNG']) && $_COOKIE['TR_LNG'] != $this->transposh->target_language) || (!isset($_COOKIE['TR_LNG']) && !$this->transposh->options->is_default_language($this->transposh->target_language))) {
-                    echo '<a id="' . SPAN_PREFIX . 'setdeflang" onClick="return false;" href="' . $this->transposh->post_url . '?tr_cookie_bck">' . __('Set as default language', TRANSPOSH_TEXT_DOMAIN) . '</a><br/>';
+                    echo '<a id="' . SPAN_PREFIX . 'setdeflang" onClick="return false;" href="' . admin_url('admin-ajax.php') . '?action=tp_cookie_bck">' . __('Set as default language', TRANSPOSH_TEXT_DOMAIN) . '</a><br/>';
                 }
             }