Changeset 80

Timestamp:

03/19/2009 10:39:48 PM (3 years ago)

Author:

amir

Message:

Fixed a bug causing auto translate for readers to fail after the token change.

Location:

trunk/WordPress/plugin/transposh

Files:

• js/transposh.js (modified) (2 diffs)
• parser.php (modified) (2 diffs)
• transposh.php (modified) (3 diffs)

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

@@ -59 +59 @@
 //Ajax translation
 function ajax_translate(original,translation,source,segment_id) {
-        var token = $("#tr_img_" + segment_id).attr('token');
+        var token = $("#tr_" + segment_id).attr('token');
         var query = 'token=' +  token +
     '&translation=' + translation +
@@ -134 +134 @@
     '<p>Translate to<br \/><input type="text" id="tr_translation" name="translation" size="80" value="'+ trans +
     '"' + 'onfocus="OLmEdit=1;" onblur="OLmEdit=0;"<\/p>' +
-    '<input type="hidden" id="tr_original" name="original" value="' + escape(original) +'">' +
     '<input type="hidden" name="translation_posted" value= "1">' +
     '<p><input onclick="getgt()" type="button" value="Get Suggestion!"/>&nbsp;<input type="submit" value="Translate"/><\/p>' +

trunk/WordPress/plugin/transposh/parser.php

@@ -778 +778 @@
         $is_translated = FALSE;
 
-        if(!($is_edit_mode || $enable_auto_translate) || !in_array('body', $tags_list))
-        {
-                if($translated_text != NULL)
-                {
-                        update_translated_page($start, $end, $translated_text);
-                }
-        }
-        else
+        if(($is_edit_mode || ($enable_auto_translate && $translated_text == NULL)) && in_array('body', $tags_list))
         {
                 $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}\">";
+                
+                //Use base64 encoding to make that when the page is translated (i.e. update_translation) we
+        //get back exactlly the same string without having the client decode/encode it in anyway. 
+        $token = "token=\"" . base64_encode($original_text) . "\"";
+                
+        if($translated_text == NULL)
+                {
+                    $span .= "u\" id=\"{$span_prefix}{$segment_id}\" $token>";
                         $span .= $original_text . '</span>';
                 }
                 else
                 {
-                        $span .= "t\" id=\"{$span_prefix}{$segment_id}\">";
+                        $span .= "t\" id=\"{$span_prefix}{$segment_id}\" $token>";
                         $span .= $translated_text . "</span>";
                         $is_translated = TRUE;
@@ -817 +814 @@
 
         }
-
+        else
+        {
+                if($translated_text != NULL)
+                {
+                        update_translated_page($start, $end, $translated_text);
+                }
+        }
+        
         logger("Exit " . __METHOD__  . " : $original_text" , 4);
 }

trunk/WordPress/plugin/transposh/transposh.php

@@ -336 +336 @@
     $url = $home_url . '/index.php';
 
-    //Use base64 encoding to make that when the page is translated (i.e. update_translation) we
-    //get back exactlly the same string without having the client decode/encode it in anyway. 
-    $token = base64_encode($original);
-    
     //For use in javascript, make the following changes:
     //1. Add slashes to escape the inner text
@@ -356 +352 @@
     }
 
-    $img = "<img src=\"$plugin_url/translate$add_img.png\" token=\"$token\" alt=\"translate\" id=\"" . IMG_PREFIX . "$segment_id\"
+    $img = "<img src=\"$plugin_url/translate$add_img.png\" alt=\"translate\" id=\"" . IMG_PREFIX . "$segment_id\"
            onclick=\"translate_dialog('$original','$translation','$segment_id'); return false;\"
            onmouseover=\"hint('$original'); return true;\"
@@ -406 +402 @@
 
     $table_name = $wpdb->prefix . TRANSLATIONS_TABLE;
-    $enable_auto_translate = get_option(ENABLE_AUTO_TRANSLATE,1);
+    $enable_auto_translate = get_option(ENABLE_AUTO_TRANSLATE,1) && is_translator();
 }