Changeset 834 for trunk

Timestamp:

Aug 24, 2015, 11:33:23 PM (9 years ago)

Author:

chronos

Message:

• Fixed: For new automatically saved translation text use proper Take ID from english original text item. For edited text use previous ID.

Location:

trunk

Files:

• Modules/Translation/Save.php (modified) (5 diffs)
• includes/Version.php (modified) (1 diff)

trunk/Modules/Translation/Save.php

@@ -70 +70 @@
                 else $NewComplete = 0;
 
-              // Update completion status for saved translation item
+              // Update completion status for edited translation item
               if($SourceText['ID'] == $ExistedText['ID'])
               {
@@ -100 +100 @@
             {
               // Insert new user translation
+              $TakeID = $EnglishFound['ID'];
               $Columns = '`Entry`, `VersionStart`, `VersionEnd`, `Language`, `User`, `Take`, `ModifyTime`';
               $Values = $EnglishFound['Entry'].', '.$EnglishFound['VersionStart'].', '.
-                  $EnglishFound['VersionEnd'].', '.$Language.', '.$this->System->User->Id.', '.$EnglishFound['ID'].', NOW()';
+                  $EnglishFound['VersionEnd'].', '.$Language.', '.$this->System->User->Id.', '.$TakeID.', NOW()';
 
               $CompleteParts = 0;
@@ -128 +129 @@
               }
               if($Completable) $NewComplete = 1; // All parts of text are completed. Make entire text as completed
-              else $NewComplete = 0;
+                else $NewComplete = 0;
+              // Update completion status for edited translation item
               if($SourceText['ID'] == $EnglishFound['ID'])
               {
+                $TakeID = $TextID;
                 $NewComplete = $Complete; // Our original user text, set complete according user choice
                 if($Complete == 1)
@@ -146 +149 @@
                 $Group['Id'].'&amp;ID='.$LastID).'">'.$LastID.'</a> ze skupiny <a href="TranslationList.php?group='.
                 $Group['Id'].'&amp;user=0&amp;action=filter">'.$Group['Name'].'</a> uložen jako '.
-                $CompleteText[$NewComplete].'. Převzat z <a href="form.php?group='.$Group['Id'].'&amp;ID='.$TextID.'">'.$TextID.'</a>.<br/>';
+                $CompleteText[$NewComplete].'. Převzat z <a href="form.php?group='.$Group['Id'].'&amp;ID='.$TakeID.'">'.$TakeID.'</a>.<br/>';
               $this->System->ModuleManager->Modules['Log']->WriteLog('Text <a href="'.
                 $this->System->Link('/form.php?group='.$Group['Id'].'&amp;ID='.$LastID).'">'.
@@ -152 +155 @@
                 $Group['Id'].'&amp;user=0&amp;text=&amp;entry=&amp;action=filter">'.
                 $Group['Name'].'</a> uložen jako '.$CompleteText[$NewComplete].
-                '. Převzat z <a href="form.php?group='.$Group['Id'].'&amp;ID='.$TextID.'">'.$TextID.'</a>.', LOG_TYPE_TRANSLATION);
+                '. Převzat z <a href="form.php?group='.$Group['Id'].'&amp;ID='.$TakeID.'">'.$TakeID.'</a>.', LOG_TYPE_TRANSLATION);
             }
           }

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update.
 
-$Revision = 833; // Subversion revision
+$Revision = 834; // Subversion revision
 $DatabaseRevision = 811; // Database structure revision
 $ReleaseTime = '2015-08-24';