Changeset 826 for trunk/Modules/Translation/Progress.php

Timestamp:

Mar 1, 2015, 3:38:19 PM (10 years ago)

Author:

chronos

Message:

• Modified: Removed generation of user level to images as files. Level images ware replaced by HTML progress bar.
• Modified: User XP level and translated count is now calculated during every translation save operation rather then calculated in user list and group view page show.
• Fixed: Wrong indentation in some files.

File:

• trunk/Modules/Translation/Progress.php (modified) (3 diffs)

trunk/Modules/Translation/Progress.php

@@ -19 +19 @@
       {
         $Query .= 'SELECT (SELECT COUNT(DISTINCT(`Entry`)) FROM ('.
-            'SELECT `T`.`Entry` FROM `'.$DbRow['TablePrefix'].'` AS `T` '.
-            'WHERE (`Complete` = 1) '.$LanguageFilter.' '.
-            'AND (`VersionStart` <= '.$BuildNumber.') AND (`VersionEnd` >= '.$BuildNumber.')'.
-            ') AS `C1`) AS `Translated`, '.
-            '(SELECT COUNT(DISTINCT(`Entry`)) FROM ('.
-            'SELECT `T`.`Entry` FROM `'.$DbRow['TablePrefix'].'` AS `T` '.
-            'WHERE (`Language` = '.$this->System->Config['OriginalLanguage'].') '.
-            'AND (`VersionStart` <= '.$BuildNumber.') AND (`VersionEnd` >= '.$BuildNumber.')'.
-            ') AS `C2`) AS `Total`, "'.$DbRow['Name'].'" AS `Name` UNION ';
+          'SELECT `T`.`Entry` FROM `'.$DbRow['TablePrefix'].'` AS `T` '.
+          'WHERE (`Complete` = 1) '.$LanguageFilter.' '.
+          'AND (`VersionStart` <= '.$BuildNumber.') AND (`VersionEnd` >= '.$BuildNumber.')'.
+          ') AS `C1`) AS `Translated`, '.
+          '(SELECT COUNT(DISTINCT(`Entry`)) FROM ('.
+          'SELECT `T`.`Entry` FROM `'.$DbRow['TablePrefix'].'` AS `T` '.
+          'WHERE (`Language` = '.$this->System->Config['OriginalLanguage'].') '.
+          'AND (`VersionStart` <= '.$BuildNumber.') AND (`VersionEnd` >= '.$BuildNumber.')'.
+          ') AS `C2`) AS `Total`, "'.$DbRow['Name'].'" AS `Name` UNION ';
       }
       $Query = substr($Query, 0, - 6);
@@ -38 +38 @@
       $Output .= '<table class="BaseTable">';
       $TableColumns = array(
-          array('Name' => 'Name', 'Title' => 'Jméno'),
-          array('Name' => 'Translated', 'Title' => 'Přeložených'),
-          array('Name' => 'Total', 'Title' => 'Anglických'),
-          array('Name' => 'Percent', 'Title' => 'Procenta'),
+        array('Name' => 'Name', 'Title' => 'Jméno'),
+        array('Name' => 'Translated', 'Title' => 'Přeložených'),
+        array('Name' => 'Total', 'Title' => 'Anglických'),
+        array('Name' => 'Percent', 'Title' => 'Procenta'),
       );
 
