Changeset 826 for trunk/Modules/Translation

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.

Location:

trunk/Modules/Translation

Files:

• Form.php (modified) (3 diffs)
• Progress.php (modified) (3 diffs)
• Save.php (modified) (1 diff)
• Translation.php (modified) (1 diff)
• UserLevel.php (moved) (moved from trunk/img_level.php ) (7 diffs)

trunk/Modules/Translation/Form.php

@@ -203 +203 @@
           $Output .= '</td></tr>';
 
-          //todo javascript
+          // TODO: javascript
 
           $Output .= '<script src="'.$this->System->Link('/style/jquery.js').'"></script>'.
@@ -238 +238 @@
 
               $Output .= '<br/><table class="BaseTable">'.
-              '<tr><th>Překladač:</th><th>Nepřeložené</th><th>Přeložené</th>';
+              '<tr><th>Google překladač:</th><th>Nepřeložené</th><th>Přeložené</th>';
               foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
                 if($TextItem['Visible'] == 1)
@@ -245 +245 @@
                       '<td>'.$LineAJ[$TextItem['Column']].'</td>'.
                       '<td>'.GetTranslateGoogle($LineAJ[$TextItem['Column']]).'</td></tr>';
-
 
               $Output .= '</table>';

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);

trunk/Modules/Translation/Save.php

@@ -213 +213 @@
 
         // Update flag for experience info load
-        $this->Database->query('UPDATE `User` SET `NeedUpdate` = 1 WHERE `ID` = '.$this->System->User->Id);
+        //$this->Database->query('UPDATE `User` SET `NeedUpdate` = 1 WHERE `ID` = '.$this->System->User->Id);
+        UserLevelUpdate($this->System->User->Id);
       } else $Output .= ShowMessage('Položka nenalezena', MESSAGE_CRITICAL);
     } else

trunk/Modules/Translation/Translation.php

@@ -7 +7 @@
 include_once(dirname(__FILE__).'/Progress.php');
 include_once(dirname(__FILE__).'/LoadNames.php');
+include_once(dirname(__FILE__).'/UserLevel.php');
 
 class ModuleTranslation extends AppModule

trunk/Modules/Translation/UserLevel.php

@@ -7 +7 @@
 $index_level = 100;
 $from_diakrit = 3; // higher xp for word with diacritics
-$FontFile = dirname(__FILE__).'/images/FRIZQT__.ttf';
 
 function CheckDiakrit($Word)
@@ -22 +21 @@
 }
 
