Changeset 522

Timestamp:

08/27/2010 02:26:28 PM (18 months ago)

Author:

ofer

Message:

Provide a working gettext interface that blends with Transposh

Location:

trunk/WordPress/plugin/transposh

Files:

• core/parser.php (modified) (8 diffs)
• transposh.php (modified) (7 diffs)

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

@@ -270 +270 @@
         //·
         if (ord($char) == 194 && ord($nextchar) == 183) return 2;
-        return (strpos(',?()[]"!:|;', $char) !== false) ? 1 : 0; // TODO: might need to add < and > here
+        return (strpos(',?()[]"!:|;'.TP_GETTEXT_BREAKER.TP_GETTEXT_CLOSER.TP_GETTEXT_INNER_BREAKER.TP_GETTEXT_INNER_BREAKER_CLOSER, $char) !== false) ? 1 : 0; // TODO: might need to add < and > here
     }
 
@@ -288 +288 @@
     function tag_phrase($string, $start, $end) {
         $phrase = trim(substr($string, $start, $end - $start));
-        if ($this->in_get_text && !$this->in_get_text_inner) {
+//        $logstr = str_replace(array(chr(1),chr(2),chr(3),chr(4)), array('[1]','[2]','[3]','[4]'), $string);
+//        logger ("p:$phrase, s:$logstr, st:$start, en:$end, gt:{$this->in_get_text}, gti:{$this->in_get_text_inner}");
+//        logger ('');
+        if ($this->in_get_text > $this->in_get_text_inner) {
             logger('not tagging ' . $phrase . ' assumed gettext translated', 4);
             return;
@@ -343 +346 @@
                 $pos++;
                 $start = $pos;
-            } elseif ($string[$pos] == TP_GETTEXT_BREAKER) {
-                logger("text breaker $start $pos $string " . (($this->in_get_text) ? 'true' : 'false'), 5);
+            } elseif ($string[$pos] == TP_GTXT_BRK || $string[$pos] == TP_GTXT_BRK_CLOSER) {
+//                $logstr = str_replace(array(chr(1),chr(2),chr(3),chr(4)), array('[1]','[2]','[3]','[4]'), $string);
+//                $closers = ($string[$pos] == TP_GTXT_BRK) ? '': 'closer';
+//                logger(" $closers TEXT breaker $logstr start:$start pos:$pos gt:" . $this->in_get_text, 3);
                 $this->tag_phrase($string, $start, $pos);
+                ($string[$pos] == TP_GTXT_BRK) ? $this->in_get_text += 1: $this->in_get_text -= 1;
                 $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);
+                // reset state based on string start, no need to flip
+                //$this->in_get_text = ($pos == 1);
+                //if (!$this->in_get_text) $this->in_get_text_inner = false;
+            } elseif ($string[$pos] == TP_GTXT_IBRK || $string[$pos] == TP_GTXT_IBRK_CLOSER ) {
+//                $logstr = str_replace(array(chr(1),chr(2),chr(3),chr(4)), array('[1]','[2]','[3]','[4]'), $string);
+//                $closers = ($string[$pos] == TP_GTXT_IBRK) ? '': 'closer';
+//                logger("   $closers INNER text breaker $logstr start:$start pos:$pos gt:" . $this->in_get_text_inner, 3);
+                //logger("inner text breaker $start $pos $string " . (($this->in_get_text_inner) ? 'true' : 'false'), 5);
                 $this->tag_phrase($string, $start, $pos);
+                if ($this->in_get_text)
+                ($string[$pos] == TP_GTXT_IBRK) ? $this->in_get_text_inner += 1 : $this->in_get_text_inner -=1;
                 $pos++;
                 $start = $pos;
-                $this->in_get_text_inner = !$this->in_get_text_inner;
+                //$this->in_get_text_inner = !$this->in_get_text_inner;
             }
             // will break translation unit when there's a breaker ",.[]()..."
             elseif ($senb_len = $this->is_sentence_breaker($string[$pos], $string[$pos + 1], $string[$pos + 2])) {
+//                logger ("sentence breaker...");
                 $this->tag_phrase($string, $start, $pos);
                 $pos += $senb_len;
@@ -368 +379 @@
             // also prefixed by whitespace?
             elseif ($num_len = $this->is_number($string, $pos)) {
+//                logger ("numnum... $num_len");
                 // this is the case of B2 or B2,
                 if (($this->is_white_space($string[$pos - 1]) || ($start == $pos)
@@ -373 +385 @@
                         ($this->is_white_space($string[$pos + $num_len]) || $this->is_sentence_breaker($string[$pos + $num_len], $string[$pos + $num_len + 1], $string[$pos + $num_len + 2]))) {
                     // we will now compensate on the number followed by breaker case, if we need to
+//                            logger ("compensate part1?");
                     if (!($this->is_white_space($string[$pos - 1]) || ($start == $pos))) {
+//                            logger ("compensate part2?");
                         if ($this->is_sentence_breaker($string[$pos + $num_len - 1], $string[$pos + $num_len], $string[$pos + $num_len + 1])) {
+//                            logger ("compensate 3?");
                             $num_len--; //this makes the added number shorter by one, and the pos will be at a sentence breaker next so we don't have to compensate
                         }
@@ -381 +396 @@
                     }
                     $this->tag_phrase($string, $start, $pos);
-                    $start = $pos + $num_len + 1;
-                }
-                $pos += $num_len + 1;
+                    $start = $pos + $num_len /*+1*/;
+                }
+                $pos += $num_len/* + 1*/;
+//                logger ("numnumpos... $pos");
             } else {
                 // smarter marking of start location
@@ -557 +573 @@
         $this->html = str_get_html($string);
         // mark translateable elements
+        $this->html->find('html', 0)->lang = ''; // Document defined lang may be preset to correct lang, but should be ignored TODO: Better?
         $this->translate_tagging($this->html->root);
 
@@ -758 +775 @@
 
         // 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);
+        return str_replace(array(TP_GTXT_BRK, TP_GTXT_IBRK, TP_GTXT_BRK_CLOSER, TP_GTXT_IBRK_CLOSER), '', $this->html->outertext);
         // Changed because of places where tostring failed
         //return $this->html;

trunk/WordPress/plugin/transposh/transposh.php

@@ -60 +60 @@
     /** @var transposh_3rdparty Happens after editing */
     private $third_party;
-
     // list of properties
     /** @var string The site url */
@@ -72 +71 @@
     /** @var boolean Enable rewriting of URLs */
     public $enable_permalinks_rewrite;
-    /** @var string The language to translate the page to */
+    /** @var string The language to translate the page to, from params */
     public $target_language;
+    /** @var string The language extracted from the url */
+    public $tgl;
     /** @var boolean Are we currently editing the page? */
     public $edit_mode;
@@ -139 +140 @@
 //        add_action('admin_menu', array(&$this, 'transposh_post_language'));
 //        add_action('save_post', array(&$this, 'transposh_save_post_language'));
-
         //TODO add_action('manage_comments_nav', array(&$this,'manage_comments_nav'));
         //TODO comment_row_actions (filter)
-        // toying around the mo/po stuff
-        add_filter('gettext', array(&$this, 'transposh_gettext_filter'), 10, 3);
+        // Intergrating with the gettext interface
+        add_filter('gettext', array(&$this, 'transposh_gettext_filter'), 10, 2);
+        add_filter('gettext_with_context', array(&$this, 'transposh_gettext_filter'), 10, 2);
+        add_filter('ngettext', array(&$this, 'transposh_ngettext_filter'), 10, 3);
+        add_filter('ngettext_with_context', array(&$this, 'transposh_ngettext_filter'), 10, 3);
         add_filter('locale', array(&$this, 'transposh_locale_filter'));
 
+        //CHECK TODO!!!!!!!!!!!!
+        $this->tgl = transposh_utils::get_language_from_url($_SERVER['REQUEST_URI'], $this->home_url);
 
         register_activation_hook(__FILE__, array(&$this, 'plugin_activate'));
@@ -244 +249 @@
      */
     function on_shutdown() {
-        ob_flush();
+        //TODO !!!!!!!!!!!! ob_flush();
     }
 
@@ -321 +326 @@
 
         // first we get the target language
-        $this->target_language = $wp->query_vars[LANG_PARAM];
-        if (!$this->target_language)
-                $this->target_language = $this->options->get_default_language();
+        /*        $this->target_language = (isset($wp->query_vars[LANG_PARAM])) ? $wp->query_vars[LANG_PARAM] : '';
+          if (!$this->target_language)
+          $this->target_language = $this->options->get_default_language();
+          logger("requested language: {$this->target_language}"); */
+        // TODO TOCHECK!!!!!!!!!!!!!!!!!!!!!!!!!!1
+        $this->target_language = $this->tgl;
         logger("requested language: {$this->target_language}");
+
 
         // make themes that support rtl - go rtl http://wordpress.tv/2010/05/01/yoav-farhi-right-to-left-themes-sf10
@@ -676 +685 @@
             $n = !empty($q['exact']) ? '' : '%';
             $searchand = '';
+            $search = '';
             foreach ((array) $q['search_terms'] as $term) {
                 // now we'll get possible translations for this term
@@ -820 +830 @@
     }
 
-    function transposh_gettext_filter($a, $orig, $domain) {
-        //logger("$a $orig $domain");
-        return $a;
+    /**
+     * This function adds our markings around gettext results
+     * @param string $translation
+     * @param string $orig
+     * @return string
+     */
+    function transposh_gettext_filter($translation, $orig) {
+        if ($this->is_special_page($_SERVER['REQUEST_URI']) || ($this->options->is_default_language($this->tgl) && !$this->options->get_enable_default_translate())) {
+            logger($translation);
+            return $translation;
+        }
+        if ($translation != $orig) {
+            $translation = TP_GTXT_BRK . $translation . TP_GTXT_BRK_CLOSER;
+        }
+        $translation = str_replace(array('%s', '%1$s', '%2$s', '%3$s', '%4$s', '%5$s'), array(TP_GTXT_IBRK . '%s' . TP_GTXT_IBRK_CLOSER, TP_GTXT_IBRK . '%1$s' . TP_GTXT_IBRK_CLOSER, TP_GTXT_IBRK . '%2$s' . TP_GTXT_IBRK_CLOSER, TP_GTXT_IBRK . '%3$s' . TP_GTXT_IBRK_CLOSER, TP_GTXT_IBRK . '%4$s' . TP_GTXT_IBRK_CLOSER, TP_GTXT_IBRK . '%5$s' . TP_GTXT_IBRK_CLOSER), $translation);
+        return $translation;
+    }
+
+    /**
+     * This function adds our markings around ngettext results
+     * @param string $translation
+     * @param string $single
+     * @param string $plural
+     * @return string
+     */
+    function transposh_ngettext_filter($translation, $single, $plural) {
+        if ($this->is_special_page($_SERVER['REQUEST_URI']) || ($this->options->is_default_language($this->tgl) && !$this->options->get_enable_default_translate()))
+                return $translation;
+        if ($translation != $single && $translation != $plural) {
+            $translation = TP_GTXT_BRK . $translation . TP_GTXT_BRK_CLOSER;
+        }
+        $translation = str_replace(array('%s', '%1$s', '%2$s', '%3$s', '%4$s', '%5$s'), array(TP_GTXT_IBRK . '%s' . TP_GTXT_IBRK_CLOSER, TP_GTXT_IBRK . '%1$s' . TP_GTXT_IBRK_CLOSER, TP_GTXT_IBRK . '%2$s' . TP_GTXT_IBRK_CLOSER, TP_GTXT_IBRK . '%3$s' . TP_GTXT_IBRK_CLOSER, TP_GTXT_IBRK . '%4$s' . TP_GTXT_IBRK_CLOSER, TP_GTXT_IBRK . '%5$s' . TP_GTXT_IBRK_CLOSER), $translation);
+        return $translation;
     }
 
     function transposh_locale_filter($locale) {
-        //logger($locale);
+        $lang = transposh_utils::get_language_from_url($_SERVER['REQUEST_URI'], $this->home_url);
+        if (!$lang) return $locale;
+        list ($l, $n, $f, $locale) = explode(',', transposh_consts::$languages[$lang]);
+        if ($locale) {
+            return $locale;
+        } else {
+            return $lang;
+        }
         return $locale;
     }