Changeset 608 for trunk

Timestamp:

Nov 26, 2013, 10:12:48 PM (11 years ago)

Author:

chronos

Message:

• Added: Implemented mechanism for update interface translation list from source code. Resulted list is saved to lanugage file and database.

Location:

trunk

Files:

• Modules/FrontPage/FrontPage.php (modified) (2 diffs)
• Modules/News/News.php (modified) (4 diffs)
• Modules/User/Profile.php (modified) (1 diff)
• admin/UpdateTrace.php (modified) (2 diffs)
• admin/index.php (modified) (3 diffs)
• includes/Database.php (modified) (1 diff)
• includes/Locale.php (modified) (3 diffs)
• includes/Version.php (modified) (1 diff)
• locale/cs.php (modified) (1 diff)

trunk/Modules/FrontPage/FrontPage.php

@@ -18 +18 @@
     $this->System->RegisterPage('', 'PageFrontPage');
     $this->System->RegisterMenuItem(array(
-      'Title' => 'Domů',
-      'Hint' => 'Hlavní stránka', 
+      'Title' => T('Home'),
+      'Hint' => T('Main page'), 
       'Link' => $this->System->Link('/'),
       'Permission' => LICENCE_ANONYMOUS,
@@ -89 +89 @@
   {
         $Count = 40;
-        $Output = '<strong>Poslední překlady:</strong>';
+        $Output = '<strong>'.T('Last translated').':</strong>';
   
         $GroupListQuery = 'SELECT `Group`.* FROM `Group`';

trunk/Modules/News/News.php

@@ -33 +33 @@
         while($DbRow = $DbResult->fetch_assoc())
                 $Output .= '<div><strong>'.$DbRow['Title'].' ('.HumanDate($DbRow['Time']).')</strong> <br />'.$DbRow['Text'].' ('.$DbRow['Name'].')</div>';
-        $Output .= '<a href="'.$this->System->Link('/news/').'">Všechny zprávy</a>';
+        $Output .= '<a href="'.$this->System->Link('/news/').'">'.T('All news').'</a>';
         $Output .= '</div>';    
         return($Output);
@@ -82 +82 @@
                 $Output = '<h3>Novinky</h3>'.$PageList['Output'];
                 if($this->System->User->Licence(LICENCE_ADMIN)) 
-                        $Output .= ' <a href="?a=add">Vložit</a>';
+                        $Output .= ' <a href="?a=add">'.T('Add').'</a>';
                 $Output .= '<div class="shoutbox">';
                 $DbResult = $this->System->Database->query('SELECT `News`.`Time`, `News`.`Text`, `News`.`Title`, '.
@@ -103 +103 @@
                           '<input type="submit" value="Uložit"/><br/>'.
                           '</form>';
-                } else $Output = ShowMessage('Nemáte oprávnění', MESSAGE_CRITICAL);
+                } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
                 return($Output);
         }
@@ -120 +120 @@
                           $Output .= $this->ShowList();
                   } else $Output = ShowMessage('Nezadány údaje', MESSAGE_CRITICAL);
-                } else $Output = ShowMessage('Nemáte oprávnění', MESSAGE_CRITICAL);
+                } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
                 return($Output);
         }

trunk/Modules/User/Profile.php

@@ -18 +18 @@
                         if(@mail($Email, $Subject, $Text, 'From: '.$this->System->Config['Web']['AdminEmail'].'\nReply-To: '.$this->System->Config['Web']['AdminEmail'].'\nX-Mailer: PHP/'))
                         {
-                                $Output .= ShowMessage('Zpráva byla odeslána.');
+                                $Output .= ShowMessage(T('Message was sent.'));
                         }
                         else $Output .= ShowMessage('Nepodařilo se odesat E-mail.', MESSAGE_CRITICAL);

trunk/admin/UpdateTrace.php

@@ -2623 +2623 @@
 }
 
