From 8437797a528a56656609274d2fce0cd26c80353f Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Mon, 1 Nov 2010 21:03:00 +0000
Subject: [PATCH] Monotone-Parent: 320e26fe80afea789e2f0c3c4d58fa7d657999c6
 Monotone-Revision: 0d54b3aabafa31b4d7c1e76ebd34222d4536e020

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-11-01T21:03:00
Monotone-Branch: ca.inverse.sogo
---
 .../Localizable.strings                       |  4 +--
 .../Catalan.lproj/Localizable.strings         |  4 +--
 .../Czech.lproj/Localizable.strings           |  4 +--
 .../Dutch.lproj/Localizable.strings           |  4 +--
 .../English.lproj/Localizable.strings         |  4 +--
 .../French.lproj/Localizable.strings          |  4 +--
 .../German.lproj/Localizable.strings          |  4 +--
 .../Hungarian.lproj/Localizable.strings       |  4 +--
 .../Italian.lproj/Localizable.strings         |  4 +--
 .../Polish.lproj/Localizable.strings          |  4 +--
 .../Russian.lproj/Localizable.strings         |  4 +--
 SoObjects/Appointments/SOGoAptMailDeletion.m  |  7 +++--
 .../Appointments/SOGoAptMailInvitation.m      | 29 -------------------
 .../Spanish.lproj/Localizable.strings         |  4 +--
 .../Swedish.lproj/Localizable.strings         |  4 +--
 .../Ukrainian.lproj/Localizable.strings       |  4 +--
 .../Welsh.lproj/Localizable.strings           |  4 +--
 17 files changed, 35 insertions(+), 61 deletions(-)

diff --git a/SoObjects/Appointments/BrazilianPortuguese.lproj/Localizable.strings b/SoObjects/Appointments/BrazilianPortuguese.lproj/Localizable.strings
index e23635767..bbb7b04cb 100644
--- a/SoObjects/Appointments/BrazilianPortuguese.lproj/Localizable.strings
+++ b/SoObjects/Appointments/BrazilianPortuguese.lproj/Localizable.strings
@@ -39,8 +39,8 @@ vtodo_class2 = "(Tarefa Confidencial)";
 
 /* Deletion */
 "Event Cancelled: \"%{Summary}\"" = "Event Cancelled: \"%{Summary}\"";
-"%{Organizer} %{SentByText}has cancelled this event: %{Summary}."
-= "%{Organizer} %{SentByText}has cancelled this event: %{Summary}.";
+"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
+= "%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}";
 
 /* Update */
 "The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed"
diff --git a/SoObjects/Appointments/Catalan.lproj/Localizable.strings b/SoObjects/Appointments/Catalan.lproj/Localizable.strings
index 79ef794cc..3954a2af8 100644
--- a/SoObjects/Appointments/Catalan.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Catalan.lproj/Localizable.strings
@@ -39,8 +39,8 @@ vtodo_class2 = "(Tasca confidencial)";
 
 /* Deletion */
 "Event Cancelled: \"%{Summary}\"" = "Esdeveniment suspès: \"%{Summary}\"";
-"%{Organizer} %{SentByText}has cancelled this event: %{Summary}."
-= "%{Organizer} %{SentByText}ha suspès aquest esdeveniment: %{Summary}.";
+"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
+= "%{Organizer} %{SentByText}ha suspès aquest esdeveniment: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
 
 /* Update */
 "The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed"
diff --git a/SoObjects/Appointments/Czech.lproj/Localizable.strings b/SoObjects/Appointments/Czech.lproj/Localizable.strings
index 15c40336f..41fad1aa7 100644
--- a/SoObjects/Appointments/Czech.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Czech.lproj/Localizable.strings
@@ -39,8 +39,8 @@ vtodo_class2 = "(Skrytý úkol)";
 
 /* Deletion */
 "Event Cancelled: \"%{Summary}\"" = "Zrušení události: \"%{Summary}\"";
-"%{Organizer} %{SentByText}has cancelled this event: %{Summary}."
-= "%{Organizer} %{SentByText}zrušil/a událost: %{Summary}.";
+"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
+= "%{Organizer} %{SentByText}zrušil/a událost: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
 
 /* Update */
 "The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed"
