Changeset 386

Timestamp:

03/04/2010 02:12:58 AM (6 months ago)

Author:

ofer

Message:

Mass translation support for #80

Location:

trunk/WordPress/plugin/transposh

Files:

• js/transposhadmin.js (modified) (4 diffs)
• js/transposhcontrol.js (modified) (2 diffs)
• wp/transposh_admin.php (modified) (7 diffs)
• wp/transposh_ajax.php (modified) (1 diff)
• wp/transposh_postpublish.php (modified) (5 diffs)

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

@@ -1 @@
-/* 
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+/*  Copyright © 2009-2010 Transposh Team (website : http://transposh.org)
+ *
+ *      This program is free software; you can redistribute it and/or modify
+ *      it under the terms of the GNU General Public License as published by
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      This program is distributed in the hope that it will be useful,
+ *      but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      GNU General Public License for more details.
+ *
+ *      You should have received a copy of the GNU General Public License
+ *      along with this program; if not, write to the Free Software
+ *      Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
@@ -36 +48 @@
         jQuery.ajax({
             type: "POST",
-            url: transposh_params.post_url,
+            url: t_jp.post_url,
             data: data,
             success: function() {
@@ -50 +62 @@
     }, 200); // wait 200 ms...
 }
-/*
 
-            */
-//to run at start
-jQuery.noConflict();
-google.load("language", "1");
-
-//read parameters
-var transposh_params = new Array();
-var ext_langs = 'he|zh-tw|pt|fa|af|be|is|ga|mk|ms|sw|ws|cy|yi';
-jQuery("script[src*='transposhadmin.js']").each(function (j) {
-    var query_string = unescape(this.src.substring(this.src.indexOf('?')+1));
-    var parms = query_string.split('&');
-    for (var i=0; i<parms.length; i++) {
-        var pos = parms[i].indexOf('=');
-        if (pos > 0) {
-            var key = parms[i].substring(0,pos);
-            var val = parms[i].substring(pos+1);
-            transposh_params[key] = val;
-        }
-    }
-});
-
-jQuery(document).ready(function() {
-    //var count = 0;
+function translate_post(postid) {
+    // count = 0;
     var p_count = 0;
     var prev_name='';
     var l_count = 0;
-
-    jQuery.getJSON(transposh_params.post_url+"?tr_phrases_post=y&post="+transposh_params.post+"&random="+Math.random(), function(json) { // need to add random to avoid getting cached!
+    jQuery("#tr_loading").data("done",false);
+    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
-        if (json == null) {
-             jQuery("#tr_loading").replaceWith('Nothing left 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;
         }
         // create progress bars
-        jQuery("#tr_loading").replaceWith('Translating<br/>Phrase: <span id="p"></span><div id="progress_bar"/>Target lanaguage: <span id="l"></span><div id="progress_bar2"/><span id="r"></span>')
+        jQuery("#tr_loading").html('Translating<br/>Phrase: <span id="p"></span><div id="progress_bar"/>Target lanaguage: <span id="l"></span><div id="progress_bar2"/><span id="r"></span>');
         jQuery("#progress_bar").progressbar({
             value:0
@@ -97 +89 @@
             jQuery.each(val.l, function(id,lang) {
                 // if (count <1000) {
-                    google.language.translate(name, "", lang, function(result) {
-                        if (!result.error) {
-                            // No longer need because now included in the ajax translate
-                            if (prev_name != name) {
-                                prev_name = name;
-                                l_count = 0;
-                                p_count++;
-                            }
-                            jQuery("#progress_bar").progressbar('value' , p_count/json.length*100);
-                            l_count++;
-                            jQuery("#progress_bar2").progressbar('value' , l_count/val.l.length*100);
-                            jQuery('#p').text(jQuery("<div>"+name+"</div>").text());
-                            jQuery('#l').text(lang);
-                            jQuery('#r').text(jQuery("<div>"+result.translation+"</div>").text());
-                            ajax_translate_me(val.t,jQuery("<div>"+result.translation+"</div>").text(),lang);
+                google.language.translate(name, "", lang, function(result) {
+                    if (!result.error) {
+                        // No longer need because now included in the ajax translate
+                        if (prev_name != name) {
+                            prev_name = name;
+                            l_count = 0;
+                            p_count++;
                         }
-                    });
-                    //count++;
-                //}
+                        jQuery("#progress_bar").progressbar('value' , p_count/json.length*100);
+                        l_count++;
+                        jQuery("#progress_bar2").progressbar('value' , l_count/val.l.length*100);
+                        jQuery('#p').text(jQuery("<div>"+name+"</div>").text());
+                        jQuery('#l').text(lang);
+                        jQuery('#r').text(jQuery("<div>"+result.translation+"</div>").text());
+                        if (p_count === json.length && l_count === val.l.length)
+                            jQuery("#tr_loading").data("done",true);
+                        ajax_translate_me(val.t,jQuery("<div>"+result.translation+"</div>").text(),lang);
+                    }
+                });
+            //count++;
+            //}
             });
         });
     });
+}
+
+google.load("language", "1");
+
+jQuery(document).ready(function() {
+    if (t_jp.post) {
+        translate_post(t_jp.post);
+    }
 });

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

@@ -16 +16 @@
  */
 
-/*'function chbx_change(lang)'.
-                '{'.
-                'jQuery("#"+lang+"_edit").attr("checked",jQuery("#"+lang+"_view").attr("checked"))'.
-                '}'.
-                'jQuery(document).ready(function() {'.
-                'jQuery("#tr_anon").click(function() {'.
-                'if (jQuery("#tr_anon").attr("checked")) {'.
-                'jQuery(".tr_editable").css("display","none");'.
-                '} else {'.
-                'jQuery(".tr_editable").css("display","");'.
-                '}'.
-                '});'.
-                '});'.
-                '</script>';*/
+//(function ($) { // closure
 jQuery(function() {
     // clicking anonymous will make translatables active
@@ -134 +121 @@
     });
 
+    // backup button
+    jQuery("#transposh-backup").click(function () {
+        jQuery.get(t_jp.post_url + "?backup=" + Math.random());
+        return false;
+    });
+
+    // translate all button
+    do_translate_all = function () {
+        jQuery("#progress_bar_all").progressbar({
+            value:0
+        });
+        stop_translate_var = false;
+        // while there is a next
+        // get next post to translate
+        //var offset = "0";
+        jQuery("#tr_loading").data("done",true);
+        jQuery.ajaxSetup({
+            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]);
+                    //console.log(jQuery("#tr_loading").data("done"));
+                    //console.log("done translate" + a);
+                    if (data[a] && !stop_translate_var) {
+                        //console.log("trigger translation of " +a);
+                        timer2 = setTimeout(function() {
+                            dotimer(a+1)
+                        },1000);
+                    }
+                } 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);
+        });
+        jQuery("#transposh-translate").text("Stop translate")
+        jQuery("#transposh-translate").click(stop_translate);
+        return false;
+    }
+
+    stop_translate = function() {
+        clearTimeout(timer2);
+        stop_translate_var = true;
+        jQuery("#transposh-translate").text("Translate All Now")
+        jQuery("#transposh-translate").click(do_translate_all);
+        return false;
+    }
+
+    jQuery("#transposh-translate").click(do_translate_all);
+
 });
