Changeset 522 for trunk/WordPress/plugin/transposh/transposh.php

Timestamp:

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

Author:

ofer

Message:

Provide a working gettext interface that blends with Transposh

File:

• trunk/WordPress/plugin/transposh/transposh.php (modified) (7 diffs)

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;
     }