Changeset 610 for trunk/includes/Locale.php

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.

File:

• trunk/includes/Locale.php (modified) (1 diff)

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