@@ -67 +67 @@
   {
     $this->Title = T('Progress');
-$LanguageList = GetLanguageList();
+    $LanguageList = GetLanguageList();
 
-if(array_key_exists('Version', $_GET)) $_SESSION['StatVersion'] = $_GET['Version'];
-if(!array_key_exists('StatVersion', $_SESSION))
-{
-  if($this->System->User->Licence(LICENCE_USER) and ($this->System->User->PreferredVersionGame != ''))
-  {
-    $_SESSION['StatVersion'] = $this->System->User->PreferredVersionGame;
-  } else
-    $_SESSION['StatVersion'] = $this->System->Config['Web']['GameVersion'];
-}
+    if(array_key_exists('Version', $_GET)) $_SESSION['StatVersion'] = $_GET['Version'];
+    if(!array_key_exists('StatVersion', $_SESSION))
+    {
+      if($this->System->User->Licence(LICENCE_USER) and ($this->System->User->PreferredVersionGame != ''))
+      {
+        $_SESSION['StatVersion'] = $this->System->User->PreferredVersionGame;
+      } else {
+        $_SESSION['StatVersion'] = $this->System->Config['Web']['GameVersion'];
+      }
+    }
 
-if(!isset($_SESSION['language']))
-{
-  if($this->System->User->Licence(LICENCE_USER))
-  {
-    $_SESSION['language'] = $this->System->User->Language;
-  } else $_SESSION['language'] = '';
-}
-if(array_key_exists('language', $_GET)) {
-  if($_GET['language'] == '') $_SESSION['language'] = '';
-    else {
-      $_SESSION['language'] = $_GET['language'] * 1;
+    if(!isset($_SESSION['language']))
+    {
+      if($this->System->User->Licence(LICENCE_USER))
+      {
+        $_SESSION['language'] = $this->System->User->Language;
+      } else {
+        $_SESSION['language'] = '';
+      }
     }
-}
-if(!array_key_exists($_SESSION['language'], $LanguageList)) $_SESSION['language'] = '';
+    if(array_key_exists('language', $_GET))
+    {
+      if($_GET['language'] == '') {
+        $_SESSION['language'] = '';
+      } else {
+        $_SESSION['language'] = $_GET['language'] * 1;
+      }
+    }
+    if(!array_key_exists($_SESSION['language'], $LanguageList)) $_SESSION['language'] = '';
 
-// Show client version selection
-$Output = 'Verze klienta: ';
-$DbResult = $this->Database->query('SELECT `Version`, `Title` FROM `ClientVersion` WHERE `Imported`=1 ORDER BY `Version`');
-while($DbRow = $DbResult->fetch_assoc())
-  $Output .= '<a href="?Version='.$DbRow['Version'].'" title="'.$DbRow['Title'].'">'.$DbRow['Version'].'</a> ';
-$Output .= '<br/>';
+    // Show client version selection
+    $Output = 'Verze klienta: ';
+    $DbResult = $this->Database->query('SELECT `Version`, `Title` FROM `ClientVersion` WHERE `Imported`=1 ORDER BY `Version`');
+    while($DbRow = $DbResult->fetch_assoc())
+      $Output .= '<a href="?Version='.$DbRow['Version'].'" title="'.$DbRow['Title'].'">'.$DbRow['Version'].'</a> ';
+    $Output .= '<br/>';
 
-// Show language selection
-$Output .= 'Jazyk: ';
-$Lang = '<a href="?language=">Všechny</a>';
-if($_SESSION['language'] == '') $Output .= '<strong>'.$Lang.'</strong> ';
-  else $Output .= $Lang;
-foreach($LanguageList as $Language)
-if($Language['Enabled'] == 1)
-{
-  $Lang = ' <a href="?language='.$Language['Id'].'">'.$Language['Name'].'</a>';
-  if($Language['Id'] == $_SESSION['language']) $Output .= '<strong>'.$Lang.'</strong> ';
-    else $Output .= $Lang;
-}
+    // Show language selection
+    $Output .= 'Jazyk: ';
+    $Lang = '<a href="?language=">Všechny</a>';
+    if($_SESSION['language'] == '') $Output .= '<strong>'.$Lang.'</strong> ';
+      else $Output .= $Lang;
+    foreach($LanguageList as $Language)
+    if($Language['Enabled'] == 1)
+    {
+      $Lang = ' <a href="?language='.$Language['Id'].'">'.$Language['Name'].'</a>';
+      if($Language['Id'] == $_SESSION['language']) $Output .= '<strong>'.$Lang.'</strong> ';
+        else $Output .= $Lang;
+    }
 
-if(is_numeric($_SESSION['language'])) $LanguageName = $LanguageList[$_SESSION['language']]['Name'];
-  else $LanguageName = 'Všechny';
-$Output .= '<br/><br /><h3>Statistika dokončení překladů jazyka '.$LanguageName.' pro verzi '.$_SESSION['StatVersion'].'</h3><br/>';
-$Output .= $this->ShowStatTable();
+    if(is_numeric($_SESSION['language'])) $LanguageName = $LanguageList[$_SESSION['language']]['Name'];
+      else $LanguageName = 'Všechny';
+    $Output .= '<br/><br /><h3>Statistika dokončení překladů jazyka '.$LanguageName.' pro verzi '.$_SESSION['StatVersion'].'</h3><br/>';
+    $Output .= $this->ShowStatTable();
 
     return($Output);