Changeset 855 for trunk

Timestamp:

Jan 19, 2016, 11:10:33 PM (9 years ago)

Author:

chronos

Message:

• Modified: Translation groups sorted by localized name again.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Modules/Translation/TranslationList.php (modified) (3 diffs)
• includes/Global.php (modified) (1 diff)
• includes/Locale.php (modified) (2 diffs)
• includes/System.php (modified) (1 diff)

trunk/Application/Version.php

@@ -7 +7 @@
 
 $Version = '1.0-alfa';
-$Revision = 852; // Subversion revision
+$Revision = 855; // Subversion revision
 $DatabaseRevision = 849; // Database structure revision
-$ReleaseTime = '2016-01-17';
+$ReleaseTime = '2016-01-19';

trunk/Modules/Translation/TranslationList.php

@@ -23 +23 @@
 
     $Output = '<form action="?" method="post">'.
-        '<table class="BaseTable"><tr>'.
-        '<th>'.T('Processing').'</th>'.
-        '<th>'.T('Group').'</th>'.
-        '<th>'.T('Version').'</th>'.
-        '<th>'.T('Language').'</th>'.
-        '<th>'.T('Translator').'</th>'.
-        '<th>'.T('Words').'</th>'.
-        '<th>'.T('Item').'</th>'.
-        '<th></th></tr><tr>';
+      '<table class="BaseTable"><tr>'.
+      '<th>'.T('Processing').'</th>'.
+      '<th>'.T('Group').'</th>'.
+      '<th>'.T('Version').'</th>'.
+      '<th>'.T('Language').'</th>'.
+      '<th>'.T('Translator').'</th>'.
+      '<th>'.T('Words').'</th>'.
+      '<th>'.T('Item').'</th>'.
+      '<th></th></tr><tr>';
 
     // State
@@ -73 +73 @@
     else $Selected = '';
     $Output .= '<option value="0"'.$Selected.'>'.T('All').'</option>';
-    $DbResult = $this->Database->query('SELECT `Id`,`Name` FROM `Group` ORDER BY `Name`');
+    $DbResult = $this->Database->query('SELECT `Id`,`Name` FROM `Group`');
     while($Group = $DbResult->fetch_assoc())
+      $Groups[T($Group['Name'])] = $Group;
+    ksort($Groups);
+    foreach($Groups as $Group)
     {
       if($Group['Id'] == $Filter['Group']) $Selected = ' selected="selected"';
@@ -382 +385 @@
       $Filter = $this->ShowFilter();
       if($Filter['Group'] > 0) $Output = $this->ShowTranslationList($Filter);
-      else $Output = $this->ShowGroupList($Filter);
+        else $Output = $this->ShowGroupList($Filter);
     }
     return($Output);

trunk/includes/Global.php

@@ -343 +343 @@
 
   $Result = array();
-  $DbResult = $System->Database->query('SELECT *, UNIX_TIMESTAMP(`LastImport`) AS `LastImportTime` FROM `Group` ORDER BY `Name`');
+  $Groups = array();
+  $DbResult = $System->Database->query('SELECT *, UNIX_TIMESTAMP(`LastImport`) AS `LastImportTime` FROM `Group`');
   while($DbRow = $DbResult->fetch_assoc())
-  {
-    $DbRow['Items'] = array();
-    $DbRow['Name'] = T($DbRow['Name']);
-    $Result[$DbRow['Id']] = $DbRow;
+    $Groups[T($DbRow['Name'])] = $DbRow;
+  ksort($Groups);
+  foreach($Groups as $Group)
+  {
+    $Group['Items'] = array();
+    $Group['Game'] = T($Group['Name']);
+    $Result[$Group['Id']] = $Group;
   }
   $DbResult = $System->Database->query('SELECT * FROM `GroupItem` ORDER BY `Group`, `Sequence`');

trunk/includes/Locale.php

@@ -147 +147 @@
   function UpdateToDatabase(Database $Database, $LangCode)
   {
-    $DbResult = $Database->select('Language', '*', 'Code='.$Database->quote($LangCode));
+    $DbResult = $Database->select('Language', '*', '`Code`='.$Database->quote($LangCode));
     if($DbResult->num_rows > 0)
     {
@@ -153 +153 @@
       foreach($this->Texts->Data as $Index => $Item)
       {
-        $DbResult = $Database->select('Locale', '*', '(`Original` ='.$Database->quote($Index).') AND (`Language`='.($Language['Id']).')');
+        $DbResult = $Database->select('Locale', '*', '(`Original` ='.$Database->quote($Index).
+          ') AND (`Language`='.($Language['Id']).')');
         if($DbResult->num_rows > 0)
         $Database->update('Locale', '(`Language`='.($Language['Id']).') AND '.

trunk/includes/System.php

@@ -452 +452 @@
     while($Group = $DbResult->fetch_assoc())
     {
+      $Groups[T($Group['Name'])] = $Group;
+    }
+    ksort($Groups);
+    foreach($Groups as $Group)
+    {
       $Output .= '<div id="menuitem-group'.$Group['Id'].'" onmouseover="show(\'group'.$Group['Id'].'\')" onmouseout="hide(\'group'.$Group['Id'].'\')">'.
         '<a href="'.$this->System->Link('/TranslationList.php?group='.$Group['Id'].