Changeset 736

Timestamp:

Jan 8, 2014, 7:04:37 PM (11 years ago)

Author:

maron

Message:

• Added: LoadNames after loaded base translation

Location:

trunk

Files:

• Modules/Translation/Form.php (modified) (3 diffs)
• Modules/Translation/LoadNames.php (added)
• includes/Version.php (modified) (1 diff)

trunk/Modules/Translation/Form.php

@@ -5 +5 @@
   var $GroupId;
   var $ID;
-  function ReplaceTranslated($orig,$tran,$Text,$ID,$Group) {
-         $tran_replace = str_replace(' ',' ',htmlspecialchars($tran));
-         $orig_replace = str_replace(' ',' ',htmlspecialchars($orig));
-
-       //  if (strlen($orig) < strlen($Text)-1) {
-                                  if ($Group <> '') {
-              $Text = str_replace(' '.$orig,' <span Title="Přelož jako:&nbsp;'.$tran_replace.'" class="edit"><a class="edit" target="_NEW2" href="'.$this->System->Link('/form.php?group='.$Group.'&amp;ID='.$ID).'">'.$orig_replace.'</a></span>',$Text);
-            } else {  
-              $Text = str_replace(' '.$orig,' <span Title="Přelož jako:&nbsp;'.$tran_replace.'" class="edit"><a class="edit" target="_NEW2" href="'.$this->System->Link('/dictionary/?search='.$tran).'">'.$orig_replace.'</a></span>',$Text);
-            }
-                        //       }
-         return ($Text);
-  }
-  function ReplaceNotTranslated($orig,$tran,$Text,$ID,$Group) {
-//         echo $orig.'-'.$Text.'<br>';
-         $orig_replace = str_replace(' ','&nbsp;',htmlspecialchars($orig));
-         
-         $Text = str_replace(' '.$orig,' <span title="Kliknutím přeložíš" class="needtran"><a class="needtran" target="_NEW2" href="'.$this->System->Link('/form.php?group='.$Group.'&amp;ID='.$ID).'">'.$orig_replace.'</a></span>',$Text);
-                                 return ($Text);
-  }
-  
-        function ColorNames($Text, $names)
-        {
-    $Text = ' '.$Text;
-    $Text = str_replace('$B$B','$B$B ',$Text);
-    
-          $Text = str_replace('$B','<span Title="Znamená odřádkování, překladu zachovej na stejné pozici." class="edit">$B</span>',$Text);
-          $Text = str_replace('$N','<span Title="Znamená jméno hráče, překladu zachovej na stejné pozici." class="edit">$N</span>',$Text);
-          $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);
-          $Text = str_replace('$b','<span Title="Znamená odřádkování, překladu zachovej na stejné pozici." class="edit">$B</span>',$Text);
-          $Text = str_replace('$n','<span Title="Znamená jméno hráče, překladu zachovej na stejné pozici." class="edit">$N</span>',$Text);
-          $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 (($this->ID <> $Line[0]) or ($Line[1] <> $this->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]);
-                        }
-                }
-                return $Text;
-        }               
 
         function Show()
@@ -243 +198 @@
                                         $Output .= '</td></tr>';
         
-                                        // Difference highlighting
-                                        $Text = '';
+          //todo javascritp
+        
+            $Output .= '<script src="http://code.jquery.com/jquery-latest.js"></script>'.
+               '<script>';
+          $Output .=    '$(document).ready(function() {';
                                         foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
-                                                if($TextItem['Visible'] == 1)
-                                                $Text = $Text.' '.$LineAJ[$TextItem['Column']];
-        
-                $names = array();
-                if ($this->System->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)) {
-                                                $names = GetTranslatNames($Text, 0, array('Dictionary' => 'Text', 'TextGlobalString' => 'Text', 'TextArea' => 'Name', 'TextCharacterClass' => 'Name','TextCharacterRace' => 'Name1',),false);
-            } else {
-                                                $names = GetTranslatNames($Text, 0, array('Dictionary' => 'Text'));
-                                        }
-                                        }
-        
+            $Output .=   '$("#'.$TextItem['Column'].'").load("'.$this->System->Link('/Modules/Translation/LoadNames.php?ID='.$LineAJ['ID'].'&Column='.$TextItem['Column'].'&GroupId='.$GroupId).'");';
+          
+          $Output .= '});'.
+               '</script>';
+
                                         foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
                                                 if($TextItem['Visible'] == 1)
@@ -270 +217 @@
                                                                         $Output .= '<tr><th>'.$LineAJ['ShortCut'].'</th>';
                                                                 else $Output .= '<tr><th>'.$TextItem['Name'].'</th>';
-                                                                $Output .= '<td>'.str_replace("\n", '<br/>', $this->ColorNames(htmlspecialchars($LineAJ[$TextItem['Column']]),$names)).'</td>
+                                                                $Output .= '<td id="'.$TextItem['Column'].'">'.str_replace("\n", '<br/>', htmlspecialchars($LineAJ[$TextItem['Column']])).'</td>
                                                                 <td>';
                                                                 if($this->System->User->Licence(LICENCE_USER)) 

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 735; // Subversion revision
+$Revision = 736; // Subversion revision
 $DatabaseRevision = 732; // Database structure revision 
 $ReleaseTime = '2014-01-08';