diff --git a/SoObjects/Appointments/Dutch.lproj/Localizable.strings b/SoObjects/Appointments/Dutch.lproj/Localizable.strings
index 4f9088aae..b68771cde 100644
--- a/SoObjects/Appointments/Dutch.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Dutch.lproj/Localizable.strings
@@ -39,8 +39,8 @@ vtodo_class2 = "(Vertrouwelijke taak)";
 
 /* Deletion */
 "Event Cancelled: \"%{Summary}\"" = "Event Cancelled: \"%{Summary}\"";
-"%{Organizer} %{SentByText}has cancelled this event: %{Summary}."
-= "%{Organizer} %{SentByText}has cancelled this event: %{Summary}.";
+"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
+= "%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}";
 
 /* Update */
 "The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed"
diff --git a/SoObjects/Appointments/English.lproj/Localizable.strings b/SoObjects/Appointments/English.lproj/Localizable.strings
index 2fc0234bb..01a973e0c 100644
--- a/SoObjects/Appointments/English.lproj/Localizable.strings
+++ b/SoObjects/Appointments/English.lproj/Localizable.strings
@@ -39,8 +39,8 @@ vtodo_class2 = "(Confidential task)";
 
 /* Deletion */
 "Event Cancelled: \"%{Summary}\"" = "Event Cancelled: \"%{Summary}\"";
-"%{Organizer} %{SentByText}has cancelled this event: %{Summary}."
-= "%{Organizer} %{SentByText}has cancelled this event: %{Summary}.";
+"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
+= "%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}";
 
 /* Update */
 "The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed"
diff --git a/SoObjects/Appointments/French.lproj/Localizable.strings b/SoObjects/Appointments/French.lproj/Localizable.strings
index 64d040a1f..bf6ef31f2 100644
--- a/SoObjects/Appointments/French.lproj/Localizable.strings
+++ b/SoObjects/Appointments/French.lproj/Localizable.strings
@@ -39,8 +39,8 @@ vtodo_class2 = "(Tâche confidentielle)";
 
 /* Deletion */
 "Event Cancelled: \"%{Summary}\"" = "Réunion annulée : « %{Summary} »";
-"%{Organizer} %{SentByText}has cancelled this event: %{Summary}."
-= "%{Organizer} %{SentByText}a annulé cette réunion : « %{Summary} »";
+"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
+= "%{Organizer} %{SentByText}a annulé cette réunion : « %{Summary} ».\n\nDébut: %{StartDate} à %{StartTime}\nFin: %{EndDate} à %{EndTime}\nDescription: %{Description}";
 
 /* Update */
 "The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed"
diff --git a/SoObjects/Appointments/German.lproj/Localizable.strings b/SoObjects/Appointments/German.lproj/Localizable.strings
index 5ad0feafa..49a328f6d 100644
--- a/SoObjects/Appointments/German.lproj/Localizable.strings
+++ b/SoObjects/Appointments/German.lproj/Localizable.strings
@@ -39,8 +39,8 @@ vtodo_class2 = "(Vertrauliche Aufgabe)";
 
 /* Deletion */
 "Event Cancelled: \"%{Summary}\"" = "Termin abgesagt: \"%{Summary}\"";
-"%{Organizer} %{SentByText}has cancelled this event: %{Summary}."
-= "%{Organizer} %{SentByText}hat diesen Termin abgesagt: %{Summary}.";
+"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
+= "%{Organizer} %{SentByText}hat diesen Termin abgesagt: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
 
 /* Update */
 "The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed"
diff --git a/SoObjects/Appointments/Hungarian.lproj/Localizable.strings b/SoObjects/Appointments/Hungarian.lproj/Localizable.strings
index e3d79698a..a3640e7a7 100644
--- a/SoObjects/Appointments/Hungarian.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Hungarian.lproj/Localizable.strings
@@ -39,8 +39,8 @@ vtodo_class2 = "(Bizalmas feladat)";
 
 /* Deletion */
 "Event Cancelled: \"%{Summary}\"" = "Event Cancelled: \"%{Summary}\"";
