Changeset 633

Timestamp:

Dec 9, 2013, 9:08:12 PM (10 years ago)

Author:

maron

Message:

• Fixed: ColorNames only the longest not tran
• Added: Show left last version tran text at original text

Location:

trunk

Files:

• Modules/Translation/Form.php (modified) (7 diffs)
• includes/Version.php (modified) (1 diff)

trunk/Modules/Translation/Form.php

@@ -3 +3 @@
 class PageTranslationForm extends Page
 {
+  var $GroupId;
+  var $ID;
   function ReplaceTranslated($orig,$tran,$Text,$ID,$Group) {
-         $tran_replace = str_replace(' ',' ',$tran);
-         $orig_replace = str_replace(' ',' ',$orig);
-
-         if (strlen($orig) < strlen($Text)-1) {
+         $tran_replace = str_replace(' ','&nbsp;',htmlspecialchars($tran));
+         $orig_replace = str_replace(' ','&nbsp;',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);
@@ -13 +15 @@
               $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) {
-         $orig_replace = str_replace(' ','&nbsp;',$orig);
+//         echo $orig.'-'.$Text.'<br>';
+         $orig_replace = str_replace(' ','&nbsp;',htmlspecialchars($orig));
          
-//         echo $orig.'-'.$Text.'<br>';
-         if (strlen($orig) < strlen($Text)-1)
-                                 $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);
+         $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);
   }
@@ -28 +29 @@
         {
     $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);
@@ -38 +40 @@
           $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 ($Line[3] <> '') {
+                 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]);
         
@@ -65 +68 @@
         
                 $GroupId = LoadGroupIdParameter();
+                $this->GroupId = $GroupId;
                 $Table = $TranslationTree[$GroupId]['TablePrefix'];
                 if(array_key_exists('action', $_GET)) $Action = $_GET['action'];
@@ -72 +76 @@
                 {
                         $TextID = $_GET['ID'] * 1;
+                  $this->ID = $TextID;
         
                         $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE `ID` = '.$TextID);
@@ -84 +89 @@
                                 $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE '.
                                         '(`Language` != '.$this->System->Config['OriginalLanguage'].') AND '.
-                                        '(`Entry` = '.$Line['Entry'].') LIMIT 1');
+                                        '(`Entry` = '.$Line['Entry'].') ORDER BY `ModifyTime` DESC LIMIT 1');
                                 $LineSearch = $DbResult->fetch_assoc();
                                         foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 632; // Subversion revision
+$Revision = 633; // Subversion revision
 $DatabaseRevision = 610; // Database structure revision 
 $ReleaseTime = '2013-12-08';