Changeset 10 for Common/Locale.php

Timestamp:

Apr 7, 2020, 8:52:35 PM (5 years ago)

Author:

chronos

Message:

• Modified: Improved code formatting.

File:

• Common/Locale.php (modified) (14 diffs)

Common/Locale.php

@@ -20 +20 @@
   function Translate($Text, $Group = '')
   {
-    if(array_key_exists($Text, $this->Data[$Group]) and ($this->Data[$Group][$Text] != ''))
-      return($this->Data[$Group][$Text]);
-      else return($Text);
+    if (array_key_exists($Text, $this->Data[$Group]) and ($this->Data[$Group][$Text] != ''))
+      return $this->Data[$Group][$Text];
+      else return $Text;
   }
 
@@ -28 +28 @@
   {
     $Key = array_search($Text, $this->Data[$Group]);
-    if(($Key === FALSE) or ($this->Data[$Group][$Key] == '')) return($Text);
-      else return($Key);
+    if (($Key === FALSE) or ($this->Data[$Group][$Key] == '')) return $Text;
+      else return $Key;
   }
 }
@@ -47 +47 @@
   {
     $FileName = $this->Dir.'/'.$Language.'.php';
-    if(file_exists($FileName)) {
+    if (file_exists($FileName)) {
       include_once($FileName);
       $ClassName = 'LocaleText'.$Language;
@@ -59 +59 @@
     // Search for php files
     $FileList = scandir($Path);
-    foreach($FileList as $FileName)
+    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')
+      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)
+          while (strpos($Content, 'T(') !== false)
           {
             $Previous = strtolower(substr($Content, strpos($Content, 'T(') - 1, 1));
@@ -77 +77 @@
             $Ord = ord($Previous);
             //echo($Ord.',');
-            if(!(($Ord >= ord('a')) and ($Ord <= ord('z'))))
+            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) == "'"))
+              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) == '"'))
+              if ((substr($Original, 0, 1) == '"') and (substr($Original, -1, 1) == '"'))
                 $Original2 = substr($Original, 1, -1);
-              if($Original2 != '')
+              if ($Original2 != '')
               {
-                if(!array_key_exists($Original2, $this->Texts->Data))
+                if (!array_key_exists($Original2, $this->Texts->Data))
                   $this->Texts->Data[$Original2] = '';
               }
@@ -109 +109 @@
     '    $this->Title = \''.$this->Texts->Title.'\';'."\n".
     '    $this->Data = array('."\n";
-    foreach($this->Texts->Data as $Index => $Item)
+    foreach ($this->Texts->Data as $Index => $Item)
     {
       $Content .= "      '".$Index."' => '".$Item."',\n";
@@ -122 +122 @@
   {
     $DbResult = $Database->select('Language', '*', 'Code='.$Database->quote($LangCode));
-    if($DbResult->num_rows > 0)
+    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())
+      while ($DbRow = $DbResult->fetch_assoc())
         $this->Texts->Data[$DbRow['Original']] = $DbRow['Translated'];
     }
@@ -135 +135 @@
   {
     $DbResult = $Database->select('Language', '*', 'Code='.$Database->quote($LangCode));
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $Language = $DbResult->fetch_assoc();
       $Database->delete('Locale', '`Language`='.$Language['Id']);
-      foreach($this->Texts->Data as $Index => $Item)
+      foreach ($this->Texts->Data as $Index => $Item)
         $Database->query('INSERT INTO `Locale` (`Language`,`Original`,`Translated`) '.
         'VALUES('.$Language['Id'].','.$Database->quote($Index).','.$Database->quote($Item).')');
@@ -148 +148 @@
   {
     $DbResult = $Database->select('Language', '*', '`Code`='.$Database->quote($LangCode));
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $Language = $DbResult->fetch_assoc();
-      foreach($this->Texts->Data as $Index => $Item)
+      foreach ($this->Texts->Data as $Index => $Item)
       {
         $DbResult = $Database->select('Locale', '*', '(`Original` ='.$Database->quote($Index).
           ') AND (`Language`='.($Language['Id']).')');
-        if($DbResult->num_rows > 0)
+        if ($DbResult->num_rows > 0)
         $Database->update('Locale', '(`Language`='.($Language['Id']).') AND '.
           '(`Original` ='.$Database->quote($Index).')', array('Translated' => $Item));
@@ -188 +188 @@
     $this->Available = array();
     $FileList = scandir($this->Dir);
-    foreach($FileList as $FileName)
-    {
-      if(substr($FileName, -4) == '.php')
+    foreach ($FileList as $FileName)
+    {
+      if (substr($FileName, -4) == '.php')
       {
         $Code = substr($FileName, 0, -4);
@@ -206 +206 @@
     $Locale->AnalyzeCode($Directory);
     $FileList = scandir($this->Dir);
-    foreach($FileList as $FileName)
-    {
-      if(substr($FileName, -4) == '.php')
+    foreach ($FileList as $FileName)
+    {
+      if (substr($FileName, -4) == '.php')
       {
         $FileLocale = new LocaleFile($this->System);
@@ -215 +215 @@
 
         // Add new
-        foreach($Locale->Texts->Data as $Index => $Item)
-          if(!array_key_exists($Index, $FileLocale->Texts->Data))
+        foreach ($Locale->Texts->Data as $Index => $Item)
+          if (!array_key_exists($Index, $FileLocale->Texts->Data))
             $FileLocale->Texts->Data[$Index] = $Item;
         // Remove old
-        foreach($FileLocale->Texts->Data as $Index => $Item)
-          if(!array_key_exists($Index, $Locale->Texts->Data))
+        foreach ($FileLocale->Texts->Data as $Index => $Item)
+          if (!array_key_exists($Index, $Locale->Texts->Data))
             unset($FileLocale->Texts->Data[$Index]);
         $FileLocale->UpdateToDatabase($this->System->Database, $FileLocale->Texts->Code);
@@ -232 +232 @@
   function LoadLocale($Code)
   {
-    if(array_key_exists($Code, $this->Available))
+    if (array_key_exists($Code, $this->Available))
     {
       $this->CurrentLocale->Dir = $this->Dir;
@@ -245 +245 @@
   global $GlobalLocaleManager;
 
-  if(isset($GlobalLocaleManager)) return($GlobalLocaleManager->CurrentLocale->Texts->Translate($Text, $Group));
-    else return($Text);
-}
+  if (isset($GlobalLocaleManager)) return $GlobalLocaleManager->CurrentLocale->Texts->Translate($Text, $Group);
+    else return $Text;
+}