Changeset 614 for trunk/Modules/Translation

Timestamp:

Nov 28, 2013, 6:24:17 PM (11 years ago)

Author:

maron

Message:

• Fixed: Double colorization
• Optimalization: Faster SQL query for search translated names

File:

• trunk/Modules/Translation/Form.php (modified) (1 diff)

trunk/Modules/Translation/Form.php

@@ -3 +3 @@
 class PageTranslationForm extends Page
 {
+  function ReplaceTranslated($orig,$tran,$Text,$ID,$Group) {
+         $tran_replace = str_replace(' ',' ',$tran);
+         $orig_replace = str_replace(' ',' ',$orig);
+                                  $Text = str_replace(' '.$orig,' <span Title="Přelož jako: '.$tran_replace.'" class="edit"><a class="edit" target="_NEW2" href="'.$this->System->Link('/form.php?group='.$Group.'&amp;ID='.$ID).'">'.$orig_replace.'</a></span>',$Text);
+                                 return ($Text);
+  }
+  function ReplaceNotTranslated($orig,$tran,$Text,$ID,$Group) {
+         $orig_replace = str_replace(' ','&nbsp;',$orig);
+                                 $Text = str_replace($orig,' <span title="Kliknutím přeložíš" class="needtran"><a class="needtran" target="_NEW2" href="'.$this->System->Link('/form.php?group='.$Group.'&amp;ID='.$ID).'">'.$orig_replace.'</a></span>',$Text);
+                                 return ($Text);
+  }
+  
         function ColorNames($Text, $names)
         {
-                // $buff[] = array($Line['ID'],GetIDbyName($Table),$Line[$Column],$Line['Tran']);
+    $Text = ' '.$Text;
                 foreach($names as $Line) {
                         if ($Line[3] <> '') {
-                          if (strpos($Text, '>'.$Line[2]) == 0)
-                                  $Text = str_replace($Line[2],'<span Title="Přelož jako: '.$Line[3].'" class="edit"><a class="edit" target="_NEW2" href="'.$this->System->Link('/form.php?group='.$Line[1].'&amp;ID='.$Line[0]).'">'.$Line[2].'</a></span>',$Text);
-                                if (strpos($Text, '>'.$Line[2]) == 0)
-          $Text = str_replace(strtolower($Line[2]),'<span Title="Překládej jako: '.$Line[3].'" class="edit"><a class="edit" target="_NEW2" href="'.$this->System->Link('/form.php?group='.$Line[1].'&amp;ID='.$Line[0]).'">'.$Line[2].'</a></span>',$Text);
+        $Text = $this->ReplaceTranslated($Line[2],$Line[3],$Text,$Line[0],$Line[1]);
+        
                         } else {
-                          if (strpos($Text, '>'.$Line[2]) == 0)
-                                $Text = str_replace($Line[2],'<span title="Kliknutím přeložíš" class="needtran"><a class="needtran" target="_NEW2" href="'.$this->System->Link('/form.php?group='.$Line[1].'&amp;ID='.$Line[0]).'">'.$Line[2].'</a></span>',$Text);
-                                if (strpos($Text, '>'.$Line[2]) == 0)
-          $Text = str_replace(strtolower($Line[2]),'<span title="Kliknutím přeložíš" class="needtran"><a class="needtran" target="_NEW2" href="'.$this->System->Link('/form.php?group='.$Line[1].'&amp;ID='.$Line[0]).'">'.$Line[2].'</a></span>',$Text);
+        $Text = $this->ReplaceNotTranslated($Line[2],$Line[3],$Text,$Line[0],$Line[1]);
                         }
                 }