Changeset 849 for trunk

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:

• Application/UpdateTrace.php (modified) (2 diffs)
• Application/Version.php (modified) (1 diff)
• Modules/Team/Team.php (modified) (3 diffs)
• locale/cs.php (modified) (2 diffs)

trunk/Application/UpdateTrace.php

@@ -2900 +2900 @@
 }
 
+function UpdateTo849($Manager)
+{
+  // Group item names
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `Import` (
+    `Id` int(11) NOT NULL AUTO_INCREMENT,
+    `ClientVersion` int(11) NOT NULL,
+    `Time` datetime NOT NULL,
+    `User` int(11) NOT NULL,
+    PRIMARY KEY (`Id`),
+    KEY (`User`),
+    KEY (`ClientVersion`)
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;');
+  $Manager->Execute('ALTER TABLE `Import` ADD FOREIGN KEY (`ClientVersion`) REFERENCES `ClientVersion`(`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
+  $Manager->Execute('ALTER TABLE `Import` ADD FOREIGN KEY (`User`) REFERENCES `User`(`ID`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `ImportGroup` (
+    `Id` int(11) NOT NULL AUTO_INCREMENT,
+    `Import` int(11) NOT NULL,
+    `Group` int(11) NOT NULL,
+    PRIMARY KEY (`Id`),
+    KEY (`Import`),
+    KEY (`Group`)
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;');
+  $Manager->Execute('ALTER TABLE `ImportGroup` ADD FOREIGN KEY (`Import`) REFERENCES `Import`(`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
+  $Manager->Execute('ALTER TABLE `ImportGroup` ADD FOREIGN KEY (`Group`) REFERENCES `Group`(`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
+}
+
+
 $Updates = array(
   498 => array('Revision' => 506, 'Function' => 'UpdateTo506'),
@@ -2930 +2957 @@
   811 => array('Revision' => 846, 'Function' => 'UpdateTo846'),
   846 => array('Revision' => 848, 'Function' => 'UpdateTo848'),
+  848 => array('Revision' => 849, 'Function' => 'UpdateTo849'),
 );

trunk/Application/Version.php

@@ -6 +6 @@
 // and system will need database update.
 
-$Revision = 848; // Subversion revision
-$DatabaseRevision = 848; // Database structure revision
+$Revision = 849; // Subversion revision
+$DatabaseRevision = 849; // Database structure revision
 $ReleaseTime = '2016-01-17';

trunk/Modules/Team/Team.php

@@ -82 +82 @@
       if($this->System->User->Licence(LICENCE_USER))
       {
-        if($Team['Leader'] == $this->System->User->Id) $Action = ' <a href="?action=modify&amp;id='.$Team['Id'].'">Upravit</a>';
+        if($Team['Leader'] == $this->System->User->Id) $Action = ' <a href="?action=modify&amp;id='.$Team['Id'].'">'.T('Edit').'</a>';
         else $Action = '';
-        if($Team['Id'] == $this->System->User->Team) $Action = ' <a href="?action=leave">Opustit</a>';
-        $Output .= '<td><a href="?action=gointeam&amp;id='.$Team['Id'].'">Vstoupit</a>'.$Action.'</td>';
+        if($Team['Id'] == $this->System->User->Team) $Action = ' <a href="?action=leave">'.T('Leave').'</a>';
+        $Output .= '<td><a href="?action=gointeam&amp;id='.$Team['Id'].'">'.T('Enter').'</a>'.$Action.'</td>';
       }
       $Output .= '</tr>';
@@ -102 +102 @@
       {
         $this->Database->query('UPDATE `User` SET `Team` = '.$_GET['id'].' WHERE `ID` = '.$this->System->User->Id);
-        $Output = ShowMessage('Vstoupil jsi do týmu.');
+        $Output = ShowMessage(T('You joined new team'));
         $this->System->ModuleManager->Modules['Log']->WriteLog('Uživatel vstoupil do týmu '.$_GET['id'], LOG_TYPE_USER);
 
@@ -314 +314 @@
     {
       $this->Database->query('UPDATE `User` SET `Team` = NULL WHERE `ID` = '.$this->System->User->Id);
-      $Output = ShowMessage('Nyní nejste členem žádného týmu.');
+      $Output = ShowMessage(T('You are now not member of any team'));
       $this->System->ModuleManager->Modules['Log']->WriteLog('Uživatel vystoupil z týmu', LOG_TYPE_USER);
 

trunk/locale/cs.php

@@ -410 +410 @@
       'English' => 'Angličtina',
       'Slovak' => 'Slovenština',
+      'Lithuanian' => 'Litevština',
       'Original word' => 'Původní slovo',
       'New word insertion' => 'Vložení nového slova',
@@ -492 +493 @@
         'Nowhere' => 'Nikam',
         'None' => 'Žádný',
+        'You joined new team' => 'Vstoupil jsi do nového týmu',
+        'You are now not member of any team' => 'Nyní nejste členem žádného týmu',
       ),
       'URL' => array(