Changeset 525 for trunk/includes

Timestamp:

Feb 20, 2013, 11:30:49 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: Zobrazení porovnání překladů.
• Opraveno: Zobrazení stavu dokončení pro všechny překlady.
• Přidáno: V seznamu překladů přidán sloupec Jazyk.
• Opraveno: Místa, kde s pevným indexem anglického originálu upravena na nastavitelný.

Location:

trunk/includes

Files:

• Database.php (modified) (1 diff)
• Page.php (modified) (1 diff)
• Version.php (modified) (1 diff)
• global.php (modified) (4 diffs)

trunk/includes/Database.php

@@ -66 +66 @@
       $this->Error = $this->Error[2];
       if(($this->Error != '') and ($this->ShowSQLError == true)) 
+      {
         echo('<div><strong>SQL Error: </strong>'.$this->Error.'<br />'.$Query.'</div>');
+        echo(debug_backtrace());
+      }
     }
     $this->insert_id = $this->PDO->lastInsertId();

trunk/includes/Page.php

@@ -195 +195 @@
   $Output .= ShowSearchBox();
   $Output .= '</td><td id="border-left"></td><td class="content">';
-  if(isset($Message)) $Output .= ShowMessage($Message, $MessageType);
   return($Output);
 }

trunk/includes/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 524; // Subversion revision
+$Revision = 525; // Subversion revision
 $DatabaseRevision = 524; 
 $ReleaseTime = '2013-02-20';

trunk/includes/global.php

@@ -328 +328 @@
 }
 
-function WriteLanguagesWithoutSel($Selected)
-{
-  global $LanguageList;
-  
-  $Output = '';
-  foreach($LanguageList as $Language)
-  {
-    if($Selected == $Language['Id']) $Output .= $Language['Name'];
-  }
-  return($Output);
-}
-
 function GetLanguageList()
 { 
@@ -398 +386 @@
 function FollowingTran($TextID, $Table, $GroupId, $Prev = false) 
 { 
-  global $System;
+  global $System, $Config;
   
   if($Prev)
-  {
-    $sql = 'SELECT ID FROM '.$Table.' as item WHERE Language = 0 AND NOT EXISTS(SELECT entry FROM '.$Table.' AS sub WHERE sub.Language <> 0 AND sub.entry = item.entry) AND ID < '.$TextID.' ORDER BY ID DESC LIMIT 1';
-  } else
-  {
-    $sql = 'SELECT ID FROM '.$Table.' as item WHERE Language = 0 AND NOT EXISTS(SELECT entry FROM '.$Table.' AS sub WHERE sub.Language <> 0 AND sub.entry = item.entry) AND ID > '.$TextID.' ORDER BY ID LIMIT 1';
-  }
+    $sql = 'SELECT `ID` FROM `'.$Table.'` AS `item` WHERE '.
+      '(`Language` = '.$Config['OriginalLanguage'].') AND NOT EXISTS(SELECT `entry` '.
+      'FROM `'.$Table.'` AS `sub` WHERE (`sub`.`Language` <> '.$Config['OriginalLanguage'].') '.
+      'AND (`sub`.`entry` = `item`.`entry`)) AND (`ID` < '.$TextID.') ORDER BY `ID` DESC LIMIT 1';
+    else $sql = 'SELECT `ID` FROM `'.$Table.'` AS `item` WHERE '.
+      '(`Language` = '.$Config['OriginalLanguage'].') AND NOT EXISTS(SELECT `entry` '.
+      'FROM `'.$Table.'` AS `sub` WHERE (`sub`.`Language` <> '.$Config['OriginalLanguage'].') '.
+      'AND (`sub`.`entry` = `item`.`entry`)) AND `ID` > '.$TextID.' ORDER BY `ID` LIMIT 1';
   
   $DbResult = $System->Database->query($sql);
@@ -570 +560 @@
 function GetTranslatNames($Text,$mode,$TablesColumn) 
 {
-  global $System;
+  global $System, $Config;
   
  /* $TablesID = array('gameobject' => 5,
@@ -582 +572 @@
   foreach($TablesColumn as $Table => $Column) 
   {  
-    $sql = 'SELECT `ID`,`'.$Column.'`, (SELECT `'.$Column.'` FROM `'.$Table.'` AS `T` WHERE `O`.`Entry` = `T`.`Entry` AND `Language` <> 0 LIMIT 1) AS `Tran` FROM `'.$Table.'` AS `O` WHERE ';
+    $sql = 'SELECT `ID`,`'.$Column.'`, (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.'`';
   
     $ArrStr = explode(' ', $Text);
-    $where = '`Language` = 0 ';
-    if ($mode == 1) $where .= ' AND EXISTS(SELECT 1 FROM `'.$Table.'` AS `Sub` WHERE (`Sub`.`Language` <> 0) AND (`Sub`.`Entry` = `O`.`Entry`))';
-    if ($mode == 2) $where .= ' AND NOT EXISTS(SELECT 1 FROM `'.$Table.'` AS `Sub` WHERE (`Sub`.`Language` <> 0) AND (`Sub`.`Entry` = `O`.`Entry`))';
+    $where = '(`Language` = '.$Config['OriginalLanguage'].') ';
+    if ($mode == 1) $where .= ' AND EXISTS(SELECT 1 FROM `'.$Table.'` AS `Sub` WHERE (`Sub`.`Language` <> '.$Config['OriginalLanguage'].') AND (`Sub`.`Entry` = `O`.`Entry`))';
+    if ($mode == 2) $where .= ' AND NOT EXISTS(SELECT 1 FROM `'.$Table.'` AS `Sub` WHERE (`Sub`.`Language` <> '.$Config['OriginalLanguage'].') AND (`Sub`.`Entry` = `O`.`Entry`))';
     $where .= ' AND (';