Changeset 584 for trunk/Modules/Translation

Timestamp:

Sep 13, 2013, 8:58:04 PM (11 years ago)

Author:

chronos

Message:

• Modified: Page statistic moved to module Translation and renamed to progress.

Location:

trunk/Modules/Translation

Files:

• Progress.php (moved) (moved from trunk/statistic.php ) (4 diffs)
• Save.php (modified) (4 diffs)
• Translation.php (modified) (2 diffs)

trunk/Modules/Translation/Progress.php

@@ -1 +1 @@
 <?php
 
-$InitSystem = true;
-include_once('includes/global.php');
+class PageProgress extends Page
+{
+  function ShowStatTable()
+  {
+    $Output = '';
+    
+    $BuildNumber = GetBuildNumber($_SESSION['StatVersion']);
+    if(is_numeric($_SESSION['language'])) $LanguageFilter = 'AND (`Language`='.$_SESSION['language'].')';
+    else $LanguageFilter = ' AND (`Language`!='.$this->System->Config['OriginalLanguage'].')';
+    
+    $GroupListQuery = 'SELECT `Id`, `TablePrefix`, `Name` FROM `Group`';
+    $Query = '';
+    $DbResult = $this->Database->query($GroupListQuery);
+    if($DbResult->num_rows > 0)
+    {
+      while($DbRow = $DbResult->fetch_assoc())
+      {
+        $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 ';
+      }
+      $Query = substr($Query, 0, - 6);
+    
+      $DbResult = $this->Database->query('SELECT COUNT(*) FROM ('.$GroupListQuery.') AS `T`');
+      $DbRow = $DbResult->fetch_row();
+      $PageList = GetPageList($DbRow[0]);
+      $Output .= $PageList['Output'];
+    
+      $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'),
+      );
+    
+      $Order = GetOrderTableHeader($TableColumns, 'Name', 0);
+      $Output .= $Order['Output'];
+    
+      $Translated = 0;
+      $Total = 0;
+      $DbResult = $this->Database->query('SELECT *, ROUND(`Translated` / `Total` * 100, 2) AS `Percent` FROM ('.$Query.') AS `C3` '.$Order['SQL'].$PageList['SQLLimit']);
+      while($Group = $DbResult->fetch_assoc())
+      {
+        $Output .= '<tr><td>'.$Group['Name'].'</td><td>'.$Group['Translated'].'</td><td>'.$Group['Total'].'</td><td>'.ProgressBar(150, $Group['Percent']).'</td></tr>';
+        $Translated += $Group['Translated'];
+        $Total += $Group['Total'];
+      }
+      if($Total <> 0) $TotalCount = round($Translated / $Total * 100, 2);
+      else $TotalCount = 0;
+      $Output .= '<tr><td><strong>Celkem</strong></td><td><strong>'.$Translated.'</strong></td><td><strong>'.$Total.'</strong></td><td><strong>'.ProgressBar(150, $TotalCount).'</strong></td></tr>'.
+          '</table>';
+    }
+    return($Output);
+  } 
 
