Changeset 628

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

Location:

trunk

Files:

• Modules/Translation/Form.php (modified) (2 diffs)
• includes/Version.php (modified) (1 diff)
• includes/global.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)

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 627; // Subversion revision
+$Revision = 628; // Subversion revision
 $DatabaseRevision = 610; // Database structure revision 
 $ReleaseTime = '2013-12-04';

trunk/includes/global.php

@@ -538 +538 @@
   foreach($TablesColumn as $Table => $Column) 
   {  
-    $sql = 'SELECT `ID`,`'.$Column.'` AS Orig, (SELECT `'.$Column.'` FROM `'.$Table.'` AS `T` WHERE '.
+    $sql = 'SELECT `ID`, (SELECT CONCAT(  \''.GetIDbyName($Table).'\' )) AS  `GoupId`,`'.$Column.'` AS Orig, (SELECT `'.$Column.'` FROM `'.$Table.'` AS `T` WHERE '.
       '(`O`.`Entry` = `T`.`Entry`) AND (`Language` <> '.$Config['OriginalLanguage'].') LIMIT 1) AS `Tran` FROM `'.$Table.'` AS `O` WHERE ';
     $groupby = ' GROUP BY `'.$Column.'` ';
-                                       // ORDER BY LENGTH('.$Column.') DESC
+    $orderby = ' ORDER BY LENGTH(Orig) DESC ';
 
     $where = '(`Language` = '.$Config['OriginalLanguage'].') ';
@@ -563 +563 @@
       $where .= ')';
     }
-      if ($SqlOK) {
-        $DbResult = $System->Database->query($sql.$where.$groupby.'  ORDER BY LENGTH(Orig) DESC');
+      if ($SqlOK) {                                                       
+        //$sql.$where.$groupby.$orderby
+//          $buff[] = array($Line['ID'], GetIDbyName($Table), $Line['Orig'], $Line['Tran']);
+        if ($sqlall <> '') { $sqlall .= ' UNION ALL ( '.$sql.$where.$groupby.' )';}
+        else {$sqlall .= ' ( '.$sql.$where.$groupby.' )'; }
+      }
+
+  }    
+        $DbResult = $System->Database->query($sqlall.$orderby);
     //  echo ($sql.'|'.$where.'|'.$groupby);
         while($Line = $DbResult->fetch_assoc()) 
         {
-          $buff[] = array($Line['ID'], GetIDbyName($Table), $Line['Orig'], $Line['Tran']);
+          $buff[] = array($Line['ID'], $Line['GoupId'], $Line['Orig'], $Line['Tran']);
         }
-      }
-
-   // if ($sqlall <> '') { $sqlall .= ' UNION ALL ( '.$sql.$where.$groupby.' )';}
-  //  else {$sqlall .= ' ( '.$sql.$where.$groupby.' )'; }
-  }
+   
     return $buff;
 }