Changeset 610

Timestamp:

Nov 26, 2013, 11:16:15 PM (11 years ago)

Author:

chronos

Message:

• Added: Identification code to language list.
• Fixed: Locale update to database used fixed language id. Now id is detected from language code.

Location:

trunk

Files:

• admin/UpdateTrace.php (modified) (2 diffs)
• admin/index.php (modified) (1 diff)
• includes/Locale.php (modified) (1 diff)
• includes/Version.php (modified) (1 diff)
• includes/system.php (modified) (10 diffs)
• locale/cs.php (modified) (1 diff)
• locale/en.php (modified) (1 diff)

trunk/admin/UpdateTrace.php

@@ -2639 +2639 @@
 }
 
+function UpdateTo610($Manager)
+{
+  $Manager->Execute('ALTER TABLE `Language` ADD `Default` INT NOT NULL ,
+ADD `Code` VARCHAR( 255 ) NOT NULL ;');
+  $Manager->Execute('UPDATE `Language` SET `Default` = 1,
+`Code` = "en" WHERE `Language`.`Name` ="Angličitna";');
+  $Manager->Execute('UPDATE `Language` SET `Code` = "cs" WHERE `Language`.`Name` ="Čeština";');
+  $Manager->Execute('UPDATE `Language` SET `Code` = "sk" WHERE `Language`.`Name` ="Slovenština";');   
+}
+
+
 $Updates = array(
         498 => array('Revision' => 506, 'Function' => 'UpdateTo506'),
@@ -2652 +2663 @@
         600 => array('Revision' => 604, 'Function' => 'UpdateTo604'),
         604 => array('Revision' => 609, 'Function' => 'UpdateTo609'),
+        609 => array('Revision' => 610, 'Function' => 'UpdateTo610'),
 );

trunk/admin/index.php

@@ -95 +95 @@
         
         $Locale->AnalyzeCode(dirname(dirname(__FILE__)));
-        $Locale->UpdateToDatabase($System->Database, 3);
+        $Locale->UpdateToDatabase($System->Database, $Locale->Texts->Code);
         $FileName = dirname(dirname(__FILE__)).'/locale/'.$Locale->Texts->Code.'.php';
         $Locale->SaveToFile($FileName);

trunk/includes/Locale.php

@@ -108 +108 @@
   }
   
-  function LoadFromDatabase($Database, $LanguageId)
+  function LoadFromDatabase($Database, $LangCode)
   {
-        $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'];
+        $DbResult = $Database->select('Language', '*', 'Code='.$Database->quote($LangCode));
+        if($DbResult->num_rows > 0)
+        {
+          $Language = $DbResult->fetch_assoc();
+        $this->Texts->Data = array();
+        $DbResult = $Database->select('Locale', '`Original`, `Translated`', '`Language`='.$Language['Id']);
+          while($DbRow = $DbResult->fetch_assoc())
+            $this->Texts->Data[$DbRow['Original']] = $DbRow['Translated'];
+        }
   }
 
-  function SaveToDatabase(Database $Database, $LanguageId)
+  function SaveToDatabase(Database $Database, $LangCode)
   {
-        $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).')');
+        $DbResult = $Database->select('Language', '*', 'Code='.$Database->quote($LangCode));
+        if($DbResult->num_rows > 0)
+        {
+          $Language = $DbResult->fetch_assoc();
+          $Database->delete('Locale', '`Language`='.$Language['Id']);
+          foreach($this->Texts->Data as $Index => $Item)
+          $Database->query('INSERT INTO `Locale` (`Language`,`Original`,`Translated`) '.
+            'VALUES('.$Language['Id'].','.$Database->quote($Index).','.$Database->quote($Item).')');
+        }
   }
 
-  function UpdateToDatabase(Database $Database, $LanguageId)
+  function UpdateToDatabase(Database $Database, $LangCode)
   {
-        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));
-    }
+        $DbResult = $Database->select('Language', '*', 'Code='.$Database->quote($LangCode));
+        if($DbResult->num_rows > 0)
+        {
+          $Language = $DbResult->fetch_assoc();
+        foreach($this->Texts->Data as $Index => $Item)
+      {
+            $DbResult = $Database->select('Locale', '*', '(`Original` ='.$Database->quote($Index).') AND (`Language`='.($Language['Id']).')');
+          if($DbResult->num_rows > 0)
+          $Database->update('Locale', '(`Language`='.($Language['Id']).') AND '.
+          '(`Original` ='.$Database->quote($Index).')', array('Translated' => $Item));
+          else $Database->insert('Locale', array('Language' => $Language['Id'], 
+         'Original' => $Index, 'Translated' => $Item));
+      }
+        }
   }
 }

trunk/includes/Version.php

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

trunk/includes/system.php

