Changeset 834 for trunk


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Modules/Translation/Save.php

    r833 r834  
    7070                else $NewComplete = 0;
    7171
    72               // Update completion status for saved translation item
     72              // Update completion status for edited translation item
    7373              if($SourceText['ID'] == $ExistedText['ID'])
    7474              {
     
    100100            {
    101101              // Insert new user translation
     102              $TakeID = $EnglishFound['ID'];
    102103              $Columns = '`Entry`, `VersionStart`, `VersionEnd`, `Language`, `User`, `Take`, `ModifyTime`';
    103104              $Values = $EnglishFound['Entry'].', '.$EnglishFound['VersionStart'].', '.
    104                   $EnglishFound['VersionEnd'].', '.$Language.', '.$this->System->User->Id.', '.$EnglishFound['ID'].', NOW()';
     105                  $EnglishFound['VersionEnd'].', '.$Language.', '.$this->System->User->Id.', '.$TakeID.', NOW()';
    105106
    106107              $CompleteParts = 0;
     
    128129              }
    129130              if($Completable) $NewComplete = 1; // All parts of text are completed. Make entire text as completed
    130               else $NewComplete = 0;
     131                else $NewComplete = 0;
     132              // Update completion status for edited translation item
    131133              if($SourceText['ID'] == $EnglishFound['ID'])
    132134              {
     135                $TakeID = $TextID;
    133136                $NewComplete = $Complete; // Our original user text, set complete according user choice
    134137                if($Complete == 1)
     
    146149                $Group['Id'].'&amp;ID='.$LastID).'">'.$LastID.'</a> ze skupiny <a href="TranslationList.php?group='.
    147150                $Group['Id'].'&amp;user=0&amp;action=filter">'.$Group['Name'].'</a> uložen jako '.
    148                 $CompleteText[$NewComplete].'. Převzat z <a href="form.php?group='.$Group['Id'].'&amp;ID='.$TextID.'">'.$TextID.'</a>.<br/>';
     151                $CompleteText[$NewComplete].'. Převzat z <a href="form.php?group='.$Group['Id'].'&amp;ID='.$TakeID.'">'.$TakeID.'</a>.<br/>';
    149152              $this->System->ModuleManager->Modules['Log']->WriteLog('Text <a href="'.
    150153                $this->System->Link('/form.php?group='.$Group['Id'].'&amp;ID='.$LastID).'">'.
     
    152155                $Group['Id'].'&amp;user=0&amp;text=&amp;entry=&amp;action=filter">'.
    153156                $Group['Name'].'</a> uložen jako '.$CompleteText[$NewComplete].
    154                 '. Převzat z <a href="form.php?group='.$Group['Id'].'&amp;ID='.$TextID.'">'.$TextID.'</a>.', LOG_TYPE_TRANSLATION);
     157                '. Převzat z <a href="form.php?group='.$Group['Id'].'&amp;ID='.$TakeID.'">'.$TakeID.'</a>.', LOG_TYPE_TRANSLATION);
    155158            }
    156159          }
  • trunk/includes/Version.php

    r833 r834  
    66// and system will need database update.
    77
    8 $Revision = 833; // Subversion revision
     8$Revision = 834; // Subversion revision
    99$DatabaseRevision = 811; // Database structure revision
    1010$ReleaseTime = '2015-08-24';
Note: See TracChangeset for help on using the changeset viewer.