Changeset 525 for trunk/TranslationList.php

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ý.

File:

• trunk/TranslationList.php (modified) (5 diffs)

trunk/TranslationList.php

@@ -5 +5 @@
 function ShowFilter($GroupId = 0)
 {
-  global $System, $TranslationTree;
+  global $System, $TranslationTree, $Config;
   
   $Filter = array('SQL' => '');
@@ -153 +153 @@
   {
     if($Filter['State'] == 0) $Filter['SQL'] .= $UserFilter.$VersionFilter.'';
-    else if($Filter['State'] == 1) $Filter['SQL'] .= $VersionFilter.' AND (`Language` = 0) AND NOT EXISTS(SELECT 1 FROM `'.$Table.'` AS `Sub` WHERE (`Sub`.`Language` <> 0)'.$LanguageFilter.$UserFilter.' AND (`Sub`.`Entry` = `T`.`Entry`) AND (`Sub`.`Complete` = 1) AND (`Sub`.`VersionStart` = `T`.`VersionStart`) AND (`Sub`.`VersionEnd` = `T`.`VersionEnd`))';
+    else if($Filter['State'] == 1) $Filter['SQL'] .= $VersionFilter.' AND (`Language` = '.$Config['OriginalLanguage'].') '.
+      'AND NOT EXISTS(SELECT 1 FROM `'.$Table.'` AS `Sub` WHERE '.
+      '(`Sub`.`Language` <> '.$Config['OriginalLanguage'].')'.$LanguageFilter.$UserFilter.
+      ' AND (`Sub`.`Entry` = `T`.`Entry`) AND (`Sub`.`Complete` = 1) AND '.
+      '(`Sub`.`VersionStart` = `T`.`VersionStart`) AND (`Sub`.`VersionEnd` = `T`.`VersionEnd`))';
     else if($Filter['State'] == 2) $Filter['SQL'] .= $UserFilter.$LanguageFilter.$VersionFilter.' AND (`Complete` = 1)';
-    else if($Filter['State'] == 3) $Filter['SQL'] .= $UserFilter.$LanguageFilter.$VersionFilter.' AND (`Language` != 0) AND (`Complete` = 0)';
-    else if($Filter['State'] == 4) $Filter['SQL'] .= $VersionFilter.' AND (`Language` = 0)';
+    else if($Filter['State'] == 3) $Filter['SQL'] .= $UserFilter.$LanguageFilter.$VersionFilter.' AND (`Language` != '.$Config['OriginalLanguage'].') AND (`Complete` = 0)';
+    else if($Filter['State'] == 4) $Filter['SQL'] .= $VersionFilter.' AND (`Language` = '.$Config['OriginalLanguage'].')';
   }
 
@@ -193 +197 @@
   $Query = 'SELECT `T`.`ID`, `T`.`Entry`, `T`.`VersionStart`, `T`.`VersionEnd`, '.
     '`T`.`'.$TranslationTree[$Filter['Group']]['Items'][0]['Column'].'`, '.
-    '(SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `T`.`User`) '.
-    'AS `UserName` FROM `'.$Table.'` AS `T` WHERE 1 '.$Filter['SQL'];
+    '(SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `T`.`User`) AS `UserName`, '.
+    '(SELECT `Language`.`Name` FROM `Language` WHERE `Language`.`ID` = `T`.`Language`) AS `LanguageName` '.
+    'FROM `'.$Table.'` AS `T` WHERE 1 '.$Filter['SQL'];
   
   // Get total item count
@@ -207 +212 @@
     array('Name' => $TranslationTree[$Filter['Group']]['Items'][0]['Column'], 'Title' => 'Název'), 
     array('Name' => 'VersionStart', 'Title' => 'Verze'), 
-    array('Name' => 'UserName', 'Title' => 'Překladatel'),
+    array('Name' => 'LanguageName', 'Title' => 'Jazyk'), 
+        array('Name' => 'UserName', 'Title' => 'Překladatel'),
   );
     
@@ -220 +226 @@
       '<td>'.htmlspecialchars($Line[$TranslationTree[$Filter['Group']]['Items'][0]['Column']]).'</td>'.
       '<td>'.GetVersionWOW($Line['VersionStart']).'-'.GetVersionWOW($Line['VersionEnd']).'</td>'.
+      '<td>'.$Line['LanguageName'].'</td>'.
       '<td>'.$Line['UserName'].'</td>';
       '</tr>';