Changeset 655

Timestamp:

Dec 16, 2013, 11:42:02 AM (11 years ago)

Author:

maron

Message:

• Fixed: load suggestions text only if is translated

Location:

trunk

Files:

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

trunk/Modules/Translation/Form.php

@@ -88 +88 @@
                           if ($this->System->Config['OriginalLanguage'] == $Line['Language']){
           $LineAJ = $Line;
-                                $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE '.
-                                        '(`Language` != '.$this->System->Config['OriginalLanguage'].') AND '.
-                                        '(`Entry` = '.$Line['Entry'].') ORDER BY `ModifyTime` DESC LIMIT 1');
-                                $LineSearch = $DbResult->fetch_assoc();
-                                        foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
-                                                if($TextItem['Visible'] == 1)
-                                                if (($LineAJ[$TextItem['Column']] <> '') and ($LineSearch[$TextItem['Column']] <> '')) $Line[$TextItem['Column']] = $LineSearch[$TextItem['Column']];
-
+          
+          if ($this->System->User->Language <> '') $Language = '`Language` = '.$this->System->User->Language;
+          else $Language = '`Language` != '.$this->System->Config['OriginalLanguage'];
+          $Columns = '';
+          foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
+            $Columns .= ' `Orig`.`'.$TextItem['Column'].'` as `Orig_'.$TextItem['Column'].'`, `Tran`.`'.$TextItem['Column'].'` as `'.$TextItem['Column'].'`,';
+          
+                                $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 '.'(`Tran`.`Entry` = '.$Line['Entry'].') ORDER BY `Tran`.`ModifyTime` DESC';
+                                $DbResult = $this->Database->query($sql.$join.$where);
+          while ($LineSearch = $DbResult->fetch_assoc()) {
+                                          foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
+                                                  if($TextItem['Visible'] == 1)
+                                                  if (($LineAJ[$TextItem['Column']] <> '') and 
+                    ($LineSearch[$TextItem['Column']] <> '') and
+                    ($LineSearch['Orig_'.$TextItem['Column']] <> $LineSearch[$TextItem['Column']]) and
+                    ($LineAJ[$TextItem['Column']] == $Line[$TextItem['Column']])
+                   )
+                 {
+                   $Line[$TextItem['Column']] = $LineSearch[$TextItem['Column']];
+                                                  //   echo $Line[$TextItem['Column']].'<br />';
+                 }      
+          }
+          
         } else {
                                 $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE '.

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 654; // Subversion revision
+$Revision = 655; // Subversion revision
 $DatabaseRevision = 646; // Database structure revision 
-$ReleaseTime = '2013-12-14';
+$ReleaseTime = '2013-12-16';