Changeset 76

Timestamp:

03/19/2009 12:22:25 PM (3 years ago)

Author:

amir

Message:

Fixed parsing of nubmers which should be excluded from translation unless they are in this form 1st 18th ... .
Exclude js includes when not needed.
Some minor cosmetics changes as well.

Location:

trunk/WordPress/plugin/transposh

Files:

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

trunk/WordPress/plugin/transposh/parser.php

@@ -56 +56 @@
 //Is current position within the channel tag, i.e. RSS feed
 $is_in_channel = FALSE;
+
+//Indicates whether automatic translation (i.e. google) is enabled for this page
+$enable_auto_translate;
 
 /*
@@ -416 +419 @@
                                 $start = $pos;
                         }
+                        else if($end_of_number = is_number($pos))
+                        {
+                                //numbers will break translations segements and will not be included in the translation
+                                translate_text($start);
+                                $pos = $start = $end_of_number;
+                        }                       
                         else
                         {
@@ -456 +465 @@
                                 $pos++;
                                 $start = $pos;
+                        }
+                        else if($end_of_number = is_number($pos))
+                        {
+                                //numbers will break translations segements and will not be included in the translation
+                                translate_text($start);
+                                $pos = $start = $end_of_number;
                         }
                         else
@@ -519 +534 @@
                         $page[$position] == '"' || $page[$position] == '!' ||
                         $page[$position] == ':' || $page[$position] == '|' ||
-                        $page[$position] == ';' ||
-                        //break on numbers but not like: 3rd, 4th
-                        (is_digit($position) && !is_a_to_z_character($position+1)))
+                        $page[$position] == ';')
         {
                 //break the sentence into segments regardless of the next character.
@@ -570 +583 @@
 }
 
+/*
+ * Determines if the current position marks the begining of a number, e.g. 123 050-391212232
+ * 
+ * Return 0 if not a number otherwise return the position past this number. 
+ */
+function is_number($position)
+{
+        global $page;
+        $start = $position;
+        
+        while(is_digit($position) || $page[$position] == '-' || $page[$position] == '+')
+        {
+                $position++;
+        }
+        
+        if($position != $start && (is_white_space($position) || $page[$position] == '<'))
+        {
+                return $position;               
+        }
+        
+        return 0;
+}
 
 /*
@@ -622 +657 @@
                 return TRUE;
         }
-}
-
-/*
- * Skip within buffer past unreadable characters , i.e. white space
- * and characters considred to be a sentence breaker. Staring from the specified
- * position going either forward or backward.
- * param forward - indicate direction going either backward of forward.
- */
-function skip_unreadable_chars(&$index, $forward=TRUE)
-{
-        global $page, $pos;
-
-        if(!isset($index))
-        {
-                //use $pos as the default position if not specified otherwise
-                $index = &$pos;
-        }
-        $start = $index;
-
-        while($index < strlen($page) && $index > 0 &&
-        (is_white_space($index) || is_sentence_breaker($index)))
-        {
-                ($forward ? $index++ : $index--);
-        }
-
-        return $index;
 }
 
@@ -769 +778 @@
         $is_translated = FALSE;
 
-        if(!($is_edit_mode || get_option(ENABLE_AUTO_TRANSLATE,1)) || !in_array('body', $tags_list))
+        if(!($is_edit_mode || $enable_auto_translate) || !in_array('body', $tags_list))
         {
                 if($translated_text != NULL)

trunk/WordPress/plugin/transposh/transposh.php

@@ -281 +281 @@
 function insert_javascript_includes()
 {
-    global $plugin_url, $wp_query;
-
-    if (!($wp_query->query_vars[EDIT_PARAM] == "1" ||
-         $wp_query->query_vars[EDIT_PARAM] == "true") && !get_option(ENABLE_AUTO_TRANSLATE,1))
+    global $plugin_url, $wp_query, $lang, $home_url,  $enable_auto_translate;
+
+    $is_edit_param_enabled = ($wp_query->query_vars[EDIT_PARAM] == "1" ||
+                                                  $wp_query->query_vars[EDIT_PARAM] == "true");
+                                                   
+    if (!$is_edit_param_enabled && ! $enable_auto_translate)
     {
         //TODO: check permission later - for now just make sure we don't load the
@@ -294 +296 @@
     $overlib_dir = "$plugin_url/js/overlibmws";
 
-    if ($wp_query->query_vars[EDIT_PARAM] == "1" ||  $wp_query->query_vars[EDIT_PARAM] == "true") {
+    if($is_edit_param_enabled) 
+    {
         $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>";
@@ -302 +305 @@
         $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>";
-    $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';</script>";
-    if (get_option(ENABLE_AUTO_TRANSLATE,1)) {
+    
+    if($is_edit_param_enabled || $enable_auto_translate) 
+    {
+        $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>";
+    
+    
+        $post_url = $home_url . '/index.php';
+        $js .= "\n<script type=\"text/javascript\">var transposh_post_url='$post_url';var transposh_target_lang='$lang';</script>";
+    
         $js .= "\n<script type=\"text/javascript\">$(document).ready(function() {do_auto_translate();});</script>";
     }
-    echo $js;
+    
+    echo $js . "\n";
 }
 
@@ -383 +391 @@
 function init_global_vars()
 {
-    global $home_url, $home_url_quoted, $plugin_url, $table_name, $wpdb;
+    global $home_url, $home_url_quoted, $plugin_url, $table_name, $wpdb, $enable_auto_translate;
 
     $home_url = get_option('home');
@@ -393 +401 @@
 
     $table_name = $wpdb->prefix . TRANSLATIONS_TABLE;
+    $enable_auto_translate = get_option(ENABLE_AUTO_TRANSLATE,1);
 }
 
@@ -530 +539 @@
     logger(__METHOD__ . $_SERVER['REQUEST_URI']);
     init_global_vars();
-
-
+        
     if ($_POST['translation_posted'])
     {
@@ -766 +774 @@
 {
     global $admin_msg;
-    logger("Enter " . __METHOD__, 3);
+    logger("Enter " . __METHOD__, 4);
 
     $db_version = get_option(TRANSPOSH_DB_VERSION);