+//}(jQuery)); // end of closure

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

@@ -86 +86 @@
         logger($_POST['languages']);
         foreach($_POST['languages'] as $code => $lang) {
-        list ($langcode, $viewable, $translateable) = explode(",",$lang);
+            list ($langcode, $viewable, $translateable) = explode(",",$lang);
             $sorted_langs[$langcode] = $langcode;
             if($viewable) {
@@ -162 +162 @@
         wp_enqueue_script('jquery-ui-droppable');
         wp_enqueue_script("transposh_control",$this->transposh->transposh_plugin_url."/js/transposhcontrol.js",array(),TRANSPOSH_PLUGIN_VER, true);
+        wp_localize_script("transposh_control","t_jp",array(
+                'post_url' => $this->transposh->post_url/*,
+                    '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
+                    'msn' => (in_array($this->target_language,$GLOBALS['bing_languages']) && $this->options->get_msn_key()  ? '1' : ''),
+                    'google' => (in_array($this->target_language,$GLOBALS['google_languages']) ? '1' : ''),
+                    'prefix' => SPAN_PREFIX,
+                    'msnkey'=>$this->options->get_msn_key(),
+                    'preferred'=> $this->options->get_preferred_translator(),
+                    'progress'=>$this->edit_mode || $this->options->get_widget_progressbar() ? '1' : '')*/
+//                      'l10n_print_after' => 'try{convertEntities(inlineEditL10n);}catch(e){};'
+        ));
+        wp_enqueue_script("google","http://www.google.com/jsapi",array(),'1',true);
+        wp_enqueue_script("transposh_admin",$this->transposh->transposh_plugin_url."/js/transposhadmin.js",array(),TRANSPOSH_PLUGIN_VER, true);
+        wp_enqueue_style("jquery","http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/themes/ui-lightness/jquery-ui.css",array(),'1.0');
+        wp_enqueue_script("jqueryui","http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js",array("jquery"),'1.7.2',true);
+
 
         //add several metaboxes now, all metaboxes registered during load page can be switched off/on at "Screen Options" automatically, nothing special to do therefore
@@ -168 +188 @@
         add_meta_box('transposh-sidebox-news', 'Plugin news', array(&$this, 'on_sidebox_news_content'), $this->pagehook, 'side', 'core');
         add_meta_box('transposh-sidebox-stats', 'Plugin stats', array(&$this, 'on_sidebox_stats_content'), $this->pagehook, 'side', 'core');
+        add_meta_box('transposh-sidebox-translate', 'Translate all', array(&$this, 'on_sidebox_translate_content'), $this->pagehook, 'side', 'core');
         add_meta_box('transposh-contentbox-languages', 'Supported languages', array(&$this, 'on_contentbox_languages_content'), $this->pagehook, 'normal', 'core');
         add_meta_box('transposh-contentbox-translation', 'Translation settings', array(&$this, 'on_contentbox_translation_content'), $this->pagehook, 'normal', 'core');
@@ -302 +323 @@
     function on_sidebox_stats_content($data) {
         $this->transposh->database->db_stats();
+    }
+
+    function on_sidebox_translate_content($data) {
+        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</div>';
+        echo '<a id="transposh-translate" href="'.$this->transposh->post_url.'?translate_all&offset=1" onclick="return false;" class="button">Translate All Now</a><br/>';
+        //get_posts
     }
 
@@ -359 +387 @@
                 .display_flag("{$this->transposh->transposh_plugin_url}/img/flags", $flag, $langorigname,$this->transposh->options->get_widget_css_flags())
                 .'<input type="hidden" name="languages[]" value="'. $this->transposh->options->get_default_language() .'" />'
-                      .'&nbsp;<span class="langname">'.$langorigname.'</span><span class="langname hidden">'.$langname.'</span></li>';
+                .'&nbsp;<span class="langname">'.$langorigname.'</span><span class="langname hidden">'.$langname.'</span></li>';
         echo '</ul></div>';
         // list of languages
@@ -428 +456 @@
     }
 
-        function on_contentbox_auto_translation_content($data) {
+    function on_contentbox_auto_translation_content($data) {
 
         /*
@@ -498 +526 @@
                 'This will redirect the first page accessed in the session to the same page with the detected language.';
 
-       /* WIP2
+        /* WIP2
         echo '<a href="http://transposh.org/services/index.php?flags='.$flags.'">Gen sprites</a>';*/
     }
 
     function on_contentbox_community_content($data) {
+   /*     echo '<a tabindex="4" id="transposh-backup" href="/wp-admin/post-new.php?preview=true" class="button">Do Backup Now</a><br/>';
+        //  echo "<p id=\"backup\">Do backup.</p>";
+        echo 'Service Key: <input type="text" size="32" class="regular-text" value="'.$this->transposh->options->get_transposh_key().'" id="'.TRANSPOSH_KEY.'" name="'.TRANSPOSH_KEY.'"/>';
+        echo '
+<script type="text/javascript">
+    //<![CDATA[
+    jQuery(document).ready( function($) {
+        // close postboxes that should be closed
+        $("#backup").click(function () {
+        $.get("'.$this->transposh->post_url.'?backup=" + Math.random());
+        //alert ("hi");
+        });
+    });
+    //]]>
+</script>';*/
         echo "<p>This space is reserved for the coming community features of Transposh that will help you find translators to help with your site.</p>";
     }

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

@@ -81 +81 @@
     }
 }
