Changeset 518

Timestamp:

08/26/2010 01:50:50 AM (18 months ago)

Author:

ofer

Message:

Parser support for inner text markings, # and * are now handled as numbers

Location:

trunk/WordPress/plugin/transposh/core

Files:

• constants.php (modified) (1 diff)
• parser.php (modified) (8 diffs)

trunk/WordPress/plugin/transposh/core/constants.php

@@ -27 +27 @@
 define('NO_TRANSLATE_CLASS_GOOGLE', 'notranslate');
 define('ONLY_THISLANGUAGE_CLASS', 'only_thislanguage');
+
+//Get text breakers
+define('TP_GETTEXT_BREAKER', chr(1));
+define('TP_GETTEXT_INNER_BREAKER', chr(2));
 
 /**

trunk/WordPress/plugin/transposh/core/parser.php

@@ -114 +114 @@
     /** @var parserstats Contains parsing statistics */
     private $stats;
+    /** @var boolean Are we inside a translated gettext */
+    private $in_get_text = false;
+    /** @var boolean Are we inside an inner text %s in gettext */
+    private $in_get_text_inner = false;
 
     /**
@@ -274 +278 @@
      */
     function is_number($page, $position) {
-        return strspn($page, '0123456789-+$%,.\\/', $position);
+        return strspn($page, '0123456789-+$%#*,.\\/', $position);
     }
 
@@ -282 +286 @@
      * @param int $end - end of phrase in element
      */
-    function tag_phrase($string, $start, $end, $gettext = false) {
+    function tag_phrase($string, $start, $end) {
         $phrase = trim(substr($string, $start, $end - $start));
+        if ($this->in_get_text && !$this->in_get_text_inner) {
+            logger('not tagging ' . $phrase . ' assumed gettext translated', 4);
+            return;
+        }
         if ($phrase) {
             logger($phrase, 4);
@@ -296 +304 @@
             if ($this->inbody) $node->inbody = $this->inbody;
             if ($this->inselect) $node->inselect = true;
-            if ($gettext) {
-                $node->phrase = substr(substr($phrase, 11), 0, -11);
-                $node->gettext = true;
-            }
         }
     }
@@ -325 +329 @@
                 $entity = substr($string, $pos, $len_of_entity);
                 if (($this->is_white_space($string[$pos + $len_of_entity]) || $this->is_entity_breaker($entity)) && !$this->is_entity_letter($entity)) {
-                    logger("entity ($entity) breaks", 5);
+                    logger("entity ($entity) breaks", 3);
                     $this->tag_phrase($string, $start, $pos);
                     $start = $pos + $len_of_entity;
-                }
-                //goaway entity
-                if ($entity == '&transposh;') {
-                    $closerent = strpos($string, $entity, $start);
-                    if ($closerent !== false) {
-                    $start = $pos;
-                    $this->tag_phrase($string, $start, $closerent + $len_of_entity, true); //special tagging?
-                    $start = $closerent + $len_of_entity;
-                    $pos = $closerent;
-                    logger("Process of transposh entity $pos $string $closerent");
-                    }
                 }
                 //skip past entity
@@ -350 +343 @@
                 $pos++;
                 $start = $pos;
+            } elseif ($string[$pos] == TP_GETTEXT_BREAKER) {
+                logger("text breaker $start $pos $string " . (($this->in_get_text) ? 'true' : 'false'), 5);
+                $this->tag_phrase($string, $start, $pos);
+                $pos++;
+                $start = $pos;
+                $this->in_get_text = !$this->in_get_text; // flipping state
+                if ($pos == 1)
+                        $this->in_get_text = true; // reset state based on string start
+ $this->in_get_text_inner = false;
+            } elseif ($string[$pos] == TP_GETTEXT_INNER_BREAKER) {
+                logger("inner text breaker $start $pos $string " . (($this->in_get_text_inner) ? 'true' : 'false'), 5);
+                $this->tag_phrase($string, $start, $pos);
+                $pos++;
+                $start = $pos;
+                $this->in_get_text_inner = !$this->in_get_text_inner;
             }
             // will break translation unit when there's a breaker ",.[]()..."
@@ -749 +757 @@
                 $head->lastChild()->outertext .= "\n<meta name=\"translation-stats\" content='" . json_encode($this->stats) . "'/>";
 
+        // we make sure that the result is clear from our shananigans
+        return str_replace(array(TP_GETTEXT_BREAKER, TP_GETTEXT_INNER_BREAKER), '', $this->html->outertext);
         // Changed because of places where tostring failed
         //return $this->html;
-        return $this->html->outertext;
+        //return $this->html->outertext;
     }
 
@@ -775 +785 @@
 
 }
+
 ?>