-"%{Organizer} %{SentByText}has cancelled this event: %{Summary}."
-= "%{Organizer} %{SentByText}has cancelled this event: %{Summary}.";
+"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
+= "%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}";
 
 /* Update */
 "The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed"
diff --git a/SoObjects/Appointments/Italian.lproj/Localizable.strings b/SoObjects/Appointments/Italian.lproj/Localizable.strings
index 4567bce4a..8e812c945 100644
--- a/SoObjects/Appointments/Italian.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Italian.lproj/Localizable.strings
@@ -39,8 +39,8 @@ vtodo_class2 = "(Attività confidenziale)";
 
 /* Deletion */
 "Event Cancelled: \"%{Summary}\"" = "Evento cancellato: \"%{Summary}\"";
-"%{Organizer} %{SentByText}has cancelled this event: %{Summary}."
-= "%{Organizer} %{SentByText}ha cancellato questo evento: %{Summary}.";
+"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
+= "%{Organizer} %{SentByText}ha cancellato questo evento: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
 
 /* Update */
 "The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed"
diff --git a/SoObjects/Appointments/Polish.lproj/Localizable.strings b/SoObjects/Appointments/Polish.lproj/Localizable.strings
index 59474334f..66c83afb4 100644
--- a/SoObjects/Appointments/Polish.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Polish.lproj/Localizable.strings
@@ -39,8 +39,8 @@ vtodo_class2 = "(Zadanie poufne)";
 
 /* Deletion */
 "Event Cancelled: \"%{Summary}\"" = "Wydarzenie anulowane: \"%{Summary}\"";
-"%{Organizer} %{SentByText}has cancelled this event: %{Summary}."
-= "%{Organizer} %{SentByText}anulował(a) to wydarzenie: %{Summary}.";
+"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
+= "%{Organizer} %{SentByText}anulował(a) to wydarzenie: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}";
 
 /* Update */
 "The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed"
diff --git a/SoObjects/Appointments/Russian.lproj/Localizable.strings b/SoObjects/Appointments/Russian.lproj/Localizable.strings
index 8d7066aeb..d33d98bca 100644
--- a/SoObjects/Appointments/Russian.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Russian.lproj/Localizable.strings
@@ -39,8 +39,8 @@ vtodo_class2 = "(Confidential task)";
 
 /* Deletion */
 "Event Cancelled: \"%{Summary}\"" = "Event Cancelled: \"%{Summary}\"";
-"%{Organizer} %{SentByText}has cancelled this event: %{Summary}."
-= "%{Organizer} %{SentByText}has cancelled this event: %{Summary}.";
+"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
+= "%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}";
 
 /* Update */
 "The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed"
diff --git a/SoObjects/Appointments/SOGoAptMailDeletion.m b/SoObjects/Appointments/SOGoAptMailDeletion.m
index 2163e763c..5db61e955 100644
--- a/SoObjects/Appointments/SOGoAptMailDeletion.m
+++ b/SoObjects/Appointments/SOGoAptMailDeletion.m
@@ -49,8 +49,11 @@
   if (!values)
     [self setupValues];
 