+  function Show()
+  {
 $LanguageList = GetLanguageList();
 
 if(array_key_exists('Version', $_GET)) $_SESSION['StatVersion'] = $_GET['Version'];
-if(!array_key_exists('StatVersion', $_SESSION)) $_SESSION['StatVersion'] = $Config['Web']['GameVersion'];
+if(!array_key_exists('StatVersion', $_SESSION)) $_SESSION['StatVersion'] = $this->System->Config['Web']['GameVersion'];
 
 if(!isset($_SESSION['language']))
 {
-        if($User->Licence(LICENCE_USER))
+        if($this->System->User->Licence(LICENCE_USER))
         {
-                $_SESSION['language'] = $User->Language;
+                $_SESSION['language'] = $this->System->User->Language;
   } else $_SESSION['language'] = '';
 }
@@ -24 +86 @@
 if(!array_key_exists($_SESSION['language'], $LanguageList)) $_SESSION['language'] = '';
 
-
-function ShowStatTable()
-{
-  global $System, $User, $Config;
-  
-  $Output = '';
- 
-  $BuildNumber = GetBuildNumber($_SESSION['StatVersion']);
-  if(is_numeric($_SESSION['language'])) $LanguageFilter = 'AND (`Language`='.$_SESSION['language'].')';
-    else $LanguageFilter = ' AND (`Language`!='.$Config['OriginalLanguage'].')';
-  
-  $GroupListQuery = 'SELECT `Id`, `TablePrefix`, `Name` FROM `Group`';
-  $Query = '';
-  $DbResult = $System->Database->query($GroupListQuery);
-  if($DbResult->num_rows > 0)
-  {  
-  while($DbRow = $DbResult->fetch_assoc())
-  {
-    $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` = '.$Config['OriginalLanguage'].') '.
-    'AND (`VersionStart` <= '.$BuildNumber.') AND (`VersionEnd` >= '.$BuildNumber.')'.
-    ') AS `C2`) AS `Total`, "'.$DbRow['Name'].'" AS `Name` UNION ';
-  }
-  $Query = substr($Query, 0, - 6);
-
-  $DbResult = $System->Database->query('SELECT COUNT(*) FROM ('.$GroupListQuery.') AS `T`');
-  $DbRow = $DbResult->fetch_row();
-  $PageList = GetPageList($DbRow[0]);  
-  $Output .= $PageList['Output'];
-  
-  $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'), 
-  );
-
-  $Order = GetOrderTableHeader($TableColumns, 'Name', 0);
-  $Output .= $Order['Output'];
-
-  $Translated = 0;
-  $Total = 0;
-  $DbResult = $System->Database->query('SELECT *, ROUND(`Translated` / `Total` * 100, 2) AS `Percent` FROM ('.$Query.') AS `C3` '.$Order['SQL'].$PageList['SQLLimit']);
-  while($Group = $DbResult->fetch_assoc()) 
-  {
-    $Output .= '<tr><td>'.$Group['Name'].'</td><td>'.$Group['Translated'].'</td><td>'.$Group['Total'].'</td><td>'.ProgressBar(150, $Group['Percent']).'</td></tr>';
-    $Translated += $Group['Translated'];
-    $Total += $Group['Total'];
-  }
-  if($Total <> 0) $TotalCount = round($Translated / $Total * 100, 2);
-    else $TotalCount = 0;
-  $Output .= '<tr><td><strong>Celkem</strong></td><td><strong>'.$Translated.'</strong></td><td><strong>'.$Total.'</strong></td><td><strong>'.ProgressBar(150, $TotalCount).'</strong></td></tr>'.
-    '</table>';
-  }
-  return($Output);
-}
-
 // Show client version selection
 $Output = 'Verze klienta: ';
-$DbResult = $System->Database->query('SELECT `Version`, `Title` FROM `ClientVersion` WHERE `Imported`=1 ORDER BY `Version`');
+$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> ';
@@ -111 +109 @@
   else $LanguageName = 'Všechny';
 $Output .= '<br/><br /><h3>Statistika dokončení překladů jazyka '.$LanguageName.' pro verzi '.$_SESSION['StatVersion'].'</h3><br/>';
-$Output .= ShowStatTable();
+$Output .= $this->ShowStatTable();
 
 $Output .= '<div>Počet stáhnutí přeložených textů v SQL souboru: <strong>';    
-$ID = $System->Database->query('SELECT count(distinct(`IP`)) FROM `Log` WHERE `Type` = 2');
+$ID = $this->Database->query('SELECT count(distinct(`IP`)) FROM `Log` WHERE `Type` = 2');
 $Line = $ID->fetch_row();
 $Output .= $Line[0];
@@ -120 +118 @@
                 
 $Output .= '<div>Počet stáhnutí: <strong>';      
-$ID = $System->Database->query('SELECT count(distinct(`IP`)) FROM `Log` WHERE `Type` = 0');
+$ID = $this->Database->query('SELECT count(distinct(`IP`)) FROM `Log` WHERE `Type` = 0');
 $Line = $ID->fetch_row();
 $Output .= $Line[0];
 $Output .= '</strong></div>';
-
-ShowPage($Output);
+    return($Output);
+  }
+}

trunk/Modules/Translation/Save.php

@@ -79 +79 @@
                                                                                 }
                                                                         }
-                                                                        if((($CompleteParts & (1 << ($GroupItem['Sequence'] - 1))) == 0) and ($EnglishFound[$GroupItem['Column']] != '')) $Completable = false;
+                                                                        if((($CompleteParts & (1 << ($GroupItem['Sequence'] - 1))) == 0) and 
+                                                                          ($EnglishFound[$GroupItem['Column']] != '')) $Completable = false;
                                                                 }
                                                         }
@@ -100 +101 @@
                                                         $this->Database->query('UPDATE `'.$Table.'` SET '.$Values.' WHERE `ID` = '.$ExistedText['ID']);
         
-                                                        $Output .= 'Změny v překladu <a href="'.$this->System->Link('/form.php?group='.$GroupId.'&amp;ID='.$ExistedText['ID']).'">'.$ExistedText['ID'].'</a> ('.$ExistedText['Entry'].') uloženy jako '.$CompleteText[$NewComplete].'.<br />';
-                                                        $this->System->ModuleManager->Modules['Log']->WriteLog('Změny v překladu <a href="'.$this->System->Link('/form.php?group='.$GroupId.'&amp;ID='.$ExistedText['ID']).'">'.$ExistedText['ID'].'</a> ('.$ExistedText['Entry'].') uloženy jako '.$CompleteText[$NewComplete].'.', LOG_TYPE_TRANSLATION);
+                                                        $Output .= 'Změny v překladu <a href="'.$this->System->Link('/form.php?group='.
+                                                          $GroupId.'&amp;ID='.$ExistedText['ID']).'">'.$ExistedText['ID'].'</a> ('.
+                                                          $ExistedText['Entry'].') uloženy jako '.$CompleteText[$NewComplete].'.<br />';
+                                                        $this->System->ModuleManager->Modules['Log']->WriteLog('Změny v překladu <a href="'.
+                                                          $this->System->Link('/form.php?group='.$GroupId.'&amp;ID='.$ExistedText['ID']).'">'.
+                                                          $ExistedText['ID'].'</a> ('.$ExistedText['Entry'].') uloženy jako '.$CompleteText[$NewComplete].'.', LOG_TYPE_TRANSLATION);
                                                 } else
                                                 {
                                                         // Insert new user translation
                                                         $Columns = '`Entry`, `VersionStart`, `VersionEnd`, `Language`, `User`, `Take`, `ModifyTime`';
-                                                        $Values = $EnglishFound['Entry'].', '.$EnglishFound['VersionStart'].', '.$EnglishFound['VersionEnd'].', '.$Language.', '.$this->System->User->Id.', '.$SourceText['ID'].', NOW()';
+                                                        $Values = $EnglishFound['Entry'].', '.$EnglishFound['VersionStart'].', '.
+                                                          $EnglishFound['VersionEnd'].', '.$Language.', '.$this->System->User->Id.', '.$SourceText['ID'].', NOW()';
         
                                                         $CompleteParts = 0;
@@ -148 +154 @@
                                                         $LastID = $this->Database->insert_id;
         
-                                                        $Output .= 'Text <a href="'.$this->System->Link('/form.php?group='.$GroupId.'&amp;ID='.$LastID).'">'.$LastID.'</a> ze skupiny <a href="TranslationList.php?group='.$GroupId.'&amp;user=0&amp;action=filter">'.$TranslationTree[$GroupId]['Name'].'</a> uložen jako '.$CompleteText[$NewComplete].'. Převzat z <a href="form.php?group='.$GroupId.'&amp;ID='.$TextID.'">'.$TextID.'</a>.<br/>';
-                                                        $this->System->ModuleManager->Modules['Log']->WriteLog('Text <a href="'.$this->System->Link('/form.php?group='.$GroupId.'&amp;ID='.$LastID).'">'.$LastID.'</a> ze skupiny <a href="TranslationList.php?group='.$GroupId.'&amp;user=0&amp;text=&amp;entry=&amp;action=filter">'.$TranslationTree[$GroupId]['Name'].'</a> uložen jako '.$CompleteText[$NewComplete].'. Převzat z <a href="form.php?group='.$GroupId.'&amp;ID='.$TextID.'">'.$TextID.'</a>.', LOG_TYPE_TRANSLATION);
+                                                        $Output .= 'Text <a href="'.$this->System->Link('/form.php?group='.
+                                                          $GroupId.'&amp;ID='.$LastID).'">'.$LastID.'</a> ze skupiny <a href="TranslationList.php?group='.
+                                                    $GroupId.'&amp;user=0&amp;action=filter">'.$TranslationTree[$GroupId]['Name'].'</a> uložen jako '.
+                                                          $CompleteText[$NewComplete].'. Převzat z <a href="form.php?group='.$GroupId.'&amp;ID='.$TextID.'">'.$TextID.'</a>.<br/>';
+                                                        $this->System->ModuleManager->Modules['Log']->WriteLog('Text <a href="'.
+                                                          $this->System->Link('/form.php?group='.$GroupId.'&amp;ID='.$LastID).'">'.
+                                                          $LastID.'</a> ze skupiny <a href="TranslationList.php?group='.
+                                                          $GroupId.'&amp;user=0&amp;text=&amp;entry=&amp;action=filter">'.
+                                                          $TranslationTree[$GroupId]['Name'].'</a> uložen jako '.$CompleteText[$NewComplete].
+                                                          '. Převzat z <a href="form.php?group='.$GroupId.'&amp;ID='.$TextID.'">'.$TextID.'</a>.', LOG_TYPE_TRANSLATION);
                                                 }
                                         }
@@ -186 +200 @@
                         }
         
-                        $Output .= 'Z této stránky můžete být automaticky přesměrování. Nastavit kam chcete být přesměrování si můžete v <a href="'.$this->System->Link('/Options.php').'" title="Nastavení uživatele">Nastavení</a>';
+                        $Output .= 'Z této stránky můžete být automaticky přesměrování. Nastavit kam chcete být přesměrování si můžete v <a href="'.
+                          $this->System->Link('/Options.php').'" title="Nastavení uživatele">Nastavení</a>';
         
                         // Update flag for experience info load

trunk/Modules/Translation/Translation.php

@@ -5 +5 @@
 include_once(dirname(__FILE__).'/Save.php');
 include_once(dirname(__FILE__).'/TranslationList.php');
+include_once(dirname(__FILE__).'/Progress.php');
 
 class ModuleTranslation extends AppModule
@@ -24 +25 @@
         $this->System->RegisterPage('form.php', 'PageTranslationForm');
         $this->System->RegisterPage('save.php', 'PageTranslationSave');
+        $this->System->RegisterPage('progress', 'PageProgress');
     $this->System->RegisterPage('TranslationList.php', 'PageTranslationList');
     $this->System->ModuleManager->Modules['News']->RegisterRSS(array('Title' => 'Poslední překlady', 
       'Channel' => 'translation', 'Callback' => array($this, 'ShowRSS'), 'Permission' => LICENCE_ANONYMOUS));
+    $this->System->RegisterMenuItem(array(
+        'Title' => 'Stav dokončení',
+        'Hint' => 'Stav dokončení překládů',
+        'Link' => $this->System->Link('/progress/'),
+        'Permission' => LICENCE_ANONYMOUS,
+        'Icon' => '',
+    ), 1);    
   }