Changeset 772 for trunk

Timestamp:

Jan 31, 2014, 8:55:12 AM (11 years ago)

Author:

chronos

Message:

• Modified: Enumeration numbers changed to named constants in translation list filter.

Location:

trunk

Files:

• Modules/Translation/TranslationList.php (modified) (3 diffs)
• includes/Version.php (modified) (1 diff)

trunk/Modules/Translation/TranslationList.php

@@ -1 +1 @@
 <?php
+
+class CompletionState
+{
+        const All = 0;
+        const NotTranslated = 1;
+        const Translated = 2;
+        const NotFinished = 3;
+        const Original = 4;
+        const NotFinishedNotTranslated = 5;
+        const Missing1 = 6;
+        const Missing2 = 7;
+}
+
 
 class PageTranslationList extends Page
@@ -23 +36 @@
                 $Filter['State'] = GetParameter('state', 0, true, true);
                 $Output .= '<td><select name="state">';
-                $StateTypes = array('Všechny','Nepřeložené','Přeložené','Rozpracované','Anglické','Rozpracované-Nepřeložené','Chybějící $ ($N,$s..)','Chybějící $-Neopravený');
+                $StateTypes = array(
+                  CompletionState::All => 'Všechny', 
+      CompletionState::NotTranslated => 'Nepřeložené',
+      CompletionState::Translated => 'Přeložené',
+      CompletionState::NotFinished => 'Rozpracované',
+      CompletionState::Original => 'Anglické',
+      CompletionState::NotFinishedNotTranslated => 'Rozpracované-Nepřeložené',
+      CompletionState::Missing1 => 'Chybějící $ ($N,$s..)',
+      CompletionState::Missing2 => 'Chybějící $-Neopravený'
+    );
                 foreach ($StateTypes as $index=>$StateType) {
                 if($Filter['State'] == $index) $Selected = ' selected="selected"';
@@ -160 +182 @@
                               ')';
                       }
-                        if($Filter['State'] == 0) $Filter['SQL'] .= $UserFilter.$VersionFilter.'';
-                        else if($Filter['State'] == 1) $Filter['SQL'] .= $VersionFilter.' AND (`T`.`Language` = '.$this->System->Config['OriginalLanguage'].') '.
+                        if($Filter['State'] == CompletionState::All) $Filter['SQL'] .= $UserFilter.$VersionFilter.'';
+                        else if($Filter['State'] == CompletionState::NotTranslated) $Filter['SQL'] .= $VersionFilter.' AND (`T`.`Language` = '.$this->System->Config['OriginalLanguage'].') '.
                                         'AND NOT EXISTS(SELECT 1 FROM `'.$Table.'` AS `Sub` WHERE '.
                                         '(`Sub`.`Language` <> '.$this->System->Config['OriginalLanguage'].') '.$LanguageFilterSub.$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 (`T`.`Complete` = 1)';
-                        else if($Filter['State'] == 3) $Filter['SQL'] .= $UserFilter.$LanguageFilter.$VersionFilter.' AND (`T`.`Language` != '.$this->System->Config['OriginalLanguage'].
+                        else if($Filter['State'] == CompletionState::Translated) $Filter['SQL'] .= $UserFilter.$LanguageFilter.$VersionFilter.' AND (`T`.`Complete` = 1)';
+                        else if($Filter['State'] == CompletionState::NotFinished) $Filter['SQL'] .= $UserFilter.$LanguageFilter.$VersionFilter.' AND (`T`.`Language` != '.$this->System->Config['OriginalLanguage'].
                         ') AND (`T`.`Complete` = 0)';
-                        else if($Filter['State'] == 4) $Filter['SQL'] .= $VersionFilter.' AND (`T`.`Language` = '.$this->System->Config['OriginalLanguage'].')';
-                        else if($Filter['State'] == 5) $Filter['SQL'] .= $UserFilter.$VersionFilter.$WithoutAlter.
+                        else if($Filter['State'] == CompletionState::Original) $Filter['SQL'] .= $VersionFilter.' AND (`T`.`Language` = '.$this->System->Config['OriginalLanguage'].')';
+                        else if($Filter['State'] == CompletionState::NotFinishedNotTranslated) $Filter['SQL'] .= $UserFilter.$VersionFilter.$WithoutAlter.
       ' AND (`T`.`Language` != '.$this->System->Config['OriginalLanguage'].
                         ') AND (`T`.`Complete` = 0)'.
           '';
-                        else if($Filter['State'] == 6) {                        
+                        else if($Filter['State'] == CompletionState::Missing1) {                        
         $Filter['SQL'] .= $UserFilter.$VersionFilter.' AND (`T`.`Complete` = 1) AND `T`.`Language` != '.$this->System->Config['OriginalLanguage'];
         $Filter['SQL'] .= ' AND ('.implode(' OR ', $ItemsVar).') ';             
                   }
-                        else if($Filter['State'] == 7) {                        
+                        else if($Filter['State'] == CompletionState::Missing2) {                        
         $Filter['SQL'] .= $UserFilter.$VersionFilter.' AND (`T`.`Complete` = 1) AND `T`.`Language` != '.$this->System->Config['OriginalLanguage'];
         $Filter['SQL'] .= ' '. $WithoutAlter;

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 770; // Subversion revision
+$Revision = 772; // Subversion revision
 $DatabaseRevision = 748; // Database structure revision 
 $ReleaseTime = '2014-01-30';