Monotone-Parent: c0e690042905295d3b7946d9d917fcf8e91982ef

Monotone-Revision: f8b29d68c36441f92d7ffe8056a95fd25a2fd409

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-10-17T22:29:51
Monotone-Branch: ca.inverse.sogo

UI/MailerUI/English.lproj/Localizable.strings

@@ -180,6 +180,8 @@
 "Print..." = "Print...";
 "Delete Message" = "Delete Message";
 
+"This Folder" = "This Folder";
+
 /* Label popup menu */
 "None" = "None";
 "Important" = "Important";
@@ -214,3 +216,8 @@
 
 "You need to choose a non-virtual folder!" = "You need to choose a non-virtual folder!";
 "You need to choose a root subfolder!" = "You need to choose a root subfolder!";
+
+"Moving a message into its own folder is impossible!"
+= "Moving a message into its own folder is impossible!";
+"Copying a message into its own folder is impossible!"
+= "Copying a message into its own folder is impossible!";

UI/MailerUI/French.lproj/Localizable.strings

@@ -181,6 +181,8 @@
 "Print..." = "Imprimer...";
 "Delete Message" = "Supprimer le message";
 
+"This Folder" = "Ce dossier-ci";
+
 /* Label popup menu */
 "None" = "Aucune";
 "Important" = "Important";
@@ -215,3 +217,8 @@
 
 "You need to choose a non-virtual folder!" = "Vous devez choisir un dossier non-virtuel.";
 "You need to choose a root subfolder!" = "Vous devez choisir un sous-dossier de la racine.";
+
+"Moving a message into its own folder is impossible!"
+= "Le déplacement d'un message dans son propre dossier est impossible.";
+"Copying a message into its own folder is impossible!"
+= "La copie d'un message dans son propre dossier est impossible.";

UI/MailerUI/German.lproj/Localizable.strings

@@ -164,6 +164,8 @@
 "Print..." = "Drucken...";
 "Delete Message" = "Lõschen";
 
+"This Folder" = "This Folder";
+
 /* Label popup menu */
 "None" = "Aucune";
 "Important" = "Important";
@@ -198,3 +200,8 @@
 
 "You need to choose a non-virtual folder!" = "You need to choose a non-virtual folder!";
 "You need to choose a root subfolder!" = "You need to choose a root subfolder!";
+
+"Moving a message into its own folder is impossible!"
+= "Moving a message into its own folder is impossible!";
+"Copying a message into its own folder is impossible!"
+= "Copying a message into its own folder is impossible!";

UI/MailerUI/UIxMailActions.m

@@ -104,7 +104,7 @@
   NSString *destinationFolder;
   id response;
 
-  destinationFolder = [[context request] formValueForKey: @"tofolder"];
+  destinationFolder = [[context request] formValueForKey: @"folder"];
   if ([destinationFolder length] > 0)
     {
       response = [[self clientObject] moveToFolderNamed: destinationFolder
@@ -119,6 +119,26 @@
   return response;
 }
 
+- (id) copyAction
+{
+  NSString *destinationFolder;
+  id response;
+
+  destinationFolder = [[context request] formValueForKey: @"folder"];
+  if ([destinationFolder length] > 0)
+    {
+      response = [[self clientObject] copyToFolderNamed: destinationFolder
+				      inContext: context];
+      if (!response)
+	response = [self responseWith204];
+    }
+  else
+    response = [NSException exceptionWithHTTPStatus: 500 /* Server Error */
+			    reason: @"No destination folder given"];
+
+  return response;
+}
+
 /* active message */
 
 - (id) markMessageUnreadAction 

UI/MailerUI/product.plist

@@ -210,6 +210,11 @@
 	  actionClass = "UIxMailActions";
 	  actionName  = "move";
 	};
+	copy = {
+	  protectedBy = "View";
+	  actionClass = "UIxMailActions";
+	  actionName  = "copy";
+	};
 	trash = {
 	  protectedBy = "View";
 	  actionClass = "UIxMailActions";