Changeset 68

Timestamp:

03/17/2009 09:07:25 AM (3 years ago)

Author:

ofer

Message:

Initial commit of auto-translate feature

Location:

trunk/WordPress/plugin/transposh

Files:

• constants.php (modified) (3 diffs)
• js/transposh.js (modified) (4 diffs)
• parser.php (modified) (28 diffs)
• transposh.php (modified) (19 diffs)
• transposh_widget.php (modified) (10 diffs)

trunk/WordPress/plugin/transposh/constants.php

@@ -61 +61 @@
 define("TRANLSLATOR", 'translator');
 
-//Option defining whether anonymous translation is allowed. 
+//Option defining whether anonymous translation is allowed.
 define("ANONYMOUS_TRANSLATION", "transposh_allow_anonymous_translation");
 
@@ -73 +73 @@
 define("DEFAULT_LANG", "transposh_default_language");
 
-//Define segment id prefix, will be included in span tag.
+//Option defining transposh widget appearance
+define("WIDGET_TRANSPOSH", "transposh_widget");
+
+//Define segment id prefix, will be included in span tag. also used as class identifier
 define("SPAN_PREFIX", "tr_");
 
@@ -79 +82 @@
 define("IMG_PREFIX", "tr_img_");
 
-//Option defining transposh widget appearance
-define("WIDGET_TRANSPOSH", "widget_transposh");
-
 //Option to enable/disable rewrite of permalinks
 define("ENABLE_PERMALINKS_REWRITE", "transposh_enable_permalinks");
-
 ?>

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