+function UpdateTo609($Manager)
+{
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `Locale` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Language` int(11) NOT NULL,
+  `Original` varchar(255) NOT NULL,
+  `Translated` varchar(255) NOT NULL,
+  `Fuzzy` int(11) NOT NULL,
+  PRIMARY KEY (`Id`),
+  KEY `Language` (`Language`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
+
+  $Manager->Execute('ALTER TABLE `Locale`
+  ADD CONSTRAINT `Locale_ibfk_1` FOREIGN KEY (`Language`) REFERENCES `Language` (`Id`);');
+}
+
 $Updates = array(
         498 => array('Revision' => 506, 'Function' => 'UpdateTo506'),
@@ -2635 +2651 @@
         585 => array('Revision' => 600, 'Function' => 'UpdateTo600'),
         600 => array('Revision' => 604, 'Function' => 'UpdateTo604'),
+        604 => array('Revision' => 609, 'Function' => 'UpdateTo609'),
 );

trunk/admin/index.php

@@ -22 +22 @@
   '<a href="'.$System->Link('/admin/?action=testing').'">Testování</a><br/>'.
   '<small>Testovací funkce</small><br/><br/>'.    
+  '<a href="'.$System->Link('/admin/?action=locale').'">Exportovat překlad rozhraní</a><br/>'.
+  '<small>Exportovat texty z PHP souborů pro překlad rozhraní</small><br/><br/>'.
   '<a href="'.$System->Link('/admin/?action=uncomplete').'">Nastavit nekompletní texty</a><br/>'.
   '<small>Nastaví questy, které jsou v popisu nebo objektu stejné jako nedokončené</small><br/><br/>';    
@@ -88 +90 @@
 }           
 
+function ShowLocale()
+{
+        global $Locale, $System;
+        
+        $Locale->AnalyzeCode(dirname(dirname(__FILE__)));
+        $Locale->UpdateToDatabase($System->Database, 3);
+        $FileName = dirname(dirname(__FILE__)).'/locale/'.$Locale->Texts->Code.'.php';
+        $Locale->SaveToFile($FileName);
+        $Output = 'Překlad rozhraní přegenerován';
+        $Output .= '<table class="BaseTable"><tr><th>Originál</th><th>Překlad</th></tr>';
+        foreach($Locale->Texts->Data as $Index => $Item)
+          $Output .= '<tr><td>'.$Index.'</td><td>'.$Item.'</td></tr>';
+        $Output .= '</table>';
+        $Output .= 'Překladová soubor '.$FileName.' zaktualizován';
+        return($Output);
+}
+
 $Output = '';
 if($User->Licence(LICENCE_ADMIN))
@@ -99 +118 @@
     else if($_GET['action'] == 'testing') $Output .= Testing();
     else if($_GET['action'] == 'phpinfo') $Output .= ShowPHPInfo();
+    else if($_GET['action'] == 'locale') $Output .= ShowLocale();
     else if($_GET['action'] == 'uncomplete') $Output .= Uncomplete();
     else $Output .= ShowMenu();

trunk/includes/Database.php

@@ -161 +161 @@
   {
     return(addslashes($Text));
+  }
+  
+  function quote($Text)
+  {
+        return($this->PDO->quote($Text));
   }  
 }

trunk/includes/Locale.php

@@ -4 +4 @@
 {
         var $Data;
+        var $Code;
 
   function __construct()
   {
         $this->Data = array();
+        $this->Code = 'en';
   }     
   
@@ -15 +17 @@
 }
 
-class Locale 
+class Locale extends Model
 {
         var $Texts;
@@ -42 +44 @@
                 $this->Texts->Load();
         }
+        
+        function AnalyzeCode($Path)
+  {
+        // Search for php files
+    $FileList = scandir($Path);
+    foreach($FileList as $FileName)
+    {
+        $FullName = $Path.'/'.$FileName;
+        if(($FileName == '.') or ($FileName == '..')) ; // Skip virtual items
+        else if(substr($FileName, 0, 1) == '.') ; // Skip Linux hidden files
+        else if(is_dir($FullName)) $this->AnalyzeCode($FullName);
+      else if(file_exists($FullName))
+      {
+        if(substr($FullName, -4) == '.php') 
+        {
+                $Content = file_get_contents($FullName);
+                // Search occurence of T() function
+                while(strpos($Content, 'T(') !== false)
+                { 
+                        $Previous = strtolower(substr($Content, strpos($Content, 'T(') - 1, 1));
+                        $Content = substr($Content, strpos($Content, 'T(') + 2);
+                        $Ord = ord($Previous);
+                        //echo($Ord.',');
+                        if(!(($Ord >= ord('a')) and ($Ord <= ord('z'))))
+                        {       
+                                // Do for non-alpha previous character                                            
+                          $Original = substr($Content, 0, strpos($Content, ')'));
+                          $Original2 = '';
+                          if((substr($Original, 0, 1) == "'") and (substr($Original, -1, 1) == "'")) 
+                            $Original2 = substr($Original, 1, -1);
+                          if((substr($Original, 0, 1) == '"') and (substr($Original, -1, 1) == '"')) 
+                            $Original2 = substr($Original, 1, -1);                        
+                          if($Original2 != '') 
+                          {
+                                if(!array_key_exists($Original2, $this->Texts->Data))
+                                  $this->Texts->Data[$Original2] = '';
+                          } 
+                        }
+                }               
+        }          
+      }           
+    }
+  }
+  
+  function SaveToFile($FileName)
+  {
+        $Content = '<?php'."\n".
+    ''."\n".
+    'class LocaleText'.$this->Texts->Code.' extends LocaleText'."\n".
+    '{'."\n".
+          '  function Load()'."\n".
+          '  {'."\n".
+          '    $this->Code = \'cs\';'."\n".
+                '    $this->Data = array('."\n";
+                foreach($this->Texts->Data as $Index => $Item)
+                {
+                        $Content .= "      '".$Index."' => '".$Item."',\n";
+                }
+                $Content .= '    );'."\n".
+          '  }'."\n".
+    '}'."\n";
+    file_put_contents($FileName, $Content);
+  }
+  
+  function LoadFromDatabase($Database, $LanguageId)
+  {
+        $this->Texts->Data = array();
+        $DbResult = $Database->select('Locale', '`Original`, `Translated`', '`Language`='.$LanguageId * 1);
+        while($DbRow = $DbResult->fetch_assoc())
+          $this->Texts->Data[$DbRow['Original']] = $DbRow['Translated'];
+  }
+
+  function SaveToDatabase(Database $Database, $LanguageId)
+  {
+        $Database->delete('Locale', '`Language`='.$LanguageId * 1);
+        foreach($this->Texts->Data as $Index => $Item)
+          $Database->query('INSERT INTO `Locale` (`Language`,`Original`,`Translated`) '.
+          'VALUES('.$LanguageId.','.$Database->quote($Index).','.$Database->quote($Item).')');
+  }
+
+  function UpdateToDatabase(Database $Database, $LanguageId)
+  {
+        foreach($this->Texts->Data as $Index => $Item)
+    {
+          $DbResult = $Database->select('Locale', '*', '`Original` ='.$Database->quote($Index));
+          if($DbResult->num_rows > 0)
+          $Database->update('Locale', '(`Language`='.($LanguageId * 1).') AND '.
+        '(`Original` ='.$Database->quote($Index).')', array('Translated' => $Item));
+          else $Database->insert('Locale', array('Language' => $LanguageId * 1, 
+       'Original' => $Index, 'Translated' => $Item));
+    }
+  }
 }
 

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 607; // Subversion revision
-$DatabaseRevision = 604; // Database structure revision 
+$Revision = 608; // Subversion revision
+$DatabaseRevision = 608; // Database structure revision 
 $ReleaseTime = '2013-11-26';

trunk/locale/cs.php

@@ -1 +1 @@
 <?php
 
-class LocaleTextCs extends LocaleText
+class LocaleTextcs extends LocaleText
 {
-        function Load()
-        {
-                $this->Data = array(
-                  'Access denied' => 'Nemáte oprávnění',
-                  'Show welcome' => 'Odkrýt úvod',
-                  'Hide welcome' => 'Skrýt úvod',
-                  'Registration' => 'Registrace',
-                  'Menu' => 'Nabídka',
-                );
-        }
+  function Load()
+  {
+    $this->Code = 'cs';
+    $this->Data = array(
+      'Access denied' => 'Nemáte oprávnění',
+      'Show welcome' => 'Odkrýt úvod',
+      'Hide welcome' => 'Skrýt úvod',
+      'Registration' => 'Registrace',
+      'Menu' => 'Nabídka',
+      'Home' => 'Domů',
+      'Main page' => 'Hlavní stránka',
+      'Last translated' => 'Poslední překlady',
+      'All news' => 'Všechny zprávy',
+      'Add' => 'Vložit',
+      'Message was sent.' => 'Zpráva byla odeslána.',
+    );
+  }
 }
-