-function CreateImg($prefix, $user, $xp)
-{
-  global $index_level, $FontFile;
-
-  if($xp > 0)
-  {
-    $level = sqrt($xp / $index_level);
-    $level = substr($level, 0, strpos($level, '.'));
-  } else $level = 0;
-  $xp_min = $level * $level * $index_level;
-  $xp_max = ($level + 1) * ($level + 1) * $index_level;
-  $xp_max = $xp_max - $xp_min;
-  $xp = $xp - $xp_min;
-
-  if($xp_max > 0) $Percent = ( $xp / $xp_max) * 100;
-    else $Percent = 0;
-  $Percent = substr($Percent, 0, 5);
-
-  $PercentBar = $Percent * 2.5;
-  $Image = ImageCreateTrueColor(250, 15);
-  $Color1 = imagecolorallocate($Image, 214, 214, 214);
-  $Color2 = imagecolorallocate($Image, 239, 131, 166);
-  $Color3 = imagecolorallocate($Image, 225, 0, 0);
-  imagefilledrectangle($Image, 0, 0, 250, 15, $Color1);
-  imagefilledrectangle($Image, 0, 0, $PercentBar, 59, $Color2);
-  ImageTTFText($Image, 11, 0, 10, 12, $Color3, $FontFile, $level.' Level');
-  ImageTTFText($Image, 8, 0, 80, 12, $Color3, $FontFile, $xp.'/'.$xp_max.' xp   '.$user);
-
-  if(!file_exists(dirname(__FILE__).'/tmp/'.$prefix.'/')) mkdir(dirname(__FILE__).'/tmp/'.$prefix.'/');
-  if(!file_exists(dirname(__FILE__).'/tmp/'.$prefix.'/'.$user.'/')) mkdir(dirname(__FILE__).'/tmp/'.$prefix.'/'.$user.'/');
-  ImagePNG($Image, dirname(__FILE__).'/tmp/'.$prefix.'/'.$user.'/level.png');
-}
-
 function GetXPFromTranslation($UserId)
 {
@@ -67 +33 @@
       foreach($TranslationTree[$Group['Id']]['Items'] as $Index => $TextItem)
       {
-         $GroupBy .= '`'.$TextItem['Column'].'`, ';
+        $GroupBy .= '`'.$TextItem['Column'].'`, ';
       }
       $GroupBy = substr($GroupBy, 0, -2);
 
-      $IDtran = $System->Database->query('SELECT * FROM `'.$Group['TablePrefix'].'` WHERE (`User` = '.$UserId.') AND (`Complete` = 1) AND (`Take` IS NOT NULL) '.$GroupBy);
+      $IDtran = $System->Database->query('SELECT * FROM `'.$Group['TablePrefix'].'` WHERE '.
+        '(`User` = '.$UserId.') AND (`Complete` = 1) AND (`Take` IS NOT NULL) '.$GroupBy);
       while($Line = $IDtran->fetch_array())
       {
@@ -80 +47 @@
         foreach($TranslationTree[$Group['Id']]['Items'] as $Index => $TextItem)
         {
-          if(($Line[$TextItem['Column']] <> $LineComparison[$TextItem['Column']]) and (strlen($Line[$TextItem['Column']]) > (strlen($LineComparison[$TextItem['Column']]) * 0.5)))
+          if(($Line[$TextItem['Column']] <> $LineComparison[$TextItem['Column']]) and
+            (strlen($Line[$TextItem['Column']]) > (strlen($LineComparison[$TextItem['Column']]) * 0.5)))
           {
             $TextArr = explode(' ', $Line[$TextItem['Column']]);
@@ -91 +59 @@
           } else
           {
-            if (($Line[$TextItem['Column']] == $LineComparison[$TextItem['Column']]) and ('0' == $LineComparison['Language']) and ($LineComparison[$TextItem['Column']] <> '') and ($TextItem['Column'] <> 'ShortCut')) $translated = false;
+            if (($Line[$TextItem['Column']] == $LineComparison[$TextItem['Column']]) and
+              ('0' == $LineComparison['Language']) and ($LineComparison[$TextItem['Column']] <> '') and
+              ($TextItem['Column'] <> 'ShortCut')) $translated = false;
           }
         }
@@ -101 +71 @@
 }
 
-function ImgLevelUpdate()
+function UserLevelUpdate($UserId)
 {
   global $System, $TranslationTree, $Config;
 
   // Main code for users
-  $DbResult = $System->Database->query('SELECT `ID`, `Name` FROM `User` WHERE `NeedUpdate` = 1');
+  $DbResult = $System->Database->query('SELECT `ID`, `Name` FROM `User` WHERE `Id` = '.$UserId);
   if($DbResult->num_rows > 0)
   {
@@ -127 +97 @@
       $xp = GetXPFromTranslation($LineUser['ID']);
       $System->Database->query('UPDATE `User` SET `XP` = '.$xp.', `TranslatedCount` = '.$TranslatedCount.' WHERE `User`.`ID` = '.$LineUser['ID']);
-      CreateImg('user', $LineUser['Name'], $xp);
     }
-
-    // Main code for translation teams
-    $DbResult = $System->Database->query('SELECT `ID`, `Name`, (SELECT AVG(`XP`) FROM `User` WHERE `Team` = `Team`.`Id`) AS `Average` '.
-      'FROM `Team` WHERE `ID` IN (SELECT `Team` FROM `User` WHERE `NeedUpdate` = 1)');
-    while($LineTeam = $DbResult->fetch_array())
-    {
-      CreateImg('team', $LineTeam['Name'], substr($LineTeam['Average'], 0, strpos($LineTeam['Average'],'.')));  //image creation
-    }
-    $System->Database->query('UPDATE `User` SET `NeedUpdate` = 0');
   }
 }
-
-function ImgLevelShow()
-{
-  global $System;
-
-  // Do update for all users
-  $System->Database->query('UPDATE `User` SET `NeedUpdate` = 1');
-  ImgLevelUpdate();
-
-  $Output = '<strong>Uživatelé</strong><br/>';
-  $ID = $System->Database->query('SELECT `ID`, `Name` FROM `User`');
-  while($LineUser = $ID->fetch_array())
-  {
-    $Output .= '<img src="'.$System->Link('/tmp/user/'.$LineUser['Name'].'/level.png').'"/> '.$LineUser['Name'].'<br />';
-  }
-
-  $Output .= '<br/><strong>Týmy</strong><br/>';
-  $ID = $System->Database->query('SELECT `ID`, `Name` FROM `Team`');
-  while($LineTeam = $ID->fetch_array())
-  {
-    $Output .= '<img src="'.$System->Link('/tmp/team/'.$LineTeam['Name'].'/level.png').'"/> '.$LineTeam['Name'].'<br />';
-  }
-  WriteLog('Přegenerovány obrázky úrovní překladatelů a týmů', LOG_TYPE_ADMINISTRATION);
-  return($Output);
-}