-  bodyFormat = [self labelForKey: @"%{Organizer} %{SentByText}has"
-                     @" cancelled this event: %{Summary}."
+  bodyFormat = [self labelForKey: (@"%{Organizer} %{SentByText}has cancelled"
+                                   @" this event: %{Summary}.\n\n"
+                                   @"Start: %{StartDate} at %{StartTime}\n"
+                                   @"End: %{EndDate} at %{EndTime}\n"
+                                   @"Description: %{Description}")
                        inContext: context];
 
   return [values keysWithFormat: bodyFormat];
diff --git a/SoObjects/Appointments/SOGoAptMailInvitation.m b/SoObjects/Appointments/SOGoAptMailInvitation.m
index 389bbb0ce..d33d332f4 100644
--- a/SoObjects/Appointments/SOGoAptMailInvitation.m
+++ b/SoObjects/Appointments/SOGoAptMailInvitation.m
@@ -24,7 +24,6 @@
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <SOGo/NSDictionary+Utilities.h>
 #import <SOGo/NSObject+Utilities.h>
-#import <SOGo/SOGoDateFormatter.h>
 #import <SOGo/SOGoUser.h>
 #import "iCalPerson+SOGo.h"
 
@@ -35,34 +34,6 @@
 
 @implementation SOGoAptMailInvitation
 
-- (void) setupValues
-{
-  SOGoDateFormatter *dateFormatter;
-  NSCalendarDate *date;
-  NSString *description;
-
-  [super setupValues];
-
-
-  dateFormatter = [[context activeUser] dateFormatterInContext: context];
-
-  date = [self newStartDate];
-  [values setObject: [dateFormatter shortFormattedDate: date]
-             forKey: @"StartDate"];
-  [values setObject: [dateFormatter formattedTime: date]
-             forKey: @"StartTime"];
-
-  date = [self newEndDate];
-  [values setObject: [dateFormatter shortFormattedDate: date]
-             forKey: @"EndDate"];
-  [values setObject: [dateFormatter formattedTime: date]
-             forKey: @"EndTime"];
-
-  description = [[self apt] comment];
-  [values setObject: (description ? description : @"")
-	  forKey: @"Description"];
-}
-
 - (NSString *) getSubject
 {
   NSString *subjectFormat;
diff --git a/SoObjects/Appointments/Spanish.lproj/Localizable.strings b/SoObjects/Appointments/Spanish.lproj/Localizable.strings
index 46131df13..b1f66533b 100644
--- a/SoObjects/Appointments/Spanish.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Spanish.lproj/Localizable.strings
@@ -39,8 +39,8 @@ vtodo_class2 = "(Tarea confidencial)";
 
 /* Deletion */
 "Event Cancelled: \"%{Summary}\"" = "Event Cancelled: \"%{Summary}\"";
-"%{Organizer} %{SentByText}has cancelled this event: %{Summary}."
-= "%{Organizer} %{SentByText}has cancelled this event: %{Summary}.";
+"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
+= "%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}";
 
 /* Update */
 "The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed"
diff --git a/SoObjects/Appointments/Swedish.lproj/Localizable.strings b/SoObjects/Appointments/Swedish.lproj/Localizable.strings
index 14a93ef7a..c36b478ea 100644
--- a/SoObjects/Appointments/Swedish.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Swedish.lproj/Localizable.strings
@@ -39,8 +39,8 @@ vtodo_class2 = "(Konfidentiell uppgift)";
 
 /* Deletion */
 "Event Cancelled: \"%{Summary}\"" = "Event Cancelled: \"%{Summary}\"";
-"%{Organizer} %{SentByText}has cancelled this event: %{Summary}."
-= "%{Organizer} %{SentByText}has cancelled this event: %{Summary}.";
+"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
+= "%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}";
 
 /* Update */
 "The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed"
diff --git a/SoObjects/Appointments/Ukrainian.lproj/Localizable.strings b/SoObjects/Appointments/Ukrainian.lproj/Localizable.strings
index 0c7021993..47997fd9b 100644
--- a/SoObjects/Appointments/Ukrainian.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Ukrainian.lproj/Localizable.strings
@@ -39,8 +39,8 @@ vtodo_class2 = "(Конфіденційне завдання)";
 
 /* Deletion */
 "Event Cancelled: \"%{Summary}\"" = "Подію скасовано: \"%{Summary}\"";
-"%{Organizer} %{SentByText} скасував подію: %{Summary}."
-= "%{Organizer} %{SentByText} скасував подію: %{Summary}.";
+"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
+= "%{Organizer} %{SentByText} скасував подію: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
 
 /* Update */
 "The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed"
diff --git a/SoObjects/Appointments/Welsh.lproj/Localizable.strings b/SoObjects/Appointments/Welsh.lproj/Localizable.strings
index 0522bb36d..bda59e824 100644
--- a/SoObjects/Appointments/Welsh.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Welsh.lproj/Localizable.strings
@@ -39,8 +39,8 @@ vtodo_class2 = "(Tasg gyfrinachol)";
 
 /* Deletion */
 "Event Cancelled: \"%{Summary}\"" = "Event Cancelled: \"%{Summary}\"";
-"%{Organizer} %{SentByText}has cancelled this event: %{Summary}."
-= "%{Organizer} %{SentByText}has cancelled this event: %{Summary}.";
+"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
+= "%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}";
 
 /* Update */
 "The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed"