Changeset 604

Timestamp:

01/26/2011 07:15:19 PM (16 months ago)

Author:

ofer

Message:

Fix for links (such as more) which are wrapped inside translated posts or comments, reduce some logging

Location:

trunk/WordPress/plugin/transposh

Files:

• core/parser.php (modified) (4 diffs)
• transposh.php (modified) (4 diffs)
• wp/transposh_db.php (modified) (1 diff)

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

@@ -674 +674 @@
             if ($this->split_url_func != null) {
                 foreach ($this->atags as $e) {
-                    logger($e->href);
                     foreach (call_user_func_array($this->split_url_func, array($e->href)) as $part) {
                         $originals[$part] = true;
@@ -680 +679 @@
                 }
                 foreach ($this->otags as $e) {
-                    logger($e->value);
                     foreach (call_user_func_array($this->split_url_func, array($e->value)) as $part) {
                         $originals[$part] = true;
@@ -691 +689 @@
         // fix urls...
         foreach ($this->atags as $e) {
-            logger($e->href);
             $e->href = call_user_func_array($this->url_rewrite_func, array($e->href));
         }
         foreach ($this->otags as $e) {
-            logger($e->value);
             $e->value = call_user_func_array($this->url_rewrite_func, array($e->value));
         }
@@ -735 +731 @@
 
             // this adds saved spans to the first not in select element which is in the body
-            if (!$ep->inselect && $savedspan && $ep->inbody) {
+            if (!$ep->inselect && $savedspan && $ep->inbody) { // (TODO: might not be...?)
                 $e->outertext = $savedspan . $e->outertext;
                 $savedspan = '';

trunk/WordPress/plugin/transposh/transposh.php

@@ -760 +760 @@
         // Ignore urls not from this site
         if (!transposh_utils::is_rewriteable_url($href, $this->home_url)) {
-            logger($href);
             return $ret;
         }
@@ -789 +788 @@
             }
         }
-        logger($ret);
         return $ret;
     }
@@ -958 +956 @@
         if ($comment_lang) {
             $text = "<span lang =\"$comment_lang\">" . $text . "</span>";
+            if (strpos($text, '<a href="' . $this->home_url) !== FALSE) {
+                $text = str_replace('<a href="' . $this->home_url, '<a lang="' . $this->options->get_default_language() . '" href="' . $this->home_url, $text);
+            }
         }
         logger("$comment_lang " . get_comment_ID(), 4);
@@ -974 +975 @@
         if ($lang) {
             $text = "<span lang =\"$lang\">" . $text . "</span>";
+            if (strpos($text, '<a href="' . $this->home_url) !== FALSE) {
+                $text = str_replace('<a href="' . $this->home_url, '<a lang="' . $this->options->get_default_language() . '" href="' . $this->home_url, $text);
+            }
         }
         return $text;

trunk/WordPress/plugin/transposh/wp/transposh_db.php

@@ -197 +197 @@
         if (isset($this->translations[$original])) {
             $translated = $this->translations[$original];
-            logger("prefetch result for $original >>> {$this->translations[$original][0]} ({$this->translations[$original][1]})", 3);
+            logger("prefetch result for $original >>> {$this->translations[$original][0]} ({$this->translations[$original][1]})", 4);
         } else {
             // make sure $lang is reasonable, unless someone is messing with us, it will be ok