Changeset 74

Timestamp:

03/19/2009 09:48:45 AM (3 years ago)

Author:

ofer

Message:

Support for auto-translate in read mode

Location:

trunk/WordPress/plugin/transposh

Files:

• parser.php (modified) (3 diffs)
• transposh.php (modified) (3 diffs)

trunk/WordPress/plugin/transposh/parser.php

@@ -724 +724 @@
 {
         logger("Enter " . __METHOD__  . " : $start", 4);
-        global $page, $pos, $is_edit_mode;
+        global $page, $pos;
 
         //trim white space from the start position going forward
@@ -769 +769 @@
         $is_translated = FALSE;
 
-        if(!$is_edit_mode || !in_array('body', $tags_list))
+        if(!($is_edit_mode || get_option(ENABLE_AUTO_TRANSLATE,1)) || !in_array('body', $tags_list))
         {
                 if($translated_text != NULL)
@@ -798 +798 @@
 
 
-                //Insert image to allow editing this segment
-                $img = get_img_tag($original_text, $translated_text, $source, $segment_id, $is_translated);
-                update_translated_page($end + 1, - 1, $img);
-
+                //Insert image to allow editing this segment (only in explicit edit)
+                if($is_edit_mode) {
+                        $img = get_img_tag($original_text, $translated_text, $source, $segment_id, $is_translated);
+                        update_translated_page($end + 1, - 1, $img);
+                }
                 //Increment only after both text and image are generated so they
                 //will be the same for each translated segement

trunk/WordPress/plugin/transposh/transposh.php

@@ -284 +284 @@
 
     if (!($wp_query->query_vars[EDIT_PARAM] == "1" ||
-         $wp_query->query_vars[EDIT_PARAM] == "true"))
-    {
-        //check permission later - for now just make sure we don't load the
+         $wp_query->query_vars[EDIT_PARAM] == "true") && !get_option(ENABLE_AUTO_TRANSLATE,1))
+    {
+        //TODO: check permission later - for now just make sure we don't load the
         //js code when it is not needed
         return;
@@ -294 +294 @@
     $overlib_dir = "$plugin_url/js/overlibmws";
 
-    $js = "\n<script type=\"text/javascript\" src=\"$overlib_dir/overlibmws.js\"></script>";
-    $js .= "\n<script type=\"text/javascript\" src=\"$overlib_dir/overlibmws_filter.js\"></script>";
-    $js .= "\n<script type=\"text/javascript\" src=\"$overlib_dir/overlibmws_modal.js\"></script>";
-    $js .= "\n<script type=\"text/javascript\" src=\"$overlib_dir/overlibmws_overtwo.js\"></script>";
-    $js .= "\n<script type=\"text/javascript\" src=\"$overlib_dir/overlibmws_scroll.js\"></script>";
-    $js .= "\n<script type=\"text/javascript\" src=\"$overlib_dir/overlibmws_shadow.js\"></script>";
-
+    if ($wp_query->query_vars[EDIT_PARAM] == "1" ||  $wp_query->query_vars[EDIT_PARAM] == "true") {
+        $js = "\n<script type=\"text/javascript\" src=\"$overlib_dir/overlibmws.js\"></script>";
+        $js .= "\n<script type=\"text/javascript\" src=\"$overlib_dir/overlibmws_filter.js\"></script>";
+        $js .= "\n<script type=\"text/javascript\" src=\"$overlib_dir/overlibmws_modal.js\"></script>";
+        $js .= "\n<script type=\"text/javascript\" src=\"$overlib_dir/overlibmws_overtwo.js\"></script>";
+        $js .= "\n<script type=\"text/javascript\" src=\"$overlib_dir/overlibmws_scroll.js\"></script>";
+        $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>";
     $js .= "\n<script type=\"text/javascript\" src=\"http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js\"></script>";
@@ -498 +499 @@
     if($result === FALSE)
     {
+        logger(mysql_error(),0);
         logger("Error !!! failed to update transaction log:  $loguser, $original ,$translation, $lang, $source" , 0);
     }