Fixed templates for email notifications during invitations. They will need to be fully translated (in languages other than english and french)

Monotone-Parent: a62274e4f237a8d859323dac4cb26008cc301b18
Monotone-Revision: 64c0713802f9595de3f792409a68ecb74bb80532

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2008-10-24T16:12:21
Monotone-Branch: ca.inverse.sogo

SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.html

@@ -1,2 +1,2 @@
 <#IsSubject>Antwoord voor de gebeurtenisuitnodiging: <#summary/></#IsSubject>
-<#IsBody><#organizer/> heeft uw uitnodiging voor de gebeurtenis <#HasAccepted>geaccepteerd</#HasAccepted><#HasDeclined>geweigerd</#HasDeclined>.</#IsBody>
+<#IsBody><#organizer/> heeft uw uitnodiging voor de gebeurtenis <#HasAccepted>geaccepteerd</#HasAccepted><#HasDeclined>geweigerd</#HasDeclined><#HasNotAcceptedNotDeclined>not yet decided upon</#HasNotAcceptedNotDeclined>.</#IsBody>

SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.wod

@@ -24,3 +24,7 @@ HasAccepted: WOConditional {
 HasDeclined: WOConditional {
   condition = hasDeclined;
 }
+
+HasNotAcceptedNotDeclined: WOConditional {
+  condition = hasNotAcceptedNotDeclined;
+}

SoObjects/Appointments/SOGoAptMailEnglishICalReply.wo/SOGoAptMailEnglishICalReply.html

@@ -1,2 +1,2 @@
 <#IsSubject>Event Invitation Reply: <#summary/></#IsSubject>
-<#IsBody><#attendee/> has <#HasAccepted>accepted</#HasAccepted><#HasDeclined>declined</#HasDeclined> your event invitation.</#IsBody>
+<#IsBody><#attendee/> has <#HasAccepted>accepted</#HasAccepted><#HasDeclined>declined</#HasDeclined><#HasNotAcceptedNotDeclined>not yet decided upon</#HasNotAcceptedNotDeclined> your event invitation.</#IsBody>

SoObjects/Appointments/SOGoAptMailEnglishICalReply.wo/SOGoAptMailEnglishICalReply.wod

@@ -24,3 +24,7 @@ HasAccepted: WOConditional {
 HasDeclined: WOConditional {
   condition = hasDeclined;
 }
+
+HasNotAcceptedNotDeclined: WOConditional {
+  condition = hasNotAcceptedNotDeclined;
+} 

SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.html

@@ -1,2 +1,2 @@
 <#IsSubject>Réponse à l'invitation : «<#summary/>»</#IsSubject>
-<#IsBody><#attendee/> a <#HasAccepted>accepté</#HasAccepted><#HasDeclined>refusé</#HasDeclined> votre invitation.</#IsBody>
+<#IsBody><#attendee/> a <#HasAccepted>accepté</#HasAccepted><#HasDeclined>refusé</#HasDeclined><#HasNotAcceptedNotDeclined>choisi de reporter sa décision par rapport à</#HasNotAcceptedNotDeclined> votre invitation.</#IsBody>

SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.wod

@@ -24,3 +24,7 @@ HasAccepted: WOConditional {
 HasDeclined: WOConditional {
   condition = hasDeclined;
 }
+
+HasNotAcceptedNotDeclined: WOConditional {
+  condition = hasNotAcceptedNotDeclined;
+}

SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.html

@@ -1,2 +1,2 @@
 <#IsSubject>Antwort Termineinladung: <#summary/></#IsSubject>
-<#IsBody><#attendee/> hat Ihre Termineinladung <#HasAccepted>akzeptiert</#HasAccepted><#HasDeclined>abgelehnt</#HasDeclined></#IsBody>.
+<#IsBody><#attendee/> hat Ihre Termineinladung <#HasAccepted>akzeptiert</#HasAccepted><#HasDeclined>abgelehnt</#HasDeclined><#HasNotAcceptedNotDeclined>not yet decided upon</#HasNotAcceptedNotDeclined></#IsBody>.

SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.wod

@@ -24,3 +24,7 @@ HasAccepted: WOConditional {
 HasDeclined: WOConditional {
   condition = hasDeclined;
 }
+
+HasNotAcceptedNotDeclined: WOConditional {
+  condition = hasNotAcceptedNotDeclined;
+}

SoObjects/Appointments/SOGoAptMailICalReply.m

@@ -119,6 +119,11 @@ static NSCharacterSet *wsSet  = nil;
   return [partStat isEqualToString: @"declined"];
 }
 
+- (BOOL) hasNotAcceptedNotDeclined
+{
+  return !([self hasAccepted] || [self hasDeclined]);
+}
+
 - (NSCalendarDate *) startDate
 {
   NSCalendarDate *date;
@@ -131,6 +136,11 @@ static NSCharacterSet *wsSet  = nil;
   return date;
 }
 
+- (NSString *) summary
+{
+  return [apt summary];
+}
+
 - (BOOL) isSubject
 {
   return isSubject;

SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.html

@@ -1,2 +1,2 @@
 <#IsSubject>Re: Appuntemento : "<#summary/>"</#IsSubject>
-<#IsBody><#attendee/> ha <#HasAccepted>accettato</#HasAccepted><#HasDeclined>declinato</#HasDeclined> l'invito al proprio evento.</#IsBody>
+<#IsBody><#attendee/> ha <#HasAccepted>accettato</#HasAccepted><#HasDeclined>declinato</#HasDeclined><#HasNotAcceptedNotDeclined>not yet decided upon</#HasNotAcceptedNotDeclined> l'invito al proprio evento.</#IsBody>

SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.wod

@@ -24,3 +24,7 @@ HasAccepted: WOConditional {
 HasDeclined: WOConditional {
   condition = hasDeclined;
 }
+
+HasNotAcceptedNotDeclined: WOConditional {
+  condition = hasNotAcceptedNotDeclined;
+}

SoObjects/Appointments/SOGoAptMailNotification.h

@@ -40,6 +40,7 @@
   NSCalendarDate *oldStartDate;
   NSCalendarDate *newStartDate;
   BOOL isSubject;
+  NSString *organizerName;
 }
 
 - (iCalEntityObject *) apt;

SoObjects/Appointments/SOGoAptMailNotification.m

@@ -68,6 +68,7 @@ static NSTimeZone *UTC = nil;
 - (void) dealloc
 {
   [apt release];
+  [organizerName release];
   [super dealloc];
 }
 
@@ -97,9 +98,14 @@ static NSTimeZone *UTC = nil;
   return [apt summary];
 }
 
+- (void) setOrganizerName: (NSString *) theString
+{
+  ASSIGN(organizerName, theString);
+}
+
 - (NSString *) organizerName
 {
-  return [[apt organizer] cn];
+  return organizerName;
 }
 
 /* Helpers */

SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.html

@@ -1,2 +1,2 @@
 <#IsSubject>Respuesta a la invitación al evento: <#summary/></#IsSubject>
-<#IsBody><#attendee/> ha <#HasAccepted>aceptado</#HasAccepted><#HasDelined>rechazado</#HasDeclined> su invitación al evento.</#IsBody>
+<#IsBody><#attendee/> ha <#HasAccepted>aceptado</#HasAccepted><#HasDelined>rechazado</#HasDeclined><#HasNotAcceptedNotDeclined>not yet decided upon</#HasNotAcceptedNotDeclined> su invitación al evento.</#IsBody>

SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.wod

@@ -24,3 +24,7 @@ HasAccepted: WOConditional {
 HasDeclined: WOConditional {
   condition = hasDeclined;
 }
+
+HasNotAcceptedNotDeclined: WOConditional {
+  condition = hasNotAcceptedNotDeclined;
+}

SoObjects/Appointments/SOGoCalendarComponent.m

@@ -524,6 +524,16 @@ _occurenceHasID (iCalRepeatableEntityObject *occurence, NSString *recID)
 		  /* construct message content */
 		  p = [app pageWithName: pageName inContext: context];
 		  [p setApt: object];
+		  
+		  if ([[object organizer] cn] && [[[object organizer] cn] length])
+		    {
+		      [p setOrganizerName: [[object organizer] cn]];
+		    }
+		  else
+		    {
+		      [p setOrganizerName: [ownerUser cn]];
+		    }
+
 		  subject = [p getSubject];
 		  text = [p getBody];