@@ -39 +39 @@
     (                   
                 array(
-                                'Title' => 'Soubory',
+                                'Title' => T('Files'),
                                 'Hint' => 'Stahování různých pomocných souborů a programů',
                                 'Link' => $this->Link('/download.php'),
@@ -46 +46 @@
                 ),
                 array(
-                                'Title' => 'Pokyny',
+                                'Title' => T('Instructions'),
                                 'Hint' => 'Informace k překladu hry',
                                 'Link' => $this->Link('/info.php'),
@@ -53 +53 @@
                 ),
                 array(
-                                'Title' => 'Zdroje dat',
+                                'Title' => T('Data source'),
                                 'Hint' => 'Informace o překladových skupinách',
                                 'Link' => $this->Link('/TranslationList.php?action=grouplist'),
@@ -60 +60 @@
                 ),
                 array(
-                                'Title' => 'Prezentace',
+                                'Title' => T('Presentation'),
                                 'Hint' => 'Prezentace a motivace překladu',
                                 'Link' => $this->Link('/promotion.php'),
@@ -67 +67 @@
                 ),              
                 array(
-                                'Title' => 'IRC chat',
+                                'Title' => T('IRC chat'),
                                 'Hint' => 'IRC chat pro překladatele',
                                 'Link' => 'http://embed.mibbit.com/?server=game.zdechov.net%3A6667&channel=%23wowpreklad&forcePrompt=true&charset=utf-8',
@@ -74 +74 @@
                 ),
                 array(
-                                'Title' => 'Správa',
+                                'Title' => T('Administration'),
                                 'Hint' => 'Volby pro správu',
                                 'Link' => $this->Link('/admin/'),
@@ -208 +208 @@
           $this->ModuleManager->Modules['Log']->WriteLog('Stránka "'.
           implode('/', $this->PathItems).'" nenalezena'.$Referer, LOG_TYPE_PAGE_NOT_FOUND);
-    return(ShowMessage('Stránka "'.implode('/', $this->PathItems).'" nenalezena.', MESSAGE_CRITICAL));
+    return(ShowMessage(sprintf(T('Page "%s" not found'), implode('/', $this->PathItems)), MESSAGE_CRITICAL));
   }
   
@@ -238 +238 @@
                         //$Team = $DbResult->fetch_assoc();
                         //$Output .= ''<span class="MenuItem">Moje překlady: <a href="">Dokončené</a> <a href="">Rozpracované</a> <a href="">Exporty</a> Tým: <a href="">'.$Team['name'].'</a></span>';
-                        $Output .= '<span class="MenuItem2">'.$this->System->User->Name.' <a href="'.$this->System->Link('/?action=logout').'">Odhlášení</a>'.
+                        $Output .= '<span class="MenuItem2">'.$this->System->User->Name.' <a href="'.$this->System->Link('/?action=logout').'">'.T('Logout').'</a>'.
                                         ' <a href="'.$this->System->Link('/user.php?user='.$this->System->User->Id).'">'.T('My page').'</a>'.
                                         ' <a href="'.$this->System->Link('/Options.php').'">'.T('Options').'</a>'.
                                         ' <a title="Vámi přeložené texty" href="'.$this->System->Link('/TranslationList.php?user='.
-                                        $this->System->User->Id.'&amp;group=0&amp;state=2&amp;text=&amp;entry=').'">Přeložené</a>'.
+                                        $this->System->User->Id.'&amp;group=0&amp;state=2&amp;text=&amp;entry=').'">'.T('Translated').'</a>'.
                                         ' <a title="Vaše rozpracované text" href="'.$this->System->Link('/TranslationList.php?user='.
-                                        $this->System->User->Id.'&amp;group=0&amp;state=3&amp;text=&amp;entry=').'">Rozpracované</a>'.
-                                        ' <a title="Nikým nepřeložené texty" href="'.$this->System->Link('/TranslationList.php?user=0&amp;group=0&amp;state=1&amp;text=&amp;entry=').'">Nepřeložené</a>'.
+                                        $this->System->User->Id.'&amp;group=0&amp;state=3&amp;text=&amp;entry=').'">'.T('Unfinished').'</a>'.
+                                        ' <a title="Nikým nepřeložené texty" href="'.$this->System->Link('/TranslationList.php?user=0&amp;group=0&amp;state=1&amp;text=&amp;entry=').'">'.T('Untranslated').'</a>'.
                                         '</span>';
                 } else
@@ -287 +287 @@
         function ShowSearchBox()
         {
-                $Output = '<strong>Hledání:</strong>'.
+                $Output = '<strong>'.T('Search').':</strong>'.
                                 '<form action="'.$this->System->Link('/search/').'" method="get"><div>'.                        
                                 '<table>'.
@@ -294 +294 @@
                                 '</tr>'.
                                 '<tr>'.
-                                '<th><input type="submit" value="Hledat" /></th>'.
+                                '<th><input type="submit" value="'.T('Do search').'" /></th>'.
                                 '</tr>'.
                                 '</table></div>'.

trunk/locale/cs.php

@@ -31 +31 @@
       'Online translators' => 'Online překladatelé',
       'Servers' => 'Servery',
+      'Logout' => 'Odhlášení',
+      'Translated' => 'Přeložené',
+      'Files' => 'Soubory',
+      'Instructions' => 'Pokyny',
+      'Data source' => 'Zdroje dat',
+      'Presentation' => 'Prezentace',
+      'IRC chat' => 'IRC chat',
+      'Administration' => 'Správa',
+      'Page "%s" not found' => 'Stránka "%s" nenalezena',
+      'Unfinished' => 'Rozpracované',
+      'Untranslated' => 'Nepřeložené',
+      'Search' => 'Vyhledávání',
+      'Do search' => 'Hledat',
     );
   }

trunk/locale/en.php

@@ -5 +5 @@
   function Load()
   {
-    $this->Code = 'cs';
+    $this->Code = 'en';
     $this->Data = array(
       'Access denied' => '',