Changeset 893 for trunk/Modules/Translation/LoadNames.php

Timestamp:

Mar 6, 2023, 1:48:45 AM (21 months ago)

Author:

chronos

Message:

• Fixed: Class types casting for better type checking.
• Fixed: XML direct export.
• Modified: User class instance moved from Core class to ModuleUser class.

File:

• trunk/Modules/Translation/LoadNames.php (modified) (4 diffs)

trunk/Modules/Translation/LoadNames.php

@@ -20 +20 @@
     return $Text;
   }
+
   function ReplaceNotTranslated($orig,$tran,$Text,$ID,$Group)
   {
@@ -44 +45 @@
     $Text = str_replace('$r','<span Title="Znamená rasu hráče, překladu zachovej na stejné pozici." class="edit">$R</span>',$Text);
     $Text = str_replace('$g','<span Title="Vybere oslovení podle pohlaví hráče, překladu zachovej na stejné pozici." class="edit">$G</span>',$Text);
-    foreach ($names as $Line) {
-     if (($_GET['ID'] <> $Line[0]) or ($Line[1] <> $_GET['GroupId']))
-      if ($Line[3] <> '')  {
-        $Text = $this->ReplaceTranslated($Line[2],$Line[3],$Text,$Line[0],$Line[1]);
-
-      } else {
-        $Text = $this->ReplaceNotTranslated($Line[2],$Line[3],$Text,$Line[0],$Line[1]);
+    foreach ($names as $Line) 
+    {
+      if (($_GET['ID'] <> $Line[0]) or ($Line[1] <> $_GET['GroupId']))
+      {
+        if ($Line[3] <> '')  
+        {
+          $Text = $this->ReplaceTranslated($Line[2],$Line[3],$Text,$Line[0],$Line[1]);      
+        } else 
+        {
+          $Text = $this->ReplaceNotTranslated($Line[2],$Line[3],$Text,$Line[0],$Line[1]);
+        }
       }
     }
@@ -58 +63 @@
   function LoadNames()
   {
+    $User = ModuleUser::Cast($this->System->GetModule('User'))->User;
     $TranslationTree = $this->System->ModuleManager->Modules['Translation']->GetTranslationTree();
 
@@ -72 +78 @@
           $Text = $LineAJ[$Column];
           $names = array();
-          if ($this->System->User->Licence(LICENCE_USER))
+          if ($User->Licence(LICENCE_USER))
           if (($GroupId < 4) or ($GroupId == 10) or ($GroupId == 11))
           {
             //<span class="edit">barvou.</span>
             $names = GetTranslatNames($Text, 0, GetTranslatNamesArray());
-          } else {
-            if (($GroupId == 13)) {
+          } else 
+          {
+            if (($GroupId == 13)) 
+            {
               $names = GetTranslatNames($Text, 0, array('Dictionary' => 'Text',
                 'TextGlobalString' => 'Text', 'TextArea' => 'Name',
                 'TextItemSubClass' => 'Name', 'TextCharacterRace' => 'Name1',), false);
-            } else {
+            } else 
+            {
               $names = GetTranslatNames($Text, 0, GetTranslatNamesArray());
             }
           }
-                                   //$LineAJ[$Column]
+          //$LineAJ[$Column]
           return $this->ColorNames(htmlspecialchars($Text),$names);
     }