Changeset 849
- Timestamp:
- Jan 17, 2016, 6:19:06 PM (9 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Application/UpdateTrace.php
r848 r849 2900 2900 } 2901 2901 2902 function 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 2902 2929 $Updates = array( 2903 2930 498 => array('Revision' => 506, 'Function' => 'UpdateTo506'), … … 2930 2957 811 => array('Revision' => 846, 'Function' => 'UpdateTo846'), 2931 2958 846 => array('Revision' => 848, 'Function' => 'UpdateTo848'), 2959 848 => array('Revision' => 849, 'Function' => 'UpdateTo849'), 2932 2960 ); -
trunk/Application/Version.php
r848 r849 6 6 // and system will need database update. 7 7 8 $Revision = 84 8; // Subversion revision9 $DatabaseRevision = 84 8; // Database structure revision8 $Revision = 849; // Subversion revision 9 $DatabaseRevision = 849; // Database structure revision 10 10 $ReleaseTime = '2016-01-17'; -
trunk/Modules/Team/Team.php
r846 r849 82 82 if($this->System->User->Licence(LICENCE_USER)) 83 83 { 84 if($Team['Leader'] == $this->System->User->Id) $Action = ' <a href="?action=modify&id='.$Team['Id'].'"> Upravit</a>';84 if($Team['Leader'] == $this->System->User->Id) $Action = ' <a href="?action=modify&id='.$Team['Id'].'">'.T('Edit').'</a>'; 85 85 else $Action = ''; 86 if($Team['Id'] == $this->System->User->Team) $Action = ' <a href="?action=leave"> Opustit</a>';87 $Output .= '<td><a href="?action=gointeam&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&id='.$Team['Id'].'">'.T('Enter').'</a>'.$Action.'</td>'; 88 88 } 89 89 $Output .= '</tr>'; … … 102 102 { 103 103 $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')); 105 105 $this->System->ModuleManager->Modules['Log']->WriteLog('Uživatel vstoupil do týmu '.$_GET['id'], LOG_TYPE_USER); 106 106 … … 314 314 { 315 315 $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')); 317 317 $this->System->ModuleManager->Modules['Log']->WriteLog('Uživatel vystoupil z týmu', LOG_TYPE_USER); 318 318 -
trunk/locale/cs.php
r848 r849 410 410 'English' => 'Angličtina', 411 411 'Slovak' => 'Slovenština', 412 'Lithuanian' => 'Litevština', 412 413 'Original word' => 'Původní slovo', 413 414 'New word insertion' => 'Vložení nového slova', … … 492 493 'Nowhere' => 'Nikam', 493 494 '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', 494 497 ), 495 498 'URL' => array(
Note:
See TracChangeset
for help on using the changeset viewer.