Changeset 831 for trunk/Modules/Translation/TranslationList.php

Timestamp:

Aug 24, 2015, 9:57:27 PM (9 years ago)

Author:

chronos

Message:

• Removed: Do not use fixed number for text group item index. Do not exclude all other groups for mass translation except spell rank.
• Modified: Translation save page redirection part of code moved to separate method.
• Fixed: Translation save condition for empty original text items.

File:

• trunk/Modules/Translation/TranslationList.php (modified) (1 diff)

trunk/Modules/Translation/TranslationList.php

@@ -184 +184 @@
                               ')';
           }
-      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'].') '.
+      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'] == 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'].
+      } 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'] == CompletionState::Original) $Filter['SQL'] .= $VersionFilter.' AND (`T`.`Language` = '.$this->System->Config['OriginalLanguage'].')';
-      else if($Filter['State'] == CompletionState::NotFinishedNotTranslated) $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'] == CompletionState::Missing1) {
+      ') AND (`T`.`Complete` = 0)';
+      } 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'] == CompletionState::Missing2) {
+      } else
+      if($Filter['State'] == CompletionState::Missing2) {
         $Filter['SQL'] .= $UserFilter.$VersionFilter.' AND (`T`.`Complete` = 1) AND `T`.`Language` != '.$this->System->Config['OriginalLanguage'];
         $Filter['SQL'] .= ' '. $WithoutAlter;