Changeset 743 for trunk/Modules/Translation

Timestamp:

Jan 9, 2014, 2:44:51 PM (11 years ago)

Author:

maron

Message:

• Modify: Progress.php like all list task
• Modify: Search in form for same text

Location:

trunk/Modules/Translation

Files:

• Form.php (modified) (2 diffs)
• LoadNames.php (modified) (2 diffs)
• Progress.php (modified) (1 diff)

trunk/Modules/Translation/Form.php

@@ -49 +49 @@
           foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
             $Columns .= ' `Orig`.`'.$TextItem['Column'].'` as `Orig_'.$TextItem['Column'].'`, `Tran`.`'.$TextItem['Column'].'` as `'.$TextItem['Column'].'`,';
+
+
+            //search for same text with other entry
+                                          foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
+                                                  if($TextItem['Visible'] == 1)
+                                                  if (($LineAJ[$TextItem['Column']] <> '') and 
+                    ($LineAJ[$TextItem['Column']] == $Line[$TextItem['Column']]) and
+                    (strlen($LineAJ[$TextItem['Column']]) < 20)
+                   )
+                 {       
+                                $sql = 'SELECT '.$Columns.' Tran.`Entry` FROM `'.$Table.'` as Tran';
+                    $join = ' JOIN `'.$Table.'` as `Orig` ON `Orig`.`Language` = 0 AND `Tran`.`Entry` = `Orig`.`Entry` AND `Tran`.`VersionEnd` = `Orig`.`VersionEnd` ';
+                    $where = ' WHERE '.'( `Tran`.'.$Language.' ) AND '.' `Orig`.`'.$TextItem['Column'].'` = "'.$LineAJ[$TextItem['Column']].'" ORDER BY `Tran`.`ModifyTime` DESC LIMIT 1';
+                    $DbResult = $this->Database->query($sql.$join.$where);
+                    while ($LineSearch = $DbResult->fetch_assoc()) {
+                      $Line[$TextItem['Column']] = $LineSearch[$TextItem['Column']];
+                    }
+                 }      
           
                                 $sql = 'SELECT '.$Columns.' Tran.`Entry` FROM `'.$Table.'` as Tran';
@@ -68 +86 @@
           }
           
+                    
         } else {
                                 $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE '.

trunk/Modules/Translation/LoadNames.php

@@ -58 +58 @@
 
 
-  //todo:haveto load
   $Text = '';
         function LoadNames() {
@@ -78 +77 @@
                                         } else {
                                         if(($GroupId == 13)) {
-                                                $names = GetTranslatNames($Text, 0, array('Dictionary' => 'Text', 'TextGlobalString' => 'Text', 'TextArea' => 'Name', 'TextCharacterClass' => 'Name','TextCharacterRace' => 'Name1',),false);
+                                                $names = GetTranslatNames($Text, 0, array('Dictionary' => 'Text', 'TextGlobalString' => 'Text', 'TextArea' => 'Name', 'TextItemSublass' => 'Name', 'TextCharacterRace' => 'Name1',),false);
             } else {
-                                                $names = GetTranslatNames($Text, 0, array('Dictionary' => 'Text'));
+                                                $names = GetTranslatNames($Text, 0, GetTranslatNamesArray());
                                         }
                                         }

trunk/Modules/Translation/Progress.php

@@ -112 +112 @@
 $Output .= $this->ShowStatTable();
 
-$Output .= '<div>Počet stáhnutí přeložených textů v SQL souboru: <strong>';    
-$ID = $this->Database->query('SELECT count(distinct(`IP`)) FROM `Log` WHERE `Type` = 2');
-$Line = $ID->fetch_row();
-$Output .= $Line[0];
-$Output .= '</strong></div>';
-                
-$Output .= '<div>Počet stáhnutí: <strong>';      
-$ID = $this->Database->query('SELECT count(distinct(`IP`)) FROM `Log` WHERE `Type` = 0');
-$Line = $ID->fetch_row();
-$Output .= $Line[0];
-$Output .= '</strong></div>';
     return($Output);
   }