Changeset 95 for trunk/Packages/Common/Locale.php

Timestamp:

Dec 6, 2021, 11:33:48 AM (3 years ago)

Author:

chronos

Message:

• Modified: Updated Common package.
• Added: Explicit types for better type checking.
• Fixed: Support for php 8.0.

File:

• trunk/Packages/Common/Locale.php (modified) (16 diffs)

trunk/Packages/Common/Locale.php

@@ -3 +3 @@
 class LocaleText
 {
-  var $Data;
-  var $Code;
-  var $Title;
+  public array $Data;
+  public string $Code;
+  public string $Title;
 
   function __construct()
@@ -14 +14 @@
   }
 
-  function Load()
-  {
-  }
-
-  function Translate($Text, $Group = '')
+  function Load(): void
+  {
+  }
+
+  function Translate(string $Text, string $Group = ''): string
   {
     if (array_key_exists($Text, $this->Data[$Group]) and ($this->Data[$Group][$Text] != ''))
@@ -25 +25 @@
   }
 
-  function TranslateReverse($Text, $Group = '')
+  function TranslateReverse(string $Text, string $Group = ''): string
   {
     $Key = array_search($Text, $this->Data[$Group]);
@@ -35 +35 @@
 class LocaleFile extends Model
 {
-  var $Texts;
-  var $Dir;
+  public LocaleText $Texts;
+  public string $Dir;
 
   function __construct(System $System)
@@ -44 +44 @@
   }
 
-  function Load($Language)
+  function Load(string $Language): void
   {
     $FileName = $this->Dir.'/'.$Language.'.php';
@@ -55 +55 @@
   }
 
-  function AnalyzeCode($Path)
+  function AnalyzeCode(string $Path): void
   {
     // Search for php files
@@ -98 +98 @@
   }
 
-  function SaveToFile($FileName)
+  function SaveToFile(string $FileName): void
   {
     $Content = '<?php'."\n".
@@ -119 +119 @@
   }
 
-  function LoadFromDatabase($Database, $LangCode)
+  function LoadFromDatabase(Database $Database, string $LangCode): void
   {
     $DbResult = $Database->select('Language', '*', 'Code='.$Database->quote($LangCode));
@@ -132 +132 @@
   }
 
-  function SaveToDatabase(Database $Database, $LangCode)
-  {
-    $DbResult = $Database->select('Language', '*', 'Code='.$Database->quote($LangCode));
+  function SaveToDatabase(string $LangCode): void
+  {
+    $DbResult = $this->Database->select('Language', '*', 'Code='.$this->Database->quote($LangCode));
     if ($DbResult->num_rows > 0)
     {
       $Language = $DbResult->fetch_assoc();
-      $Database->delete('Locale', '`Language`='.$Language['Id']);
+      $this->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, $LangCode)
-  {
-    $DbResult = $Database->select('Language', '*', '`Code`='.$Database->quote($LangCode));
+        $this->Database->query('INSERT INTO `Locale` (`Language`,`Original`,`Translated`) '.
+        'VALUES('.$Language['Id'].','.$this->Database->quote($Index).','.$this->Database->quote($Item).')');
+    }
+  }
+
+  function UpdateToDatabase(string $LangCode): void
+  {
+    $DbResult = $this->Database->select('Language', '*', '`Code`='.$this->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).
+        $DbResult = $this->Database->select('Locale', '*', '(`Original` ='.$this->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'],
+        $this->Database->update('Locale', '(`Language`='.($Language['Id']).') AND '.
+          '(`Original` ='.$this->Database->quote($Index).')', array('Translated' => $Item));
+        else $this->Database->insert('Locale', array('Language' => $Language['Id'],
          'Original' => $Index, 'Translated' => $Item));
       }
@@ -167 +167 @@
 class LocaleManager extends Model
 {
-  var $CurrentLocale;
-  var $Codes;
-  var $Dir;
-  var $LangCode;
-  var $DefaultLangCode;
-  var $Available;
+  public LocaleFile $CurrentLocale;
+  public array $Codes;
+  public string $Dir;
+  public string $LangCode;
+  public string $DefaultLangCode;
+  public array $Available;
 
   function __construct(System $System)
@@ -182 +182 @@
     $this->DefaultLangCode = 'en';
     $this->Available = array();
-  }
-
-  function LoadAvailable()
+    $this->Dir = '';
+  }
+
+  function LoadAvailable(): void
   {
     $this->Available = array();
@@ -201 +202 @@
   }
 
-  function UpdateAll($Directory)
+  function UpdateAll(string $Directory): void
   {
     $Locale = new LocaleFile($this->System);
@@ -222 +223 @@
           if (!array_key_exists($Index, $Locale->Texts->Data))
             unset($FileLocale->Texts->Data[$Index]);
-        $FileLocale->UpdateToDatabase($this->System->Database, $FileLocale->Texts->Code);
+        $FileLocale->UpdateToDatabase($FileLocale->Texts->Code);
         $FileName = $this->Dir.'/'.$FileLocale->Texts->Code.'.php';
         $FileLocale->SaveToFile($FileName);
@@ -230 +231 @@
   }
 
-  function LoadLocale($Code)
+  function LoadLocale(string $Code): void
   {
     if (array_key_exists($Code, $this->Available))
@@ -241 +242 @@
 
 // Short named global translation function
-function T($Text, $Group = '')
+function T(string $Text, string $Group = ''): string
 {
   global $GlobalLocaleManager;