+// 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' ORDER BY ID DESC");
+    // only high capabilities users can...
+    if (!current_user_can('edit_post',$page_ids[0])) return;
+    echo json_encode($page_ids);
+}
+// Start backup on demand
+/*elseif (isset($_GET['backup'])) {
+    $my_transposh_backup = new transposh_backup($my_transposh_plugin);
+    $my_transposh_backup->do_backup();
+}*/
+
 ?>

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

@@ -16 +16 @@
  *      Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
- */
+*/
 
 /*
  * Provides the side widget in the page/edit pages which will do translations
- */
+*/
 
 /**
@@ -40 +40 @@
         if ($this->transposh->options->get_enable_auto_post_translate()) {
             add_action('edit_post',array(&$this, 'on_edit'));
-           // add_action('publish_post',array(&$this, 'on_publish'));
+            // add_action('publish_post',array(&$this, 'on_publish'));
             add_action('admin_menu', array(&$this, 'on_admin_menu'));
         }
@@ -55 +55 @@
         if ($_GET['justedited']) {
             wp_enqueue_script("google","http://www.google.com/jsapi",array(),'1',true);
-            wp_enqueue_script("transposh","{$this->transposh->transposh_plugin_url}/js/transposhadmin.js?post_url={$this->transposh->post_url}&post={$_GET['post']}",array("jquery"),TRANSPOSH_PLUGIN_VER,true);
+            wp_enqueue_script("transposh","{$this->transposh->transposh_plugin_url}/js/transposhadmin.js",array("jquery"),TRANSPOSH_PLUGIN_VER,true);
+            wp_localize_script("transposh","t_jp",array(
+                    'post_url' => $this->transposh->post_url,
+                    'post' => $_GET['post'],
+                    'msnkey'=>$this->transposh->options->get_msn_key(),
+                    'msn_langs' => json_encode($GLOBALS['bing_languages']),
+                    'google_lang' => json_encode($GLOBALS['google_languages']),
+                    'preferred'=> $this->transposh->options->get_preferred_translator()/*,
+                    '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,
+
+                    'progress'=>$this->edit_mode || $this->options->get_widget_progressbar() ? '1' : '')*/
+//                      'l10n_print_after' => 'try{convertEntities(inlineEditL10n);}catch(e){};'
+            ));
             wp_enqueue_style("jquery","http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/themes/ui-lightness/jquery-ui.css",array(),'1.0');
             wp_enqueue_script("jqueryui","http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js",array("jquery"),'1.7.2',true);
+     /*       if ($this->transposh->options->get_enable_msn_translate() && $this->transposh->options->get_msn_key()) {
+                wp_enqueue_script("mstranslate","http://api.microsofttranslator.com/V1/Ajax.svc/Embed?appId=".$this->transposh->options->get_msn_key(),array(),'1',true);
+            }*/
         }
     }
@@ -75 +95 @@
         // TODO - grab phrases from rss excerpt
         //$output = get_the_excerpt();
-        // echo apply_filters('the_excerpt_rss', $output);
-
+        // echo apply_filters('the_excerpt_rss', $output);
+        //TODO - get comments text
+        
         $parser = new parser();
         $phrases = $parser->get_phrases_list($content);
@@ -106 +127 @@
         }
 
+        // add the title
+//        if ($json['length'])
+            $json['posttitle'] = $title;
+        
         // the header helps with debugging
         header("Content-type: text/javascript");