From 40d5c508cc69f7b7dd6dcba12302982251bf0488 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Fri, 24 Oct 2008 16:12:21 +0000 Subject: [PATCH] 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 --- .../SOGoAptMailDutchICalReply.html | 2 +- .../SOGoAptMailDutchICalReply.wod | 4 ++++ .../SOGoAptMailEnglishICalReply.html | 2 +- .../SOGoAptMailEnglishICalReply.wod | 4 ++++ .../SOGoAptMailFrenchICalReply.html | 2 +- .../SOGoAptMailFrenchICalReply.wod | 4 ++++ .../SOGoAptMailGermanICalReply.html | 2 +- .../SOGoAptMailGermanICalReply.wod | 4 ++++ SoObjects/Appointments/SOGoAptMailICalReply.m | 10 ++++++++++ .../SOGoAptMailItalianICalReply.html | 2 +- .../SOGoAptMailItalianICalReply.wod | 4 ++++ SoObjects/Appointments/SOGoAptMailNotification.h | 1 + SoObjects/Appointments/SOGoAptMailNotification.m | 8 +++++++- .../SOGoAptMailSpanishICalReply.html | 2 +- .../SOGoAptMailSpanishICalReply.wod | 4 ++++ SoObjects/Appointments/SOGoCalendarComponent.m | 10 ++++++++++ 16 files changed, 58 insertions(+), 7 deletions(-) diff --git a/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.html b/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.html index 7f067b7e2..6eb7b0bf5 100644 --- a/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.html +++ b/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.html @@ -1,2 +1,2 @@ <#IsSubject>Antwoord voor de gebeurtenisuitnodiging: <#summary/> -<#IsBody><#organizer/> heeft uw uitnodiging voor de gebeurtenis <#HasAccepted>geaccepteerd<#HasDeclined>geweigerd. +<#IsBody><#organizer/> heeft uw uitnodiging voor de gebeurtenis <#HasAccepted>geaccepteerd<#HasDeclined>geweigerd<#HasNotAcceptedNotDeclined>not yet decided upon. diff --git a/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.wod b/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.wod index bbb5bbfa4..2ade0637f 100644 --- a/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.wod +++ b/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.wod @@ -24,3 +24,7 @@ HasAccepted: WOConditional { HasDeclined: WOConditional { condition = hasDeclined; } + +HasNotAcceptedNotDeclined: WOConditional { + condition = hasNotAcceptedNotDeclined; +} diff --git a/SoObjects/Appointments/SOGoAptMailEnglishICalReply.wo/SOGoAptMailEnglishICalReply.html b/SoObjects/Appointments/SOGoAptMailEnglishICalReply.wo/SOGoAptMailEnglishICalReply.html index 12c305117..895612404 100644 --- a/SoObjects/Appointments/SOGoAptMailEnglishICalReply.wo/SOGoAptMailEnglishICalReply.html +++ b/SoObjects/Appointments/SOGoAptMailEnglishICalReply.wo/SOGoAptMailEnglishICalReply.html @@ -1,2 +1,2 @@ <#IsSubject>Event Invitation Reply: <#summary/> -<#IsBody><#attendee/> has <#HasAccepted>accepted<#HasDeclined>declined your event invitation. +<#IsBody><#attendee/> has <#HasAccepted>accepted<#HasDeclined>declined<#HasNotAcceptedNotDeclined>not yet decided upon your event invitation. diff --git a/SoObjects/Appointments/SOGoAptMailEnglishICalReply.wo/SOGoAptMailEnglishICalReply.wod b/SoObjects/Appointments/SOGoAptMailEnglishICalReply.wo/SOGoAptMailEnglishICalReply.wod index bbb5bbfa4..8c2373518 100644 --- a/SoObjects/Appointments/SOGoAptMailEnglishICalReply.wo/SOGoAptMailEnglishICalReply.wod +++ b/SoObjects/Appointments/SOGoAptMailEnglishICalReply.wo/SOGoAptMailEnglishICalReply.wod @@ -24,3 +24,7 @@ HasAccepted: WOConditional { HasDeclined: WOConditional { condition = hasDeclined; } + +HasNotAcceptedNotDeclined: WOConditional { + condition = hasNotAcceptedNotDeclined; +} diff --git a/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.html b/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.html index 3a37d0193..e6f65ab18 100644 --- a/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.html +++ b/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.html @@ -1,2 +1,2 @@ <#IsSubject>Réponse à l'invitation : «<#summary/>» -<#IsBody><#attendee/> a <#HasAccepted>accepté<#HasDeclined>refusé votre invitation. \ No newline at end of file +<#IsBody><#attendee/> a <#HasAccepted>accepté<#HasDeclined>refusé<#HasNotAcceptedNotDeclined>choisi de reporter sa décision par rapport à votre invitation. \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.wod b/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.wod index bbb5bbfa4..2ade0637f 100644 --- a/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.wod +++ b/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.wod @@ -24,3 +24,7 @@ HasAccepted: WOConditional { HasDeclined: WOConditional { condition = hasDeclined; } + +HasNotAcceptedNotDeclined: WOConditional { + condition = hasNotAcceptedNotDeclined; +} diff --git a/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.html b/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.html index 6d2dc7fa0..2baf03b65 100644 --- a/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.html +++ b/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.html @@ -1,2 +1,2 @@ <#IsSubject>Antwort Termineinladung: <#summary/> -<#IsBody><#attendee/> hat Ihre Termineinladung <#HasAccepted>akzeptiert<#HasDeclined>abgelehnt. \ No newline at end of file +<#IsBody><#attendee/> hat Ihre Termineinladung <#HasAccepted>akzeptiert<#HasDeclined>abgelehnt<#HasNotAcceptedNotDeclined>not yet decided upon. \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.wod b/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.wod index bbb5bbfa4..2ade0637f 100644 --- a/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.wod +++ b/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.wod @@ -24,3 +24,7 @@ HasAccepted: WOConditional { HasDeclined: WOConditional { condition = hasDeclined; } + +HasNotAcceptedNotDeclined: WOConditional { + condition = hasNotAcceptedNotDeclined; +} diff --git a/SoObjects/Appointments/SOGoAptMailICalReply.m b/SoObjects/Appointments/SOGoAptMailICalReply.m index beb6e6b5c..bcc334ef8 100644 --- a/SoObjects/Appointments/SOGoAptMailICalReply.m +++ b/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; diff --git a/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.html b/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.html index 542e0113e..19f05c571 100644 --- a/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.html +++ b/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.html @@ -1,2 +1,2 @@ <#IsSubject>Re: Appuntemento : "<#summary/>" -<#IsBody><#attendee/> ha <#HasAccepted>accettato<#HasDeclined>declinato l'invito al proprio evento. +<#IsBody><#attendee/> ha <#HasAccepted>accettato<#HasDeclined>declinato<#HasNotAcceptedNotDeclined>not yet decided upon l'invito al proprio evento. diff --git a/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.wod b/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.wod index bbb5bbfa4..2ade0637f 100644 --- a/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.wod +++ b/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.wod @@ -24,3 +24,7 @@ HasAccepted: WOConditional { HasDeclined: WOConditional { condition = hasDeclined; } + +HasNotAcceptedNotDeclined: WOConditional { + condition = hasNotAcceptedNotDeclined; +} diff --git a/SoObjects/Appointments/SOGoAptMailNotification.h b/SoObjects/Appointments/SOGoAptMailNotification.h index 761ee8332..9774c809b 100644 --- a/SoObjects/Appointments/SOGoAptMailNotification.h +++ b/SoObjects/Appointments/SOGoAptMailNotification.h @@ -40,6 +40,7 @@ NSCalendarDate *oldStartDate; NSCalendarDate *newStartDate; BOOL isSubject; + NSString *organizerName; } - (iCalEntityObject *) apt; diff --git a/SoObjects/Appointments/SOGoAptMailNotification.m b/SoObjects/Appointments/SOGoAptMailNotification.m index 93ee223ce..6c6952028 100644 --- a/SoObjects/Appointments/SOGoAptMailNotification.m +++ b/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 */ diff --git a/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.html b/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.html index 92051e37d..0fbb62387 100644 --- a/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.html +++ b/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.html @@ -1,2 +1,2 @@ <#IsSubject>Respuesta a la invitación al evento: <#summary/> -<#IsBody><#attendee/> ha <#HasAccepted>aceptado<#HasDelined>rechazado su invitación al evento. \ No newline at end of file +<#IsBody><#attendee/> ha <#HasAccepted>aceptado<#HasDelined>rechazado<#HasNotAcceptedNotDeclined>not yet decided upon su invitación al evento. \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.wod b/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.wod index bbb5bbfa4..2ade0637f 100644 --- a/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.wod +++ b/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.wod @@ -24,3 +24,7 @@ HasAccepted: WOConditional { HasDeclined: WOConditional { condition = hasDeclined; } + +HasNotAcceptedNotDeclined: WOConditional { + condition = hasNotAcceptedNotDeclined; +} diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m index 3e755616a..bc19f2c7a 100644 --- a/SoObjects/Appointments/SOGoCalendarComponent.m +++ b/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];