Changeset 849


Ignore:
Timestamp:
Jan 17, 2016, 6:19:06 PM (9 years ago)
Author:
chronos
Message:
  • Added: Prepared database tables for import module. Every executed import should be recorded and should be allowed to remove it.
  • Modified: More translatable strings.
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Application/UpdateTrace.php

    r848 r849  
    29002900}
    29012901
     2902function UpdateTo849($Manager)
     2903{
     2904  // Group item names
     2905  $Manager->Execute('CREATE TABLE IF NOT EXISTS `Import` (
     2906    `Id` int(11) NOT NULL AUTO_INCREMENT,
     2907    `ClientVersion` int(11) NOT NULL,
     2908    `Time` datetime NOT NULL,
     2909    `User` int(11) NOT NULL,
     2910    PRIMARY KEY (`Id`),
     2911    KEY (`User`),
     2912    KEY (`ClientVersion`)
     2913    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;');
     2914  $Manager->Execute('ALTER TABLE `Import` ADD FOREIGN KEY (`ClientVersion`) REFERENCES `ClientVersion`(`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
     2915  $Manager->Execute('ALTER TABLE `Import` ADD FOREIGN KEY (`User`) REFERENCES `User`(`ID`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
     2916  $Manager->Execute('CREATE TABLE IF NOT EXISTS `ImportGroup` (
     2917    `Id` int(11) NOT NULL AUTO_INCREMENT,
     2918    `Import` int(11) NOT NULL,
     2919    `Group` int(11) NOT NULL,
     2920    PRIMARY KEY (`Id`),
     2921    KEY (`Import`),
     2922    KEY (`Group`)
     2923    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;');
     2924  $Manager->Execute('ALTER TABLE `ImportGroup` ADD FOREIGN KEY (`Import`) REFERENCES `Import`(`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
     2925  $Manager->Execute('ALTER TABLE `ImportGroup` ADD FOREIGN KEY (`Group`) REFERENCES `Group`(`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
     2926}
     2927
     2928
    29022929$Updates = array(
    29032930  498 => array('Revision' => 506, 'Function' => 'UpdateTo506'),
     
    29302957  811 => array('Revision' => 846, 'Function' => 'UpdateTo846'),
    29312958  846 => array('Revision' => 848, 'Function' => 'UpdateTo848'),
     2959  848 => array('Revision' => 849, 'Function' => 'UpdateTo849'),
    29322960);
  • trunk/Application/Version.php

    r848 r849  
    66// and system will need database update.
    77
    8 $Revision = 848; // Subversion revision
    9 $DatabaseRevision = 848; // Database structure revision
     8$Revision = 849; // Subversion revision
     9$DatabaseRevision = 849; // Database structure revision
    1010$ReleaseTime = '2016-01-17';
  • trunk/Modules/Team/Team.php

    r846 r849  
    8282      if($this->System->User->Licence(LICENCE_USER))
    8383      {
    84         if($Team['Leader'] == $this->System->User->Id) $Action = ' <a href="?action=modify&amp;id='.$Team['Id'].'">Upravit</a>';
     84        if($Team['Leader'] == $this->System->User->Id) $Action = ' <a href="?action=modify&amp;id='.$Team['Id'].'">'.T('Edit').'</a>';
    8585        else $Action = '';
    86         if($Team['Id'] == $this->System->User->Team) $Action = ' <a href="?action=leave">Opustit</a>';
    87         $Output .= '<td><a href="?action=gointeam&amp;id='.$Team['Id'].'">Vstoupit</a>'.$Action.'</td>';
     86        if($Team['Id'] == $this->System->User->Team) $Action = ' <a href="?action=leave">'.T('Leave').'</a>';
     87        $Output .= '<td><a href="?action=gointeam&amp;id='.$Team['Id'].'">'.T('Enter').'</a>'.$Action.'</td>';
    8888      }
    8989      $Output .= '</tr>';
     
    102102      {
    103103        $this->Database->query('UPDATE `User` SET `Team` = '.$_GET['id'].' WHERE `ID` = '.$this->System->User->Id);
    104         $Output = ShowMessage('Vstoupil jsi do týmu.');
     104        $Output = ShowMessage(T('You joined new team'));
    105105        $this->System->ModuleManager->Modules['Log']->WriteLog('Uživatel vstoupil do týmu '.$_GET['id'], LOG_TYPE_USER);
    106106
     
    314314    {
    315315      $this->Database->query('UPDATE `User` SET `Team` = NULL WHERE `ID` = '.$this->System->User->Id);
    316       $Output = ShowMessage('Nyní nejste členem žádného týmu.');
     316      $Output = ShowMessage(T('You are now not member of any team'));
    317317      $this->System->ModuleManager->Modules['Log']->WriteLog('Uživatel vystoupil z týmu', LOG_TYPE_USER);
    318318
  • trunk/locale/cs.php

    r848 r849  
    410410      'English' => 'Angličtina',
    411411      'Slovak' => 'Slovenština',
     412      'Lithuanian' => 'Litevština',
    412413      'Original word' => 'Původní slovo',
    413414      'New word insertion' => 'Vložení nového slova',
     
    492493        'Nowhere' => 'Nikam',
    493494        'None' => 'Žádný',
     495        'You joined new team' => 'Vstoupil jsi do nového týmu',
     496        'You are now not member of any team' => 'Nyní nejste členem žádného týmu',
    494497      ),
    495498      'URL' => array(
Note: See TracChangeset for help on using the changeset viewer.