Changeset 813 for trunk/Modules/Translation/Form.php

Timestamp:

Jun 3, 2014, 9:40:12 PM (10 years ago)

Author:

chronos

Message:

• Fixed: There was wrong language displayed for translation items.

File:

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

trunk/Modules/Translation/Form.php

@@ -11 +11 @@
                 $Action = '';
     if(array_key_exists('action', $_GET)) $Action = $_GET['action'];
-                
+
     if($Action == 'delete') $Output = $this->Delete();
                   else $Output = $this->ShowForm();
                 return($Output);
         }
-        
+
         function ShowForm()
         {
                 global $TranslationTree;
-                
+
                 $Output = '';
-        
+
                 $GroupId = LoadGroupIdParameter();
                 $this->GroupId = $GroupId;
@@ -28 +28 @@
                 if(array_key_exists('action', $_GET)) $Action = $_GET['action'];
                 else $Action = '';
-        
+
                 if(array_key_exists('ID', $_GET))
                 {
                         $TextID = $_GET['ID'] * 1;
                   $this->ID = $TextID;
-        
+
                         $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE `ID` = '.$TextID);
                         $Line = $DbResult->fetch_assoc();
@@ -40 +40 @@
                                 $Output .= ShowMessage('Překlad nenalezen.', MESSAGE_CRITICAL);
                         } else
-                        {       
+                        {
                           if ($this->System->Config['OriginalLanguage'] == $Line['Language']){
           $LineAJ = $Line;
-          
+
           if ($this->System->User->Language <> '') $Language = '`Language` = '.$this->System->User->Language;
           else $Language = '`Language` != '.$this->System->Config['OriginalLanguage'];
@@ -49 +49 @@
           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` ';
@@ -58 +58 @@
                                           foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
                                                   if($TextItem['Visible'] == 1)
-                                                  if (($LineAJ[$TextItem['Column']] <> '') and 
+                                                  if (($LineAJ[$TextItem['Column']] <> '') and
                     ($LineSearch[$TextItem['Column']] <> '') and
                     ($LineSearch['Orig_'.$TextItem['Column']] <> $LineSearch[$TextItem['Column']]) and
@@ -66 +66 @@
                    $Line[$TextItem['Column']] = $LineSearch[$TextItem['Column']];
                                                   //   echo $Line[$TextItem['Column']].'<br />';
-                 }      
+                 }
           }
-                    
+
         } else {
                                 $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE '.
@@ -80 +80 @@
                                 } else
                                 {
-        
+
                                         if($Line['User'] != '')
                                         {
@@ -87 +87 @@
                                         } else
                                                 $LineUser = array('Name' => '');
-        
+
                                         $Output .= 'Skupina: <strong>'.$TranslationTree[$GroupId]['Name'].'</strong><br />';
-        
+
                                         if(($Line['Language'] <> 0) and ($LineUser['Name'] <> ''))
                                                 $Output .= 'Přeložil: <strong>'.$LineUser['Name'].'</strong> dne '.HumanDate($Line['ModifyTime']).'<br />';
@@ -97 +97 @@
                                                 $Language = $DbResult->fetch_assoc();
                                                 // echo $Language['Language'].'  '.$Line['Take'];
-        
+
                                                 $DbResult = $this->Database->query('SELECT `Name` FROM `Language` WHERE `Id` ='.$Language['Language']);
                                                 $Lang = $DbResult->fetch_assoc();
-        
+
                                                 $Output .= 'Původní text: <strong>'.
                                                         ' ID <a href="form.php?group='.$GroupId.'&amp;ID='.$Line['Take'].'">'.$Line['Take'].'</a></strong>'.
@@ -112 +112 @@
                                                 else $Output .= ' <b> Uložen v rozepsaných</b> ';
                                         } else $Output .= ' <b>Anglická, původní verze</b> ';
-        
+
                                         $Output .= '<br />'.
                                                 'Verze: <b><a href="'.$this->System->Link('/client-version/?action=item&amp;id='.GetVersionWOWId($Line['VersionStart'])).'">'.GetVersionWOW($Line['VersionStart']).
             '</a> - <a href="'.$this->System->Link('/client-version/?action=item&amp;id='.GetVersionWOWId($Line['VersionEnd'])).'">'.GetVersionWOW($Line['VersionEnd']).'</a></b>'.
                                                 '<br />';
-                                         
+
                                         $DbResult = $this->Database->query('SELECT COUNT(*) FROM `'.$Table.'` WHERE '.
                                                 '(`Entry` = '.$Line['Entry'].')');
@@ -129 +129 @@
                                                 <input type="hidden" name="entry" value="'.$Line['Entry'].'" />
                                                 <input type="hidden" name="ID2" value="'.$TextID.'" />';
-                                                
+
             if($this->System->User->Licence(LICENCE_USER)) { //allow to compare only to user
               $Output .= '<select onchange="this.form.submit();" name="ID1">
@@ -155 +155 @@
                                                   $Line['Entry'].'&amp;text=">Počet verzí: <strong>'.$Version.'</strong></a>';
                                         }
-        
-                                        // Special characters: $B - New line, $N - Name, $C - profession                                        
+
+                                        // Special characters: $B - New line, $N - Name, $C - profession
                                         if($this->System->User->Licence(LICENCE_USER))
                                         {
@@ -168 +168 @@
                                                 FollowingTran($TextID, $Table, $GroupId);
                                         }
-        
+
                                         if($TranslationTree[$GroupId]['WowheadName'] != '')
                                                 $WowheadLink = '<a href="http://www.wowhead.com/?'.$TranslationTree[$GroupId]['WowheadName'].'='.$LineAJ['Entry'].'">'.$LineAJ['Entry'].'</a>';
                                         else $WowheadLink = $LineAJ['Entry'];
-        
+
                                         $Output .= '<input type="hidden" name="entry" value="'.$LineAJ['Entry'].'" />
                                         <input type="hidden" name="user" value="'.$this->System->User->Id.'" />
@@ -192 +192 @@
                                         } else $Language = 0;
                                         if($this->System->User->Licence(LICENCE_USER)) $Output .= WriteLanguages($Language);
-                                          else {                                        
-                  $DbResult3 = $this->Database->select('Language', '`Id`, `Name`', '`Enabled` = 1');
-                  if($DbResult3->num_rows > 0) 
-                  { 
+                                          else {
+                  $DbResult3 = $this->Database->select('Language', '`Id`, `Name`', '(`Enabled` = 1) AND (`Id`='.$Language.')');
+                  if($DbResult3->num_rows > 0)
+                  {
                         $Language = $DbResult3->fetch_assoc();
                         $Output .= $Language['Name'];
                   }
                                           }
-                                        
+
                                         $Output .= '</td></tr>';
-        
+
           //todo javascript
-        
+
             $Output .= '<script src="http://code.jquery.com/jquery-latest.js"></script>'.
                '<script>';
@@ -210 +210 @@
                                         foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
             $Output .=   '$("#'.$TextItem['Column'].'").load("'.$this->System->Link('/LoadNames.php?ID='.$LineAJ['ID'].'&Column='.$TextItem['Column'].'&GroupId='.$GroupId).'");';
-          
+
           $Output .= '});'.
                '</script>';
@@ -224 +224 @@
                                                                 $Output .= '<td id="'.$TextItem['Column'].'">'.str_replace("\n", '<br/>', htmlspecialchars($LineAJ[$TextItem['Column']])).'</td>
                                                                 <td>';
-                                                                if($this->System->User->Licence(LICENCE_USER)) 
+                                                                if($this->System->User->Licence(LICENCE_USER))
                                                                         $Output .= '<textarea rows="8" cols="40" onkeydown="ResizeTextArea(this)" class="textedit" id="'.$TextItem['Column'].'" name="'.$TextItem['Column'].'">';
                                                                 $Output .=  htmlspecialchars($Line[$TextItem['Column']]);
@@ -236 +236 @@
                                                 if($this->System->User->Licence(LICENCE_USER)) {
               $Output .= '</form>';
-              
+
               $Output .= '<table class="BaseTable">'.
                                             '<tr><th>Překladač:</th><th>Nepřeložené</th><th>Přeložené</th>';
@@ -243 +243 @@
                                                   if ($LineAJ[$TextItem['Column']] <> '')
                     $Output .= '<tr><td>'.$TextItem['Column'].'</td><td>'.$LineAJ[$TextItem['Column']].'</td><td>'.GetTranslateGoogle($LineAJ[$TextItem['Column']]).'</td></tr>';
-             
-             
+
+
               $Output .= '</table>';
             }
@@ -256 +256 @@
         {
                 global $TranslationTree;
-                
+
                 if($this->System->User->Licence(LICENCE_MODERATOR))
                 {
@@ -268 +268 @@
                 } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
                 return($Output);
-        }       
+        }
 }