Changeset 628 for trunk/Modules/Translation

Timestamp:

Dec 6, 2013, 7:07:56 PM (11 years ago)

Author:

maron

Message:

• Fixed: Longest name first
• Fixed: Search names in every translate group

File:

• trunk/Modules/Translation/Form.php (modified) (2 diffs)

trunk/Modules/Translation/Form.php

@@ -6 +6 @@
          $tran_replace = str_replace(' ',' ',$tran);
          $orig_replace = str_replace(' ',' ',$orig);
-                                  $Text = str_replace(' '.$orig,' <span Title="Přelož jako:&nbsp;'.$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);
+
+         if (strlen($orig) < strlen($Text)-1)
+                                  $Text = str_replace(' '.$orig,' <span Title="Přelož jako:&nbsp;'.$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);
+         
+//         echo $orig.'-'.$Text.'<br>';
+         if (strlen($orig) < strlen($Text)-1)
+                                 $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);
   }
@@ -194 +199 @@
                                                 $Text = $Text.' '.$LineAJ[$TextItem['Column']];
         
-                                        if(($GroupId < 4) or ($GroupId == 10) or ($GroupId == 11)) {
+                        //              if(($GroupId < 4) or ($GroupId == 10) or ($GroupId == 11)) {
                                                 //<span class="edit">barvou.</span>
                                                 $names = GetTranslatNames($Text, 0, GetTranslatNamesArray());
-                                        } else {
-                                                $names = GetTranslatNames($Text, 0, array('Dictionary' => 'Text'));
-                                        }
+                //                      } else {
+                        //                      $names = GetTranslatNames($Text, 0, array('Dictionary' => 'Text'));
+                        //              }
         
                                         foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)