@@ -15 +15 @@
  *      Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+
 function display_dialog(caption, content)
 {        
@@ -47 +48 @@
 
 // fetch translation from google translate...
-function getgt(lang)
+function getgt()
 {
-        google.language.translate($("#tr_original_unescaped").text(), "", lang, function(result) {
+        google.language.translate($("#tr_original_unescaped").text(), "", transposh_target_lang, function(result) {
                   if (!result.error) {
-                    $("#tr_translation").attr('value',result.translation);
+                    $("#tr_translation").val(result.translation);
                   } 
                 });
 }
 
+//Ajax translation
+function ajax_translate(original,translation,source,segment_id) {
+    var query = 'original=' +  escape(original) +
+    '&translation=' + translation +
+    '&lang=' + transposh_target_lang +
+    '&source=' + source +
+    '&translation_posted=1';
+
+    $.ajax({  
+        type: "POST",
+        url: transposh_post_url,
+        data: query,  
+        success: function(req) {
+                //rewrite onclick function - in case of re-edit
+                $("#tr_img_" + segment_id).click(function () {
+                        translate_dialog(original, translation, segment_id);
+                    });
+
+                //current img 
+                var img = $("#tr_img_" + segment_id).attr('src');
+                var text_rewrite = translation;
+                
+                if(jQuery.trim(translation).length == 0) {
+                    //reset to the original content - the not escaped version
+                    text_rewrite = original;
+
+                    //switch to the edit img
+                    img = img.replace(/translate_fix.png/, "translate.png");
+                }
+                else {
+                        if (source == 1) {
+                                //switch to the auto img
+                                img = img.replace(/translate.png/, "translate_auto.png");                               
+                        } else {
+                                //switch to the fix img
+                                img = img.replace(/translate.png/, "translate_fix.png");
+                        }
+                }
+                
+                
+                //rewrite text
+                $("#tr_" + segment_id).html(text_rewrite);
+
+                //rewrite image
+                $("#tr_img_" + segment_id).attr('src', img);
+
+                //close dialog
+                cClick();
+                },
+                
+        error: function(req) {
+                alert("Error !!! failed to translate.\n\nServer's message: " + req.statusText);
+               }
+    });
+
+}
+
 //Open translation dialog 
-function translate_dialog(original, trans, lang, post_url, segment_id)
+function translate_dialog(original, trans, segment_id)
 {
 caption='Edit Translation';
-
+//alert (this.id);
 var dialog = ''+
-    ('<form id="tr_form" name="transposh_edit_form" method="post" action="' + post_url + '"><div>') +
+    ('<form id="tr_form" name="transposh_edit_form" method="post" action="' + transposh_post_url + '"><div>') +
      '<p dir="ltr">Original text<br \/><textarea id="tr_original_unescaped" cols="60" rows="3" readonly="readyonly">' +
        original + '</textarea> <\/p>' +
@@ -68 +126 @@
     '"' + 'onfocus="OLmEdit=1;" onblur="OLmEdit=0;"<\/p>' +
     '<input type="hidden" id="tr_original" name="original" value="' + escape(original) +'">' +
-    '<input type="hidden" id="tr_lang" name="lang" value="'+lang+'">' +
     '<input type="hidden" name="translation_posted" value= "1">' +
-    '<p><input onclick="getgt(\''+lang+'\')" type="button" value="Get Suggestion!"/>&nbsp;<input type="submit" value="Translate"/><\/p>' +
+    '<p><input onclick="getgt()" type="button" value="Get Suggestion!"/>&nbsp;<input type="submit" value="Translate"/><\/p>' +
     ('<\/div><\/form>');
 
-display_dialog(caption, dialog);
+        display_dialog(caption, dialog);
 
-// attach handler to form's submit event 
-$('#tr_form').submit(function() { 
+        // attach handler to form's submit event 
+        $('#tr_form').submit(function() { 
         var translation = $('#tr_translation').val();
-        var query = 'original=' +  escape(original) +
-                    '&translation=' + translation +
-                    '&lang=' + $('#tr_lang').val() +
-                    '&translation_posted=1';
-        
-                
-        $.ajax({  
-            type: "POST",
-            url: post_url,
-            data: query,  
-            success: function(req) {
-                    //rewrite onclick function - in case of re-edit
-                    $("#tr_img_" + segment_id).click(function () {
-                            translate_dialog(original, translation, lang, post_url, segment_id);
-                        });
-
-                    //current img 
-                    var img = $("#tr_img_" + segment_id).attr('src');
-                    var text_rewrite = translation;
-                    
-                    if(jQuery.trim(translation).length == 0) {
-                        //reset to the original content - the not escaped version
-                        text_rewrite = original;
-
-                        //switch to the edit img
-                        img = img.replace(/translate_fix.png/, "translate.png");
-                    }
-                    else {
-                        //switch to the fix img
-                        img = img.replace(/translate.png/, "translate_fix.png");
-                    }
-                    
-                    
-                    //rewrite text
-                    $("#tr_" + segment_id).html(text_rewrite);
-
-                    //rewrite image
-                    $("#tr_img_" + segment_id).attr('src', img);
-
-                    //close dialog
-                    cClick();
-                    },
-                    
-            error: function(req) {
-                    alert("Error !!! failed to translate.\n\nServer's message: " + req.statusText);
-                   }
-                
-                    
-        });
+                        
+        ajax_translate(original,translation,0,segment_id);
         
         // return false to prevent normal browser submit and page navigation 
@@ -132 +142 @@
         
     });
+
 }
+//function for auto translation
+
+function do_auto_translate() {
+        $(".tr_u").each(function (i) {
+                var translated_id = $(this).attr('id');
+                google.language.translate($(this).text(), "", transposh_target_lang, function(result) {
+                        if (!result.error) {
+                                var segment_id = translated_id.substr(translated_id.lastIndexOf('_')+1);
+                        ajax_translate($("#"+translated_id).text(),result.translation,1,segment_id);
+                        } 
+                });
+        });
+}

trunk/WordPress/plugin/transposh/parser.php

@@ -97 +97 @@
                         $tag_start = $pos;
                         $pos = strpos($page, '>', $pos);
-                        
+
                         //Mark tag end position
                         $tag_end = $pos;
@@ -156 +156 @@
         logger("Exit " . __METHOD__, 4);
 }
-
 
 /*
@@ -209 +208 @@
                         global $is_in_channel;
                         $is_in_channel = TRUE;
-                        break;  
-        }
-
-}
-
+                        break;
+        }
+
+}
 
 /*
@@ -240 +238 @@
 }
 
-
 /*
  * Process html tag. Set the direction for rtl languages.
@@ -301 +298 @@
         if(is_word('![CDATA['))
         {
-                $pos += 8; //skip to end of ![CDATA[ 
+                $pos += 8; //skip to end of ![CDATA[
         }
         else
@@ -311 +308 @@
                 }
         }
-        
+
         logger("Exit " . __METHOD__. ": $pos", 5);
         return substr($page,$start, $pos - $start);
@@ -385 +382 @@
 {
         global $page, $pos;
-        
+
         logger("Enter " . __METHOD__ , 4);
 
@@ -394 +391 @@
                 $start = $pos;
                 $page_length =  strlen($page);
-                
-                // Indicates if the html entity should break into a new translation segment. 
-                $is_breaker = FALSE;  
-                
+
+                // Indicates if the html entity should break into a new translation segment.
+                $is_breaker = FALSE;
+
                 while($pos < $page_length && $page[$pos] != '<')
                 {
@@ -409 +406 @@
                                         $start = $end_of_entity;
                                 }
-                                
+
                                 //skip past entity
                                 $pos = $end_of_entity;
@@ -433 +430 @@
 }
 
-
-/*
- * Translate the content of a cdata section.  For now we only expect to handle it 
- * within RSS feeds. 
+/*
+ * Translate the content of a cdata section.  For now we only expect to handle it
+ * within RSS feeds.
  */
 function process_cdata_section()
 {
         global $page, $pos;
-        
+
         logger("Enter " . __METHOD__  , 4);
 
@@ -450 +446 @@
                 $start = $pos;
                 $page_length =  strlen($page);
-                
+
                 while($pos < $page_length && !is_word(']]>'))
                 {
@@ -477 +473 @@
 /**
  * Determines position in page marks a transaltable tag in html page or rss feed section.
- * Return TRUE if should be translated otherwise FALSE.  
+ * Return TRUE if should be translated otherwise FALSE.
  */
 function is_translatable_section()
@@ -484 +480 @@
         $rc = FALSE;
         $current_tag = end($tags_list);
-        
+
         if($is_in_body || $current_tag == 'title')
         {
@@ -496 +492 @@
 
         logger("Exit " . __METHOD__ . " $current_tag, translate: " . ($rc ? "yes" : "no"), 4);
-        return $rc;   
+        return $rc;
 }
 
@@ -525 +521 @@
                         $page[$position] == ';' ||
                         //break on numbers but not like: 3rd, 4th
-                        (is_digit($position) && !is_a_to_z_character($position+1))) 
+                        (is_digit($position) && !is_a_to_z_character($position+1)))
         {
                 //break the sentence into segments regardless of the next character.
@@ -537 +533 @@
  * Determines if the current position marks the begining of an html
  * entity. E.g &amp;
- * Return 0 if not an html entity otherwise return the position past this entity. In addition 
+ * Return 0 if not an html entity otherwise return the position past this entity. In addition
  *        the $is_breaker will be set to TRUE if entity should break translation into a new segment.
  *
@@ -677 +673 @@
 }
 
-
 /*
  * Check within page buffer position for the given word.
  * param word The word to look for.
- * param index1 Optional position within the page buffer, if not available then the current 
- *              position ($pos) is used.  
+ * param index1 Optional position within the page buffer, if not available then the current
+ *              position ($pos) is used.
  * Return TRUE if the word matches otherwise FALSE
  */
@@ -689 +684 @@
         global $page, $pos;
         $rc = FALSE;
-        
+
         if(!isset($index1))
         {
@@ -695 +690 @@
                 $index1 = $pos;
         }
-        
+
         $index2 = 0; //position within word
         $word_len =   strlen($word);
         $page_length =  strlen($page);
-        
+
         while($index1 < $page_length && $index2 < $word_len)
         {
@@ -712 +707 @@
                 }
         }
-        
+
         //check if we have full match
         if($index2 == $word_len)
@@ -718 +713 @@
                 $rc = TRUE;
         }
-        
+
         return $rc;
 }
 
-
-/**
+/*
  * Translate the text between the given start position and the current
  * position (pos) within the buffer.
@@ -757 +751 @@
         }
 
-        $translated_text = fetch_translation($original_text);
-
-        insert_translation($original_text, $translated_text, $start, $end);
+        list($translated_text, $source) = fetch_translation($original_text);
+
+        insert_translation($original_text, $translated_text, $source, $start, $end);
 }
 
@@ -769 +763 @@
  * param end Marks the end position of the text to be replaced within the original page
  */
-function insert_translation(&$original_text, &$translated_text, $start, $end)
+function insert_translation(&$original_text, &$translated_text, $source, $start, $end)
 {
         global $segment_id, $is_edit_mode, $tags_list;
@@ -784 +778 @@
         else
         {
-                $span = "<span id=\"" . SPAN_PREFIX . "$segment_id\">";
+                $span_prefix = SPAN_PREFIX;
+                // We will mark translated text with tr_t class and untranslated with tr_u
+                $span = "<span class=\"$span_prefix";
 
                 if($translated_text == NULL)
                 {
+                        $span .= "u\" id=\"{$span_prefix}{$segment_id}\">";
                         $span .= $original_text . '</span>';
                 }
                 else
                 {
+                        $span .= "t\" id=\"{$span_prefix}{$segment_id}\">";
                         $span .= $translated_text . "</span>";
                         $is_translated = TRUE;
@@ -801 +799 @@
 
                 //Insert image to allow editing this segment
-                $img = get_img_tag($original_text, $translated_text, $segment_id, $is_translated);
+                $img = get_img_tag($original_text, $translated_text, $source, $segment_id, $is_translated);
                 update_translated_page($end + 1, - 1, $img);
 
@@ -813 +811 @@
 }
 
-
 /*
  * Scrubs text prior to translation to remove/encode special
@@ -833 +830 @@
         return $text;
 }
-
 
 /**
@@ -865 +861 @@
 
 }
-
 ?>

trunk/WordPress/plugin/transposh/transposh.php

@@ -42 +42 @@
 
 //Database version
-define("DB_VERSION", "1.01");
+define("DB_VERSION", "1.02");
 
 //Constant used as key in options database
@@ -221 +221 @@
  * Fetch translation from db or cache.
  * Returns the translated string or NULL if not available.
+ * TODO: // will an array work?
  */
 function fetch_translation($original)
@@ -230 +231 @@
     if(ENABLE_APC && function_exists('apc_fetch'))
     {
-        $cached = apc_fetch($original . $lang, $rc);
+        $cached = apc_fetch($original .'___'. $lang, $rc);
         if($rc === TRUE)
         {
@@ -243 +244 @@
     if($row !== FALSE)
     {
-        $translated = $row->translated;
-        $translated = stripslashes($translated);
-
-        logger("db result for $original >>> $translated ($lang)" , 3);
+        $translated_text = stripslashes($row->translated);
+        $translated = array($translated_text, $row->source);
+
+        logger("db result for $original >>> $translated_text ($lang) ({$row->source})" , 3);
     }
 
@@ -260 +261 @@
 
         //update cache
-        $rc = apc_store($original . $lang, $cache_entry, 3600);
+        $rc = apc_store($original .'___'. $lang, $cache_entry, 3600);
         if($rc === TRUE)
         {
@@ -298 +299 @@
     $js .= "\n<script type=\"text/javascript\" src=\"$overlib_dir/overlibmws_shadow.js\"></script>";
 
-    $js .= "\n<script type=\"text/javascript\" src=\"$plugin_url/js/transposh.js\"></script>\n";
-    $js .= "\n<script type=\"text/javascript\" src=\"http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js\"></script>\n";
-    $js .= "\n<script type=\"text/javascript\" src=\"http://www.google.com/jsapi\"></script>\n";
-    $js .= "\n<script type=\"text/javascript\">google.load(\"language\", \"1\");</script>\n";
+    $js .= "\n<script type=\"text/javascript\" src=\"$plugin_url/js/transposh.js\"></script>";
+    $js .= "\n<script type=\"text/javascript\" src=\"http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js\"></script>";
+    $js .= "\n<script type=\"text/javascript\" src=\"http://www.google.com/jsapi\"></script>";
+    $js .= "\n<script type=\"text/javascript\">google.load(\"language\", \"1\");</script>";
+    global $lang, $home_url;
+    $post_url = $home_url . '/index.php';
+    $js .= "\n<script type=\"text/javascript\">var transposh_post_url='$post_url';var transposh_target_lang='$lang';$(document).ready(function() {do_auto_translate();});</script>";
 
     echo $js;
@@ -313 +317 @@
          placed within the img tag for use on client side operation (jquery)
  */
-function get_img_tag($original, $translation, $segment_id, $is_translated = FALSE)
+function get_img_tag($original, $translation, $source, $segment_id, $is_translated = FALSE)
 {
     global $plugin_url, $lang, $home_url;
@@ -330 +334 @@
     }
 
+    if ($source == 1) {
+        $add_img = "_auto";
+    }
+
     $img = "<img src=\"$plugin_url/translate$add_img.png\" alt=\"translate\" id=\"" . IMG_PREFIX . "$segment_id\"
-           onclick=\"translate_dialog('$original','$translation','$lang','$url', '$segment_id'); return false;\"
+           onclick=\"translate_dialog('$original','$translation','$segment_id'); return false;\"
            onmouseover=\"hint('$original'); return true;\"
            onmouseout=\"nd()\" />";
@@ -395 +403 @@
     $translation = $_POST['translation'];
     $lang = $_POST['lang'];
+    $source = $_POST['source'];
 
     if(!isset($original) || !isset($translation) || !isset($lang))
     {
-        logger("Enter " . __FILE__ . " missing params: $original , $translation, $lang," .
-               $ref, 0);
+        logger("Enter " . __FILE__ . " missing params: $original , $translation, $lang," . $ref, 0);
         return;
     }
@@ -413 +421 @@
     $translation = $wpdb->escape(htmlspecialchars(stripslashes(urldecode($translation))));
 
-    $update = "REPLACE INTO  $table_name (original, translated, lang)
-                VALUES ('" . $original . "','" . $translation . "','" . $lang . "')";
+    //TODO: Check more escaping...
+
+    $update = "REPLACE INTO  $table_name (original, translated, lang, source)
+                VALUES ('" . $original . "','" . $translation . "','" . $lang . "','" . $source . "')";
 
     $result = $wpdb->query($update);
@@ -420 +430 @@
     if($result !== FALSE)
     {
-        update_transaction_log($original, $translation, $lang);
+        update_transaction_log($original, $translation, $lang, $source);
 
         //Delete entry from cache
         if(ENABLE_APC && function_exists('apc_store'))
         {
-            apc_delete($original . $lang);
+            apc_delete($original .'___'. $lang);
         }
         logger("Inserted to db '$original' , '$translation', '$lang' " , 3);
@@ -443 +453 @@
  *
  */
-function update_transaction_log(&$original, &$translation, &$lang)
+function update_transaction_log(&$original, &$translation, &$lang, $source)
 {
         global $wpdb, $user_ID;
@@ -458 +468 @@
         }
 
-    $log = "INSERT INTO ".$wpdb->prefix.TRANSLATIONS_LOG." (original, translated, lang, translated_by)
-                VALUES ('" . $original . "','" . $translation . "','" . $lang . "','".$loguser."')";
+    $log = "INSERT INTO ".$wpdb->prefix.TRANSLATIONS_LOG." (original, translated, lang, translated_by, source)
+                VALUES ('" . $original . "','" . $translation . "','" . $lang . "','".$loguser."','".$source."')";
 
     $result = $wpdb->query($log);
@@ -465 +475 @@
     if($result === FALSE)
     {
-        logger("Error !!! failed to update transaction log:  $loguser, $original ,$translation, $lang" , 0);
-    }
-
-}
-
+        logger("Error !!! failed to update transaction log:  $loguser, $original ,$translation, $lang, $source" , 0);
+    }
+}
 
 /*
@@ -510 +518 @@
 }
 
-
 /*
  * Page generation completed - flush buffer.
@@ -518 +525 @@
     ob_flush();
 }
-
 
 /*
@@ -580 +586 @@
     return $qvars;
 }
-
 
 /*
@@ -609 +614 @@
         dbDelta($sql);
 
+                // TODO: remove this?
         //Verify that newly created table is ready for use.
         //$insert = "INSERT INTO " . $table_name . " (original, translated, lang) " .
@@ -634 +640 @@
                                                   translated VARCHAR(256),
                                                   translated_by VARCHAR(15),
+                                                  source TINYINT NOT NULL,
                                                   timestamp TIMESTAMP,
                                                   PRIMARY KEY (original, lang, timestamp)) ";

trunk/WordPress/plugin/transposh/transposh_widget.php

@@ -36 +36 @@
 
                 global $wp_rewrite;
-        
+
                 $ref=getenv('HTTP_REFERER');
                 $lang = $_POST[LANG_PARAM];
 
-        //remove existing language settings. 
+        //remove existing language settings.
         $ref = cleanup_url($ref);
-        
+
                 if($lang != "none")
                 {
@@ -100 +100 @@
 
     $is_showing_languages = FALSE;
-    
+
         echo $before_widget . $before_title . __(no_translate("Transposh")) . $after_title;
-            
+
         switch ($options['style']) {
                 case 1: // flags
             //keep the flags in the same direction regardless of the overall page direction
-            echo "<div style=\"text-align: left;\" class=\"" . NO_TRANSLATE_CLASS . "\" >"; 
+            echo "<div style=\"text-align: left;\" class=\"" . NO_TRANSLATE_CLASS . "\" >";
 
             global $plugin_url;
             $using_permalinks = $wp_rewrite->using_permalinks();
-            
+
                         foreach($languages as $code => $lang2)
                         {
                                 list($language,$flag) = explode (",",$lang2);
 
-                //remove any language identifier 
+                //remove any language identifier
                 $page_url = cleanup_url($page_url);
-                
+
                                 //Only show languages which are viewable or (editable and the user is a translator)
                                 if(strstr($viewable_langs, $code) ||
@@ -123 +123 @@
                                 {
                                         $page_url = rewrite_url_lang_param($page_url, $code, $is_edit, !$using_permalinks);
-                    
+
                                         echo "<a href=\"" . $page_url . "\">
                          <img src=\"$plugin_url/flags/$flag.png\" title=\"$language\" alt=\"$language\"
@@ -131 +131 @@
                         }
             echo "</div>";
-            
+
                         // this is the form for the edit...
                         echo "<form action=\"$page_url\" method=\"post\">";
@@ -139 +139 @@
 
             echo "<form action=\"$page_url\" method=\"post\">";
-            echo "<span class=\"" . NO_TRANSLATE_CLASS . "\" >";
+            echo "<span class=\"" .NO_TRANSLATE_CLASS . "\" >";
                         echo "<select name=\"lang\"     id=\"lang\" onchange=\"Javascript:this.form.submit();\">";
                         echo "<option value=\"none\">[Language]</option>";
@@ -171 +171 @@
                 "\" onClick=\"this.form.submit();\"/>&nbsp;Edit Translation";
         }
-        
+
         echo "<input type=\"hidden\" name=\"transposh_widget_posted\" value=\"1\"/>";
     }
@@ -181 +181 @@
 
     echo "</form>";
+    echo "<button onClick=\"do_auto_translate();\">translate all</button>";
 
     echo $after_widget;
 }
 
-
-/*
- *Remove from url any language (or editing) params that were added for our use.
- *Return the scrubed url
+/*
+ * Remove from url any language (or editing) params that were added for our use.
+ * Return the scrubed url
  */
 function cleanup_url($url)
 {
     global $home_url, $home_url_quoted;
-    
+
     //cleanup previous lang & edit parameter from url
     $url = preg_replace("/(" . LANG_PARAM . "|" . EDIT_PARAM . ")=[^&]*/i", "", $url);
-    
-    
+
+
     if(!$home_url)
     {
@@ -203 +203 @@
         init_global_vars();
     }
-    
+
     //cleanup lang identifier in permalinks
     $url = preg_replace("/$home_url_quoted\/(..\/)/", "$home_url/",  $url);
@@ -245 +245 @@
     echo '<option ' . ($style == 1 ? 'selected="selected"' : '') .
         'value="1">Flags</option>';
-    
+
     echo '</select></label></p>
           <input type="hidden" name="transposh-submit" id="transposh-submit" value="1" />';
-    
-}
-
+
+}
 
 //Register callback for WordPress events
@@ -256 +255 @@
 add_action('widgets_init', 'transposh_widget_init');
 
-
 ?>