Changeset 846 for trunk/Modules/Translation

Timestamp:

Jan 15, 2016, 10:24:05 PM (9 years ago)

Author:

chronos

Message:

• Modified: Now translation groups are also localized.
• Modified: Translated team page.

Location:

trunk/Modules/Translation

Files:

• Progress.php (modified) (3 diffs)
• Translation.php (modified) (3 diffs)
• TranslationList.php (modified) (4 diffs)

trunk/Modules/Translation/Progress.php

@@ -52 +52 @@
       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>';
+        $Output .= '<tr><td>'.T($Group['Name']).'</td><td>'.$Group['Translated'].'</td><td>'.$Group['Total'].'</td><td>'.ProgressBar(150, $Group['Percent']).'</td></tr>';
         $Translated += $Group['Translated'];
         $Total += $Group['Total'];
@@ -114 +114 @@
     if($Language['Enabled'] == 1)
     {
-      $Lang = ' <a href="?language='.$Language['Id'].'">'.$Language['Name'].'</a>';
+      $Lang = ' <a href="?language='.$Language['Id'].'">'.T($Language['Name']).'</a>';
       if($Language['Id'] == $_SESSION['language']) $Output .= '<strong>'.$Lang.'</strong> ';
         else $Output .= $Lang;
@@ -121 +121 @@
     if(is_numeric($_SESSION['language'])) $LanguageName = $LanguageList[$_SESSION['language']]['Name'];
       else $LanguageName = T('All');
-    $Output .= '<br/><br /><h3>'.sprintf(T('Statistics of translation completion of language %s for version %s'), $LanguageName, $_SESSION['StatVersion']).'</h3><br/>';
+    $Output .= '<br/><br /><h3>'.sprintf(T('Statistics of translation completion of language %s for version %s'), T($LanguageName), $_SESSION['StatVersion']).'</h3><br/>';
     $Output .= $this->ShowStatTable();
 

trunk/Modules/Translation/Translation.php

@@ -19 +19 @@
     $this->License = 'GNU/GPL';
     $this->Description = 'Translation of text items and groups from original language to other languages.';
-    $this->Dependencies = array('News');
+    $this->Dependencies = array('News', 'Search');
   }
 
@@ -49 +49 @@
       'Icon' => '',
     ));
+    /*
     if(array_key_exists('Search', $this->System->ModuleManager->Modules))
     {
@@ -62 +63 @@
 
         $this->System->ModuleManager->Modules['Search']->RegisterSearch('group'.$Group['Id'],
-        sprintf(T('Translation group "%s"'), $Group['Name']), $Columns, '`'.$Table.'`', $this->System->Link('/TranslationList.php?group='.
-        $Group['Id'].'&user=0&state=0&entry=&text='));
+          sprintf(T('Translation group "%s"'), $Group['Name']), $Columns, '`'.$Table.'`',
+          $this->System->Link('/TranslationList.php?group='.
+          $Group['Id'].'&user=0&state=0&entry=&text='));
       }
     }
+    */
   }
 

trunk/Modules/Translation/TranslationList.php

@@ -59 +59 @@
       if($Filter['Group'] != 0)
       {
-        if(isset($TranslationTree[$Filter['Group']]) == false) ErrorMessage('Překladová skupina dle zadaného Id neexistuje.');
+        if(isset($TranslationTree[$Filter['Group']]) == false)
+          ErrorMessage('Překladová skupina dle zadaného Id neexistuje.');
         $Table = $TranslationTree[$Filter['Group']]['TablePrefix'];
       }
@@ -77 +78 @@
       if($Group['Id'] == $Filter['Group']) $Selected = ' selected="selected"';
       else $Selected = '';
-      $Output .= '<option value="'.$Group['Id'].'"'.$Selected.'>'.$Group['Name'].'</option>';
+      $Output .= '<option value="'.$Group['Id'].'"'.$Selected.'>'.T($Group['Name']).'</option>';
     }
     $Output .= '</select></td>';
@@ -414 +415 @@
    while($Group = $DbResult->fetch_assoc())
    {
-     $Output .= '<tr><td><a href="'.$this->System->Link('/TranslationList.php?group='.$Group['Id'].'&amp;action=filter').'">'.$Group['Name'].'</a></td>'.
+     $Output .= '<tr><td><a href="'.$this->System->Link('/TranslationList.php?group='.$Group['Id'].'&amp;action=filter').'">'.T($Group['Name']).'</a></td>'.
        '<td>'.$Group['SourceType'].'</td><td>';
      if($Group['MangosTable'] != '') $Output .= $Group['MangosTable'].'.sql ';
@@ -503 +504 @@
     if($this->System->User->Licence(LICENCE_ADMIN))
     {
-      $DbResult = $this->System->Database->select('Group', '*', 'Id='.$_GET['id']);
+      $DbResult = $this->System->Database->select('Group', '*', '`Id`='.$_GET['id']);
       if($DbResult->num_rows == 1)
       {