diff --git a/ChangeLog b/ChangeLog index 580356508..5141ff8d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2008-10-01 Wolfgang Sourdeau + + * SoObjects/Appointments/SOGoCalendarComponent.m + ([SOGoCalendarComponent + -sendEMailUsingTemplateNamed:newPageNameforObject:objecttoAttendees:attendees]): + changed method to only accept one event from now on, since we + actually use less information with the Lightning-inspired + templates than before. + + * SoObjects/Appointments/SOGoAptMailNotification.m ([-homePageURL]) + ([-setHomePageURL:newhomePageURL], [-appointmentURL], [-viewTZ]) + ([-setViewTZ:newViewTZ]): removed obsolete accessors. + + * SoObjects/Appointments/SOGoAptMailICalReply.m + ([SOGoAptMailICalReply -attendeeName]): new method returning the + cn of the attendee. + 2008-09-30 Wolfgang Sourdeau * SoObjects/SOGo/SOGoLDAPUserDefaults.m ([SOGoLDAPUserDefaults diff --git a/SoObjects/Appointments/GNUmakefile b/SoObjects/Appointments/GNUmakefile index 471e9a01b..801003f15 100644 --- a/SoObjects/Appointments/GNUmakefile +++ b/SoObjects/Appointments/GNUmakefile @@ -30,8 +30,6 @@ Appointments_OBJC_FILES = \ \ SOGoAptMailNotification.m \ SOGoAptMailInvitation.m \ - SOGoAptMailUpdate.m \ - SOGoAptMailRemoval.m \ SOGoAptMailDeletion.m \ SOGoAptMailICalReply.m \ @@ -46,33 +44,21 @@ Appointments_LOCALIZED_RESOURCE_FILES = Localizable.strings Appointments_COMPONENTS += \ SOGoAptMailDutchInvitation.wo \ SOGoAptMailDutchICalReply.wo \ - SOGoAptMailDutchUpdate.wo \ - SOGoAptMailDutchRemoval.wo \ SOGoAptMailDutchDeletion.wo \ SOGoAptMailEnglishInvitation.wo \ SOGoAptMailEnglishICalReply.wo \ - SOGoAptMailEnglishUpdate.wo \ - SOGoAptMailEnglishRemoval.wo \ SOGoAptMailEnglishDeletion.wo \ SOGoAptMailFrenchInvitation.wo \ SOGoAptMailFrenchICalReply.wo \ - SOGoAptMailFrenchUpdate.wo \ - SOGoAptMailFrenchRemoval.wo \ SOGoAptMailFrenchDeletion.wo \ SOGoAptMailGermanInvitation.wo \ SOGoAptMailGermanICalReply.wo \ - SOGoAptMailGermanUpdate.wo \ - SOGoAptMailGermanRemoval.wo \ SOGoAptMailGermanDeletion.wo \ SOGoAptMailItalianInvitation.wo \ SOGoAptMailItalianICalReply.wo \ - SOGoAptMailItalianUpdate.wo \ - SOGoAptMailItalianRemoval.wo \ SOGoAptMailItalianDeletion.wo \ SOGoAptMailSpanishInvitation.wo \ SOGoAptMailSpanishICalReply.wo \ - SOGoAptMailSpanishUpdate.wo \ - SOGoAptMailSpanishRemoval.wo \ SOGoAptMailSpanishDeletion.wo \ diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m index 50649b6d8..44e9736ce 100644 --- a/SoObjects/Appointments/SOGoAppointmentObject.m +++ b/SoObjects/Appointments/SOGoAppointmentObject.m @@ -269,9 +269,8 @@ forUID: currentUID]; } - [self sendEMailUsingTemplateNamed: @"Update" - forOldObject: oldEvent - andNewObject: [newEvent itipEntryWithMethod: @"request"] + [self sendEMailUsingTemplateNamed: @"Invitation" + forObject: [newEvent itipEntryWithMethod: @"request"] toAttendees: updateAttendees]; } @@ -304,8 +303,7 @@ { [self _handleRemovedUsers: attendees]; [self sendEMailUsingTemplateNamed: @"Deletion" - forOldObject: oldEvent - andNewObject: [newEvent itipEntryWithMethod: @"cancel"] + forObject: [newEvent itipEntryWithMethod: @"cancel"] toAttendees: attendees]; } @@ -325,8 +323,7 @@ { [self _handleAddedUsers: attendees fromEvent: newEvent]; [self sendEMailUsingTemplateNamed: @"Invitation" - forOldObject: oldEvent - andNewObject: [newEvent itipEntryWithMethod: @"request"] + forObject: [newEvent itipEntryWithMethod: @"request"] toAttendees: attendees]; } } @@ -351,8 +348,7 @@ { [self _handleAddedUsers: attendees fromEvent: newEvent]; [self sendEMailUsingTemplateNamed: @"Invitation" - forOldObject: nil - andNewObject: [newEvent itipEntryWithMethod: @"request"] + forObject: [newEvent itipEntryWithMethod: @"request"] toAttendees: attendees]; } @@ -470,7 +466,7 @@ [self _addOrUpdateEvent: event forUID: uid]; #warning fix this when sendEmailUsing blabla has been cleaned up [self sendEMailUsingTemplateNamed: @"Invitation" - forOldObject: nil andNewObject: event + forObject: event toAttendees: [NSArray arrayWithObject: person]]; [person release]; [elements @@ -502,7 +498,7 @@ [self _removeEventFromUID: uid]; #warning fix this when sendEmailUsing blabla has been cleaned up [self sendEMailUsingTemplateNamed: @"Deletion" - forOldObject: nil andNewObject: event + forObject: event toAttendees: [NSArray arrayWithObject: person]]; [person release]; [elements @@ -619,8 +615,7 @@ { [self _handleRemovedUsers: attendees]; [self sendEMailUsingTemplateNamed: @"Deletion" - forOldObject: nil - andNewObject: [occurence itipEntryWithMethod: @"cancel"] + forObject: [occurence itipEntryWithMethod: @"cancel"] toAttendees: attendees]; } } diff --git a/SoObjects/Appointments/SOGoAptMailDutchDeletion.wo/SOGoAptMailDutchDeletion.html b/SoObjects/Appointments/SOGoAptMailDutchDeletion.wo/SOGoAptMailDutchDeletion.html index 2353f8f3c..c4e107131 100644 --- a/SoObjects/Appointments/SOGoAptMailDutchDeletion.wo/SOGoAptMailDutchDeletion.html +++ b/SoObjects/Appointments/SOGoAptMailDutchDeletion.wo/SOGoAptMailDutchDeletion.html @@ -1,4 +1,2 @@ -<#IsSubject>Appointment <#AptStartDate /> at <#AptStartTime /> has been cancelled -<#IsBody> -The appointment at <#AptStartDate /> <#AptStartTime /> has been cancelled by <#Organizer />. - \ No newline at end of file +<#IsSubject>Gebeurtenis geannuleerd: <#summary/> +<#IsBody><#organizer/> heeft deze gebeurtenis geannuleerd: « <#summary/> ». \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailDutchDeletion.wo/SOGoAptMailDutchDeletion.wod b/SoObjects/Appointments/SOGoAptMailDutchDeletion.wo/SOGoAptMailDutchDeletion.wod index 3e37496c4..6d3d52eca 100644 --- a/SoObjects/Appointments/SOGoAptMailDutchDeletion.wo/SOGoAptMailDutchDeletion.wod +++ b/SoObjects/Appointments/SOGoAptMailDutchDeletion.wo/SOGoAptMailDutchDeletion.wod @@ -1,34 +1,18 @@ -AptStartDate: WOString { - value = newStartDate; - dateformat = "%d/%m/%y"; - escapeHTML = NO; -} - -AptStartTime: WOString { - value = newStartDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -Organizer: WOString { - value = newApt.organizer.cnWithoutQuotes; - escapeHTML = NO; -} - -HasHomePageURL: WOConditional { - condition = homePageURL.length; -} - -HomePageURL: WOString { - value = appointmentURL; - escapeHTML = NO; -} - IsSubject: WOConditional { condition = isSubject; } IsBody: WOConditional { condition = isSubject; - negate = YES; + negate = YES; +} + +organizer: WOString { + value = organizerName; + escapeHTML = NO; +} + +summary: WOString { + value = summary; + escapeHTML = NO; } diff --git a/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.html b/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.html index c861c2714..c386d95a6 100644 --- a/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.html +++ b/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.html @@ -1,4 +1,2 @@ -<#IsSubject>Re: rendez-vous le <#AptStartDate/> à <#AptStartTime/> -<#IsBody> -<#Attendee/> has <#HasAccepted>accepted<#HasDeclined>declined your invitation. - +<#IsSubject>Antwoord voor de gebeurtenisuitnodiging: <#summary/> +<#IsBody><#organizer/> heeft uw uitnodiging voor de gebeurtenis <#HasAccepted>geaccepteerd<#HasAccepted><#HasDeclined>geweigerd<#HasDeclined>. \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.wod b/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.wod index 71a954616..bbb5bbfa4 100644 --- a/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.wod +++ b/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.wod @@ -1,17 +1,19 @@ -AptStartDate: WOString { - value = startDate; - dateformat = "%d/%m/%y"; +IsSubject: WOConditional { + condition = isSubject; +} + +IsBody: WOConditional { + condition = isSubject; + negate = YES; +} + +summary: WOString { + value = summary; escapeHTML = NO; } -AptStartTime: WOString { - value = startDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -Attendee: WOString { - value = attendee.cnWithoutQuotes; +attendee: WOString { + value = attendeeName; escapeHTML = NO; } @@ -22,12 +24,3 @@ HasAccepted: WOConditional { HasDeclined: WOConditional { condition = hasDeclined; } - -IsSubject: WOConditional { - condition = isSubject; -} - -IsBody: WOConditional { - condition = isSubject; - negate = YES; -} diff --git a/SoObjects/Appointments/SOGoAptMailDutchInvitation.wo/SOGoAptMailDutchInvitation.html b/SoObjects/Appointments/SOGoAptMailDutchInvitation.wo/SOGoAptMailDutchInvitation.html index 4d6bbab40..8e2bf817d 100644 --- a/SoObjects/Appointments/SOGoAptMailDutchInvitation.wo/SOGoAptMailDutchInvitation.html +++ b/SoObjects/Appointments/SOGoAptMailDutchInvitation.wo/SOGoAptMailDutchInvitation.html @@ -1,7 +1,2 @@ -<#IsSubject>Appointment on <#AptStartDate /> at <#AptStartTime /> -<#IsBody> -You're invited by <#Organizer /> to a meeting. -<#HasHomePageURL> -Please make a decision for this invitation at <#HomePageURL />. - - \ No newline at end of file +<#IsSubject>Uitnodiging voor gebeurtenis: <#summary/> +<#IsBody><#organizer/> heeft u uitgenodigd voor <#summary/>. \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailDutchInvitation.wo/SOGoAptMailDutchInvitation.wod b/SoObjects/Appointments/SOGoAptMailDutchInvitation.wo/SOGoAptMailDutchInvitation.wod index 3e37496c4..6d3d52eca 100644 --- a/SoObjects/Appointments/SOGoAptMailDutchInvitation.wo/SOGoAptMailDutchInvitation.wod +++ b/SoObjects/Appointments/SOGoAptMailDutchInvitation.wo/SOGoAptMailDutchInvitation.wod @@ -1,34 +1,18 @@ -AptStartDate: WOString { - value = newStartDate; - dateformat = "%d/%m/%y"; - escapeHTML = NO; -} - -AptStartTime: WOString { - value = newStartDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -Organizer: WOString { - value = newApt.organizer.cnWithoutQuotes; - escapeHTML = NO; -} - -HasHomePageURL: WOConditional { - condition = homePageURL.length; -} - -HomePageURL: WOString { - value = appointmentURL; - escapeHTML = NO; -} - IsSubject: WOConditional { condition = isSubject; } IsBody: WOConditional { condition = isSubject; - negate = YES; + negate = YES; +} + +organizer: WOString { + value = organizerName; + escapeHTML = NO; +} + +summary: WOString { + value = summary; + escapeHTML = NO; } diff --git a/SoObjects/Appointments/SOGoAptMailDutchRemoval.wo/SOGoAptMailDutchRemoval.html b/SoObjects/Appointments/SOGoAptMailDutchRemoval.wo/SOGoAptMailDutchRemoval.html deleted file mode 100644 index 32fdc2623..000000000 --- a/SoObjects/Appointments/SOGoAptMailDutchRemoval.wo/SOGoAptMailDutchRemoval.html +++ /dev/null @@ -1,4 +0,0 @@ -<#IsSubject>Removed from appointment <#AptStartDate /> at <#AptStartTime /> -<#IsBody> -You have been removed by <#Organizer /> from the appointment scheduled at <#AptStartDate /> <#AptStartTime />. - \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailDutchRemoval.wo/SOGoAptMailDutchRemoval.wod b/SoObjects/Appointments/SOGoAptMailDutchRemoval.wo/SOGoAptMailDutchRemoval.wod deleted file mode 100644 index 3e37496c4..000000000 --- a/SoObjects/Appointments/SOGoAptMailDutchRemoval.wo/SOGoAptMailDutchRemoval.wod +++ /dev/null @@ -1,34 +0,0 @@ -AptStartDate: WOString { - value = newStartDate; - dateformat = "%d/%m/%y"; - escapeHTML = NO; -} - -AptStartTime: WOString { - value = newStartDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -Organizer: WOString { - value = newApt.organizer.cnWithoutQuotes; - escapeHTML = NO; -} - -HasHomePageURL: WOConditional { - condition = homePageURL.length; -} - -HomePageURL: WOString { - value = appointmentURL; - escapeHTML = NO; -} - -IsSubject: WOConditional { - condition = isSubject; -} - -IsBody: WOConditional { - condition = isSubject; - negate = YES; -} diff --git a/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.html b/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.html deleted file mode 100644 index 6a733247b..000000000 --- a/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.html +++ /dev/null @@ -1,8 +0,0 @@ -<#IsSubject>The appointment for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed -<#IsBody> -This appointment, previously set for <#OldAptStartDate /> -at <#OldAptStartTime /> is now scheduled for <#NewAptStartDate /> at <#NewAptStartTime /> -<#HasHomePageURL> -Please make a decision for these new settings at <#HomePageURL />. - - \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.wod b/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.wod deleted file mode 100644 index 3dccef2aa..000000000 --- a/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.wod +++ /dev/null @@ -1,46 +0,0 @@ -OldAptStartDate: WOString { - value = oldStartDate; - dateformat = "%d/%m/%y"; - escapeHTML = NO; -} - -OldAptStartTime: WOString { - value = oldStartDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -NewAptStartDate: WOString { - value = newStartDate; - dateformat = "%d/%m/%y"; - escapeHTML = NO; -} - -NewAptStartTime: WOString { - value = newStartDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -Organizer: WOString { - value = newApt.organizer.cnWithoutQuotes; - escapeHTML = NO; -} - -HasHomePageURL: WOConditional { - condition = homePageURL.length; -} - -HomePageURL: WOString { - value = appointmentURL; - escapeHTML = NO; -} - -IsSubject: WOConditional { - condition = isSubject; -} - -IsBody: WOConditional { - condition = isSubject; - negate = YES; -} diff --git a/SoObjects/Appointments/SOGoAptMailEnglishDeletion.wo/SOGoAptMailEnglishDeletion.html b/SoObjects/Appointments/SOGoAptMailEnglishDeletion.wo/SOGoAptMailEnglishDeletion.html index 2353f8f3c..7dcf57b36 100644 --- a/SoObjects/Appointments/SOGoAptMailEnglishDeletion.wo/SOGoAptMailEnglishDeletion.html +++ b/SoObjects/Appointments/SOGoAptMailEnglishDeletion.wo/SOGoAptMailEnglishDeletion.html @@ -1,4 +1,2 @@ -<#IsSubject>Appointment <#AptStartDate /> at <#AptStartTime /> has been cancelled -<#IsBody> -The appointment at <#AptStartDate /> <#AptStartTime /> has been cancelled by <#Organizer />. - \ No newline at end of file +<#IsSubject>Event Cancelled: <#summary/> +<#IsBody><#organizer/> has cancelled this event: <#summary/>. \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailEnglishDeletion.wo/SOGoAptMailEnglishDeletion.wod b/SoObjects/Appointments/SOGoAptMailEnglishDeletion.wo/SOGoAptMailEnglishDeletion.wod index 3e37496c4..6d3d52eca 100644 --- a/SoObjects/Appointments/SOGoAptMailEnglishDeletion.wo/SOGoAptMailEnglishDeletion.wod +++ b/SoObjects/Appointments/SOGoAptMailEnglishDeletion.wo/SOGoAptMailEnglishDeletion.wod @@ -1,34 +1,18 @@ -AptStartDate: WOString { - value = newStartDate; - dateformat = "%d/%m/%y"; - escapeHTML = NO; -} - -AptStartTime: WOString { - value = newStartDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -Organizer: WOString { - value = newApt.organizer.cnWithoutQuotes; - escapeHTML = NO; -} - -HasHomePageURL: WOConditional { - condition = homePageURL.length; -} - -HomePageURL: WOString { - value = appointmentURL; - escapeHTML = NO; -} - IsSubject: WOConditional { condition = isSubject; } IsBody: WOConditional { condition = isSubject; - negate = YES; + negate = YES; +} + +organizer: WOString { + value = organizerName; + escapeHTML = NO; +} + +summary: WOString { + value = summary; + escapeHTML = NO; } diff --git a/SoObjects/Appointments/SOGoAptMailEnglishICalReply.wo/SOGoAptMailEnglishICalReply.html b/SoObjects/Appointments/SOGoAptMailEnglishICalReply.wo/SOGoAptMailEnglishICalReply.html index c861c2714..b7f1f0bde 100644 --- a/SoObjects/Appointments/SOGoAptMailEnglishICalReply.wo/SOGoAptMailEnglishICalReply.html +++ b/SoObjects/Appointments/SOGoAptMailEnglishICalReply.wo/SOGoAptMailEnglishICalReply.html @@ -1,4 +1,2 @@ -<#IsSubject>Re: rendez-vous le <#AptStartDate/> à <#AptStartTime/> -<#IsBody> -<#Attendee/> has <#HasAccepted>accepted<#HasDeclined>declined your invitation. - +<#IsSubject>Event Invitation Reply: <#summary/> +<#IsBody><#attendee/> has <#HasAccepted>accepted<#HasDeclined>declined<#HasDeclined> your event invitation. \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailEnglishICalReply.wo/SOGoAptMailEnglishICalReply.wod b/SoObjects/Appointments/SOGoAptMailEnglishICalReply.wo/SOGoAptMailEnglishICalReply.wod index 71a954616..bbb5bbfa4 100644 --- a/SoObjects/Appointments/SOGoAptMailEnglishICalReply.wo/SOGoAptMailEnglishICalReply.wod +++ b/SoObjects/Appointments/SOGoAptMailEnglishICalReply.wo/SOGoAptMailEnglishICalReply.wod @@ -1,17 +1,19 @@ -AptStartDate: WOString { - value = startDate; - dateformat = "%d/%m/%y"; +IsSubject: WOConditional { + condition = isSubject; +} + +IsBody: WOConditional { + condition = isSubject; + negate = YES; +} + +summary: WOString { + value = summary; escapeHTML = NO; } -AptStartTime: WOString { - value = startDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -Attendee: WOString { - value = attendee.cnWithoutQuotes; +attendee: WOString { + value = attendeeName; escapeHTML = NO; } @@ -22,12 +24,3 @@ HasAccepted: WOConditional { HasDeclined: WOConditional { condition = hasDeclined; } - -IsSubject: WOConditional { - condition = isSubject; -} - -IsBody: WOConditional { - condition = isSubject; - negate = YES; -} diff --git a/SoObjects/Appointments/SOGoAptMailEnglishInvitation.wo/SOGoAptMailEnglishInvitation.html b/SoObjects/Appointments/SOGoAptMailEnglishInvitation.wo/SOGoAptMailEnglishInvitation.html index 4d6bbab40..322580d2b 100644 --- a/SoObjects/Appointments/SOGoAptMailEnglishInvitation.wo/SOGoAptMailEnglishInvitation.html +++ b/SoObjects/Appointments/SOGoAptMailEnglishInvitation.wo/SOGoAptMailEnglishInvitation.html @@ -1,7 +1,2 @@ -<#IsSubject>Appointment on <#AptStartDate /> at <#AptStartTime /> -<#IsBody> -You're invited by <#Organizer /> to a meeting. -<#HasHomePageURL> -Please make a decision for this invitation at <#HomePageURL />. - - \ No newline at end of file +<#IsSubject>Event Invitation: <#summary/> +<#IsBody><#organizer/> has invited you to <#summary/>. diff --git a/SoObjects/Appointments/SOGoAptMailEnglishInvitation.wo/SOGoAptMailEnglishInvitation.wod b/SoObjects/Appointments/SOGoAptMailEnglishInvitation.wo/SOGoAptMailEnglishInvitation.wod index 3e37496c4..6d3d52eca 100644 --- a/SoObjects/Appointments/SOGoAptMailEnglishInvitation.wo/SOGoAptMailEnglishInvitation.wod +++ b/SoObjects/Appointments/SOGoAptMailEnglishInvitation.wo/SOGoAptMailEnglishInvitation.wod @@ -1,34 +1,18 @@ -AptStartDate: WOString { - value = newStartDate; - dateformat = "%d/%m/%y"; - escapeHTML = NO; -} - -AptStartTime: WOString { - value = newStartDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -Organizer: WOString { - value = newApt.organizer.cnWithoutQuotes; - escapeHTML = NO; -} - -HasHomePageURL: WOConditional { - condition = homePageURL.length; -} - -HomePageURL: WOString { - value = appointmentURL; - escapeHTML = NO; -} - IsSubject: WOConditional { condition = isSubject; } IsBody: WOConditional { condition = isSubject; - negate = YES; + negate = YES; +} + +organizer: WOString { + value = organizerName; + escapeHTML = NO; +} + +summary: WOString { + value = summary; + escapeHTML = NO; } diff --git a/SoObjects/Appointments/SOGoAptMailEnglishRemoval.wo/SOGoAptMailEnglishRemoval.html b/SoObjects/Appointments/SOGoAptMailEnglishRemoval.wo/SOGoAptMailEnglishRemoval.html deleted file mode 100644 index 32fdc2623..000000000 --- a/SoObjects/Appointments/SOGoAptMailEnglishRemoval.wo/SOGoAptMailEnglishRemoval.html +++ /dev/null @@ -1,4 +0,0 @@ -<#IsSubject>Removed from appointment <#AptStartDate /> at <#AptStartTime /> -<#IsBody> -You have been removed by <#Organizer /> from the appointment scheduled at <#AptStartDate /> <#AptStartTime />. - \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailEnglishRemoval.wo/SOGoAptMailEnglishRemoval.wod b/SoObjects/Appointments/SOGoAptMailEnglishRemoval.wo/SOGoAptMailEnglishRemoval.wod deleted file mode 100644 index 3e37496c4..000000000 --- a/SoObjects/Appointments/SOGoAptMailEnglishRemoval.wo/SOGoAptMailEnglishRemoval.wod +++ /dev/null @@ -1,34 +0,0 @@ -AptStartDate: WOString { - value = newStartDate; - dateformat = "%d/%m/%y"; - escapeHTML = NO; -} - -AptStartTime: WOString { - value = newStartDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -Organizer: WOString { - value = newApt.organizer.cnWithoutQuotes; - escapeHTML = NO; -} - -HasHomePageURL: WOConditional { - condition = homePageURL.length; -} - -HomePageURL: WOString { - value = appointmentURL; - escapeHTML = NO; -} - -IsSubject: WOConditional { - condition = isSubject; -} - -IsBody: WOConditional { - condition = isSubject; - negate = YES; -} diff --git a/SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.html b/SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.html deleted file mode 100644 index 6a733247b..000000000 --- a/SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.html +++ /dev/null @@ -1,8 +0,0 @@ -<#IsSubject>The appointment for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed -<#IsBody> -This appointment, previously set for <#OldAptStartDate /> -at <#OldAptStartTime /> is now scheduled for <#NewAptStartDate /> at <#NewAptStartTime /> -<#HasHomePageURL> -Please make a decision for these new settings at <#HomePageURL />. - - \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.wod b/SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.wod deleted file mode 100644 index 3dccef2aa..000000000 --- a/SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.wod +++ /dev/null @@ -1,46 +0,0 @@ -OldAptStartDate: WOString { - value = oldStartDate; - dateformat = "%d/%m/%y"; - escapeHTML = NO; -} - -OldAptStartTime: WOString { - value = oldStartDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -NewAptStartDate: WOString { - value = newStartDate; - dateformat = "%d/%m/%y"; - escapeHTML = NO; -} - -NewAptStartTime: WOString { - value = newStartDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -Organizer: WOString { - value = newApt.organizer.cnWithoutQuotes; - escapeHTML = NO; -} - -HasHomePageURL: WOConditional { - condition = homePageURL.length; -} - -HomePageURL: WOString { - value = appointmentURL; - escapeHTML = NO; -} - -IsSubject: WOConditional { - condition = isSubject; -} - -IsBody: WOConditional { - condition = isSubject; - negate = YES; -} diff --git a/SoObjects/Appointments/SOGoAptMailFrenchDeletion.wo/SOGoAptMailFrenchDeletion.html b/SoObjects/Appointments/SOGoAptMailFrenchDeletion.wo/SOGoAptMailFrenchDeletion.html index 780726512..b28fed22d 100644 --- a/SoObjects/Appointments/SOGoAptMailFrenchDeletion.wo/SOGoAptMailFrenchDeletion.html +++ b/SoObjects/Appointments/SOGoAptMailFrenchDeletion.wo/SOGoAptMailFrenchDeletion.html @@ -1,4 +1,2 @@ -<#IsSubject>Le rendez-vous du <#AptStartDate /> à <#AptStartTime /> a été supprimé -<#IsBody> -Le rendez-vous du <#AptStartDate /> à <#AptStartTime /> a été supprimé par <#Organizer />. - +<#IsSubject>Événement annulé : « <#summary/> » +<#IsBody><#organizer/> a annulé cet événement : « <#summary/> ». \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailFrenchDeletion.wo/SOGoAptMailFrenchDeletion.wod b/SoObjects/Appointments/SOGoAptMailFrenchDeletion.wo/SOGoAptMailFrenchDeletion.wod index 3e37496c4..6d3d52eca 100644 --- a/SoObjects/Appointments/SOGoAptMailFrenchDeletion.wo/SOGoAptMailFrenchDeletion.wod +++ b/SoObjects/Appointments/SOGoAptMailFrenchDeletion.wo/SOGoAptMailFrenchDeletion.wod @@ -1,34 +1,18 @@ -AptStartDate: WOString { - value = newStartDate; - dateformat = "%d/%m/%y"; - escapeHTML = NO; -} - -AptStartTime: WOString { - value = newStartDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -Organizer: WOString { - value = newApt.organizer.cnWithoutQuotes; - escapeHTML = NO; -} - -HasHomePageURL: WOConditional { - condition = homePageURL.length; -} - -HomePageURL: WOString { - value = appointmentURL; - escapeHTML = NO; -} - IsSubject: WOConditional { condition = isSubject; } IsBody: WOConditional { condition = isSubject; - negate = YES; + negate = YES; +} + +organizer: WOString { + value = organizerName; + escapeHTML = NO; +} + +summary: WOString { + value = summary; + escapeHTML = NO; } diff --git a/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.html b/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.html index b12b49933..3a37d0193 100644 --- a/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.html +++ b/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.html @@ -1,4 +1,2 @@ -<#IsSubject>Re: rendez-vous le <#AptStartDate/> à <#AptStartTime/> -<#IsBody> -<#Attendee/> a <#HasAccepted>accepté<#HasDeclined>décliné votre invitation. - +<#IsSubject>Réponse à l'invitation : «<#summary/>» +<#IsBody><#attendee/> a <#HasAccepted>accepté<#HasDeclined>refusé 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 71a954616..bbb5bbfa4 100644 --- a/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.wod +++ b/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.wod @@ -1,17 +1,19 @@ -AptStartDate: WOString { - value = startDate; - dateformat = "%d/%m/%y"; +IsSubject: WOConditional { + condition = isSubject; +} + +IsBody: WOConditional { + condition = isSubject; + negate = YES; +} + +summary: WOString { + value = summary; escapeHTML = NO; } -AptStartTime: WOString { - value = startDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -Attendee: WOString { - value = attendee.cnWithoutQuotes; +attendee: WOString { + value = attendeeName; escapeHTML = NO; } @@ -22,12 +24,3 @@ HasAccepted: WOConditional { HasDeclined: WOConditional { condition = hasDeclined; } - -IsSubject: WOConditional { - condition = isSubject; -} - -IsBody: WOConditional { - condition = isSubject; - negate = YES; -} diff --git a/SoObjects/Appointments/SOGoAptMailFrenchInvitation.wo/SOGoAptMailFrenchInvitation.html b/SoObjects/Appointments/SOGoAptMailFrenchInvitation.wo/SOGoAptMailFrenchInvitation.html index b3313946f..835952a13 100644 --- a/SoObjects/Appointments/SOGoAptMailFrenchInvitation.wo/SOGoAptMailFrenchInvitation.html +++ b/SoObjects/Appointments/SOGoAptMailFrenchInvitation.wo/SOGoAptMailFrenchInvitation.html @@ -1,7 +1,2 @@ -<#IsSubject>Rendez-vous le <#AptStartDate /> à <#AptStartTime /> -<#IsBody> -Vous êtes invité par <#Organizer /> à une réunion. -<#HasHomePageURL> -Veuillez donner votre réponse à l'adresse <#HomePageURL />. - - +<#IsSubject>Invitation : <#summary/> +<#IsBody><#organizer/> vous a invité à « <#summary/> ». diff --git a/SoObjects/Appointments/SOGoAptMailFrenchInvitation.wo/SOGoAptMailFrenchInvitation.wod b/SoObjects/Appointments/SOGoAptMailFrenchInvitation.wo/SOGoAptMailFrenchInvitation.wod index 3e37496c4..6d3d52eca 100644 --- a/SoObjects/Appointments/SOGoAptMailFrenchInvitation.wo/SOGoAptMailFrenchInvitation.wod +++ b/SoObjects/Appointments/SOGoAptMailFrenchInvitation.wo/SOGoAptMailFrenchInvitation.wod @@ -1,34 +1,18 @@ -AptStartDate: WOString { - value = newStartDate; - dateformat = "%d/%m/%y"; - escapeHTML = NO; -} - -AptStartTime: WOString { - value = newStartDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -Organizer: WOString { - value = newApt.organizer.cnWithoutQuotes; - escapeHTML = NO; -} - -HasHomePageURL: WOConditional { - condition = homePageURL.length; -} - -HomePageURL: WOString { - value = appointmentURL; - escapeHTML = NO; -} - IsSubject: WOConditional { condition = isSubject; } IsBody: WOConditional { condition = isSubject; - negate = YES; + negate = YES; +} + +organizer: WOString { + value = organizerName; + escapeHTML = NO; +} + +summary: WOString { + value = summary; + escapeHTML = NO; } diff --git a/SoObjects/Appointments/SOGoAptMailFrenchRemoval.wo/SOGoAptMailFrenchRemoval.html b/SoObjects/Appointments/SOGoAptMailFrenchRemoval.wo/SOGoAptMailFrenchRemoval.html deleted file mode 100644 index 1cf438f7e..000000000 --- a/SoObjects/Appointments/SOGoAptMailFrenchRemoval.wo/SOGoAptMailFrenchRemoval.html +++ /dev/null @@ -1,4 +0,0 @@ -<#IsSubject>Supprimé de la réunion du <#AptStartDate /> à <#AptStartTime /> -<#IsBody> -Vous ne faites plus parti de la liste des invités de la réunion du <#AptStartDate /> à <#AptStartTime /> organisée par <#Organizer />. - diff --git a/SoObjects/Appointments/SOGoAptMailFrenchRemoval.wo/SOGoAptMailFrenchRemoval.wod b/SoObjects/Appointments/SOGoAptMailFrenchRemoval.wo/SOGoAptMailFrenchRemoval.wod deleted file mode 100644 index 3e37496c4..000000000 --- a/SoObjects/Appointments/SOGoAptMailFrenchRemoval.wo/SOGoAptMailFrenchRemoval.wod +++ /dev/null @@ -1,34 +0,0 @@ -AptStartDate: WOString { - value = newStartDate; - dateformat = "%d/%m/%y"; - escapeHTML = NO; -} - -AptStartTime: WOString { - value = newStartDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -Organizer: WOString { - value = newApt.organizer.cnWithoutQuotes; - escapeHTML = NO; -} - -HasHomePageURL: WOConditional { - condition = homePageURL.length; -} - -HomePageURL: WOString { - value = appointmentURL; - escapeHTML = NO; -} - -IsSubject: WOConditional { - condition = isSubject; -} - -IsBody: WOConditional { - condition = isSubject; - negate = YES; -} diff --git a/SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.html b/SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.html deleted file mode 100644 index 48a3c2265..000000000 --- a/SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.html +++ /dev/null @@ -1,5 +0,0 @@ -<#IsSubject>Le rendez-vous du <#OldAptStartDate /> à <#OldAptStartTime /> est modifié -<#IsBody> -La réunion qui devait se dérouler le <#OldAptStartDate /> à <#OldAptStartTime /> est maintenant prévue le <#NewAptStartDate /> à <#NewAptStartTime />. -Vous êtes invité à accepter ou refuser de participer à la réunion pour cette nouvelle date à l'adresse <#HomePageURL />. - diff --git a/SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.wod b/SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.wod deleted file mode 100644 index 3dccef2aa..000000000 --- a/SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.wod +++ /dev/null @@ -1,46 +0,0 @@ -OldAptStartDate: WOString { - value = oldStartDate; - dateformat = "%d/%m/%y"; - escapeHTML = NO; -} - -OldAptStartTime: WOString { - value = oldStartDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -NewAptStartDate: WOString { - value = newStartDate; - dateformat = "%d/%m/%y"; - escapeHTML = NO; -} - -NewAptStartTime: WOString { - value = newStartDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -Organizer: WOString { - value = newApt.organizer.cnWithoutQuotes; - escapeHTML = NO; -} - -HasHomePageURL: WOConditional { - condition = homePageURL.length; -} - -HomePageURL: WOString { - value = appointmentURL; - escapeHTML = NO; -} - -IsSubject: WOConditional { - condition = isSubject; -} - -IsBody: WOConditional { - condition = isSubject; - negate = YES; -} diff --git a/SoObjects/Appointments/SOGoAptMailGermanDeletion.wo/SOGoAptMailGermanDeletion.html b/SoObjects/Appointments/SOGoAptMailGermanDeletion.wo/SOGoAptMailGermanDeletion.html index edbc30882..43b8d5c9b 100644 --- a/SoObjects/Appointments/SOGoAptMailGermanDeletion.wo/SOGoAptMailGermanDeletion.html +++ b/SoObjects/Appointments/SOGoAptMailGermanDeletion.wo/SOGoAptMailGermanDeletion.html @@ -1,4 +1,2 @@ -<#IsSubject>Der Termin am <#AptStartDate /> um <#AptStartTime /> wurde gelöscht. -<#IsBody> -Der Termin am <#AptStartDate /> um <#AptStartTime /> wurde von <#Organizer /> gelöscht. - +<#IsSubject>Termin abgesagt: <#summary/> +<#IsBody><#organizer/> hat diesen Termin abgesagt: <#summary/> diff --git a/SoObjects/Appointments/SOGoAptMailGermanDeletion.wo/SOGoAptMailGermanDeletion.wod b/SoObjects/Appointments/SOGoAptMailGermanDeletion.wo/SOGoAptMailGermanDeletion.wod index 3e37496c4..6d3d52eca 100644 --- a/SoObjects/Appointments/SOGoAptMailGermanDeletion.wo/SOGoAptMailGermanDeletion.wod +++ b/SoObjects/Appointments/SOGoAptMailGermanDeletion.wo/SOGoAptMailGermanDeletion.wod @@ -1,34 +1,18 @@ -AptStartDate: WOString { - value = newStartDate; - dateformat = "%d/%m/%y"; - escapeHTML = NO; -} - -AptStartTime: WOString { - value = newStartDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -Organizer: WOString { - value = newApt.organizer.cnWithoutQuotes; - escapeHTML = NO; -} - -HasHomePageURL: WOConditional { - condition = homePageURL.length; -} - -HomePageURL: WOString { - value = appointmentURL; - escapeHTML = NO; -} - IsSubject: WOConditional { condition = isSubject; } IsBody: WOConditional { condition = isSubject; - negate = YES; + negate = YES; +} + +organizer: WOString { + value = organizerName; + escapeHTML = NO; +} + +summary: WOString { + value = summary; + escapeHTML = NO; } diff --git a/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.html b/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.html index c861c2714..a67f86fb4 100644 --- a/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.html +++ b/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.html @@ -1,4 +1,2 @@ -<#IsSubject>Re: rendez-vous le <#AptStartDate/> à <#AptStartTime/> -<#IsBody> -<#Attendee/> has <#HasAccepted>accepted<#HasDeclined>declined your invitation. - +<#IsSubject>Antwort Termineinladung: <#summary/> +<#IsBody><#attendee/> hat Ihre Termineinladung <#HasAccepted>akzeptiert<#HasDeclined>abgelehnt<#HasDeclined>. \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.wod b/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.wod index 71a954616..bbb5bbfa4 100644 --- a/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.wod +++ b/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.wod @@ -1,17 +1,19 @@ -AptStartDate: WOString { - value = startDate; - dateformat = "%d/%m/%y"; +IsSubject: WOConditional { + condition = isSubject; +} + +IsBody: WOConditional { + condition = isSubject; + negate = YES; +} + +summary: WOString { + value = summary; escapeHTML = NO; } -AptStartTime: WOString { - value = startDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -Attendee: WOString { - value = attendee.cnWithoutQuotes; +attendee: WOString { + value = attendeeName; escapeHTML = NO; } @@ -22,12 +24,3 @@ HasAccepted: WOConditional { HasDeclined: WOConditional { condition = hasDeclined; } - -IsSubject: WOConditional { - condition = isSubject; -} - -IsBody: WOConditional { - condition = isSubject; - negate = YES; -} diff --git a/SoObjects/Appointments/SOGoAptMailGermanInvitation.wo/SOGoAptMailGermanInvitation.html b/SoObjects/Appointments/SOGoAptMailGermanInvitation.wo/SOGoAptMailGermanInvitation.html index 383fbb856..9500e1fa9 100644 --- a/SoObjects/Appointments/SOGoAptMailGermanInvitation.wo/SOGoAptMailGermanInvitation.html +++ b/SoObjects/Appointments/SOGoAptMailGermanInvitation.wo/SOGoAptMailGermanInvitation.html @@ -1,7 +1,2 @@ -<#IsSubject>Termin am <#AptStartDate /> um <#AptStartTime /> -<#IsBody> -<#Organizer /> lädt Sie zu einem Termin am <#AptStartDate /> um <#AptStartTime /> ein. -<#HasHomePageURL> -Bitte benutzen Sie folgende URL, um anzugeben, ob Sie an dem Termin teilnehmen können: <#HomePageURL />. - - +<#IsSubject>Termineinladung: <#summary/> +<#IsBody><#organizer/> hat Sie zu <#summary/> eingeladen. diff --git a/SoObjects/Appointments/SOGoAptMailGermanInvitation.wo/SOGoAptMailGermanInvitation.wod b/SoObjects/Appointments/SOGoAptMailGermanInvitation.wo/SOGoAptMailGermanInvitation.wod index 3e37496c4..6d3d52eca 100644 --- a/SoObjects/Appointments/SOGoAptMailGermanInvitation.wo/SOGoAptMailGermanInvitation.wod +++ b/SoObjects/Appointments/SOGoAptMailGermanInvitation.wo/SOGoAptMailGermanInvitation.wod @@ -1,34 +1,18 @@ -AptStartDate: WOString { - value = newStartDate; - dateformat = "%d/%m/%y"; - escapeHTML = NO; -} - -AptStartTime: WOString { - value = newStartDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -Organizer: WOString { - value = newApt.organizer.cnWithoutQuotes; - escapeHTML = NO; -} - -HasHomePageURL: WOConditional { - condition = homePageURL.length; -} - -HomePageURL: WOString { - value = appointmentURL; - escapeHTML = NO; -} - IsSubject: WOConditional { condition = isSubject; } IsBody: WOConditional { condition = isSubject; - negate = YES; + negate = YES; +} + +organizer: WOString { + value = organizerName; + escapeHTML = NO; +} + +summary: WOString { + value = summary; + escapeHTML = NO; } diff --git a/SoObjects/Appointments/SOGoAptMailGermanRemoval.wo/SOGoAptMailGermanRemoval.html b/SoObjects/Appointments/SOGoAptMailGermanRemoval.wo/SOGoAptMailGermanRemoval.html deleted file mode 100644 index 3261311e5..000000000 --- a/SoObjects/Appointments/SOGoAptMailGermanRemoval.wo/SOGoAptMailGermanRemoval.html +++ /dev/null @@ -1,4 +0,0 @@ -<#IsSubject>Von dem Termin am <#AptStartDate /> um <#AptStartTime /> gelöscht -<#IsBody> -Sie sind nicht mehr eingeladen zu dem Termin am <#AptStartDate /> um <#AptStartTime /> organisiert von <#Organizer />. - diff --git a/SoObjects/Appointments/SOGoAptMailGermanRemoval.wo/SOGoAptMailGermanRemoval.wod b/SoObjects/Appointments/SOGoAptMailGermanRemoval.wo/SOGoAptMailGermanRemoval.wod deleted file mode 100644 index 3e37496c4..000000000 --- a/SoObjects/Appointments/SOGoAptMailGermanRemoval.wo/SOGoAptMailGermanRemoval.wod +++ /dev/null @@ -1,34 +0,0 @@ -AptStartDate: WOString { - value = newStartDate; - dateformat = "%d/%m/%y"; - escapeHTML = NO; -} - -AptStartTime: WOString { - value = newStartDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -Organizer: WOString { - value = newApt.organizer.cnWithoutQuotes; - escapeHTML = NO; -} - -HasHomePageURL: WOConditional { - condition = homePageURL.length; -} - -HomePageURL: WOString { - value = appointmentURL; - escapeHTML = NO; -} - -IsSubject: WOConditional { - condition = isSubject; -} - -IsBody: WOConditional { - condition = isSubject; - negate = YES; -} diff --git a/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.html b/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.html deleted file mode 100644 index f5ce36672..000000000 --- a/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.html +++ /dev/null @@ -1,5 +0,0 @@ -<#IsSubject>Veränderung des Termins am <#OldAptStartDate /> um <#OldAptStartTime /> -<#IsBody> -Der Termin, der ursprünglich am <#OldAptStartDate /> um <#OldAptStartTime /> stattfinden sollte, ist jetzt für den <#NewAptStartDate /> um <#NewAptStartTime /> geplant. -Bitte geben Sie an folgender URL an, ob Sie an diesem Termin zum neuen Datum teilnehmen können: <#HomePageURL />. - diff --git a/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.wod b/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.wod deleted file mode 100644 index 3dccef2aa..000000000 --- a/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.wod +++ /dev/null @@ -1,46 +0,0 @@ -OldAptStartDate: WOString { - value = oldStartDate; - dateformat = "%d/%m/%y"; - escapeHTML = NO; -} - -OldAptStartTime: WOString { - value = oldStartDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -NewAptStartDate: WOString { - value = newStartDate; - dateformat = "%d/%m/%y"; - escapeHTML = NO; -} - -NewAptStartTime: WOString { - value = newStartDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -Organizer: WOString { - value = newApt.organizer.cnWithoutQuotes; - escapeHTML = NO; -} - -HasHomePageURL: WOConditional { - condition = homePageURL.length; -} - -HomePageURL: WOString { - value = appointmentURL; - escapeHTML = NO; -} - -IsSubject: WOConditional { - condition = isSubject; -} - -IsBody: WOConditional { - condition = isSubject; - negate = YES; -} diff --git a/SoObjects/Appointments/SOGoAptMailICalReply.h b/SoObjects/Appointments/SOGoAptMailICalReply.h index 3882cc5ab..ba81f03c1 100644 --- a/SoObjects/Appointments/SOGoAptMailICalReply.h +++ b/SoObjects/Appointments/SOGoAptMailICalReply.h @@ -53,7 +53,7 @@ - (NSString *) getSubject; - (NSString *) getBody; - + @end #endif /* SOGOAPTMAILICALREPLY_H */ diff --git a/SoObjects/Appointments/SOGoAptMailICalReply.m b/SoObjects/Appointments/SOGoAptMailICalReply.m index 7608054f3..beb6e6b5c 100644 --- a/SoObjects/Appointments/SOGoAptMailICalReply.m +++ b/SoObjects/Appointments/SOGoAptMailICalReply.m @@ -96,6 +96,11 @@ static NSCharacterSet *wsSet = nil; return attendee; } +- (NSString *) attendeeName +{ + return [attendee cn]; +} + - (BOOL) hasAccepted { NSString *partStat; diff --git a/SoObjects/Appointments/SOGoAptMailItalianDeletion.wo/SOGoAptMailItalianDeletion.html b/SoObjects/Appointments/SOGoAptMailItalianDeletion.wo/SOGoAptMailItalianDeletion.html index e470bb0f1..ee71e81e4 100644 --- a/SoObjects/Appointments/SOGoAptMailItalianDeletion.wo/SOGoAptMailItalianDeletion.html +++ b/SoObjects/Appointments/SOGoAptMailItalianDeletion.wo/SOGoAptMailItalianDeletion.html @@ -1,6 +1,2 @@ -<#IsSubject>L'appuntamento del giorno <#AptStartDate /> alle ore <#AptStartTime /> è stato cancellato -<#IsBody> -L'appuntamento del giorno <#AptStartDate /> alle ore <#AptStartTime -/> è stato cancellato da <#Organizer -/>. - \ No newline at end of file +<#IsSubject>Evento cancellato : " <#summary/> " +<#IsBody><#organizer/> ha cancellato questo elemento: " <#summary/> ". \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailItalianDeletion.wo/SOGoAptMailItalianDeletion.wod b/SoObjects/Appointments/SOGoAptMailItalianDeletion.wo/SOGoAptMailItalianDeletion.wod index 3b83a3239..6d3d52eca 100644 --- a/SoObjects/Appointments/SOGoAptMailItalianDeletion.wo/SOGoAptMailItalianDeletion.wod +++ b/SoObjects/Appointments/SOGoAptMailItalianDeletion.wo/SOGoAptMailItalianDeletion.wod @@ -1,34 +1,18 @@ -AptStartDate: WOString { - value = newStartDate; - dateformat = "%d/%m/%y"; - escapeHTML = NO; -} - -AptStartTime: WOString { - value = newStartDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -Organizer: WOString { - value = newApt.organizer.cnWithoutQuotes; - escapeHTML = NO; -} - -HasHomePageURL: WOConditional { - condition = homePageURL.length; -} - -HomePageURL: WOString { - value = appointmentURL; - escapeHTML = NO; -} - IsSubject: WOConditional { condition = isSubject; } IsBody: WOConditional { condition = isSubject; - negate = YES; + negate = YES; +} + +organizer: WOString { + value = organizerName; + escapeHTML = NO; +} + +summary: WOString { + value = summary; + escapeHTML = NO; } diff --git a/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.html b/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.html index e2c1caa4d..1f442c67e 100644 --- a/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.html +++ b/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.html @@ -1,5 +1,2 @@ -<#IsSubject>Re: appuntamento del <#AptStartDate/> alle ore <#AptStartTime/> -<#IsBody> -<#Attendee/> ha <#HasAccepted>accettato<#HasDeclined>declinato il -tuo invito. - +<#IsSubject>Re: Appuntemento : "<#summary/>" +<#IsBody><#attendee/> ha <#HasAccepted>accettato<#HasDeclined>declinato<#HasDeclined> l'invito al proprio evento. \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.wod b/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.wod index 622d22edf..bbb5bbfa4 100644 --- a/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.wod +++ b/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.wod @@ -1,17 +1,19 @@ -AptStartDate: WOString { - value = startDate; - dateformat = "%d/%m/%y"; +IsSubject: WOConditional { + condition = isSubject; +} + +IsBody: WOConditional { + condition = isSubject; + negate = YES; +} + +summary: WOString { + value = summary; escapeHTML = NO; } -AptStartTime: WOString { - value = startDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -Attendee: WOString { - value = attendee.cnWithoutQuotes; +attendee: WOString { + value = attendeeName; escapeHTML = NO; } @@ -22,12 +24,3 @@ HasAccepted: WOConditional { HasDeclined: WOConditional { condition = hasDeclined; } - -IsSubject: WOConditional { - condition = isSubject; -} - -IsBody: WOConditional { - condition = isSubject; - negate = YES; -} diff --git a/SoObjects/Appointments/SOGoAptMailItalianInvitation.wo/SOGoAptMailItalianInvitation.html b/SoObjects/Appointments/SOGoAptMailItalianInvitation.wo/SOGoAptMailItalianInvitation.html index f14f988b5..131c012b8 100644 --- a/SoObjects/Appointments/SOGoAptMailItalianInvitation.wo/SOGoAptMailItalianInvitation.html +++ b/SoObjects/Appointments/SOGoAptMailItalianInvitation.wo/SOGoAptMailItalianInvitation.html @@ -1,8 +1,2 @@ -<#IsSubject>Appunatemento in data <#AptStartDate /> alle ore <#AptStartTime /> -<#IsBody> -Sei stato invitato da <#Organizer /> ad un appuntamento. -<#HasHomePageURL> -Per accettare o declinare l'invito vai alla pagina <#HomePageURL -/>. - - \ No newline at end of file +<#IsSubject>Invito evento: <#summary/> +<#IsBody>Si è stati invitati da <#organizer> a <#summary/>. \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailItalianInvitation.wo/SOGoAptMailItalianInvitation.wod b/SoObjects/Appointments/SOGoAptMailItalianInvitation.wo/SOGoAptMailItalianInvitation.wod index 3b83a3239..6d3d52eca 100644 --- a/SoObjects/Appointments/SOGoAptMailItalianInvitation.wo/SOGoAptMailItalianInvitation.wod +++ b/SoObjects/Appointments/SOGoAptMailItalianInvitation.wo/SOGoAptMailItalianInvitation.wod @@ -1,34 +1,18 @@ -AptStartDate: WOString { - value = newStartDate; - dateformat = "%d/%m/%y"; - escapeHTML = NO; -} - -AptStartTime: WOString { - value = newStartDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -Organizer: WOString { - value = newApt.organizer.cnWithoutQuotes; - escapeHTML = NO; -} - -HasHomePageURL: WOConditional { - condition = homePageURL.length; -} - -HomePageURL: WOString { - value = appointmentURL; - escapeHTML = NO; -} - IsSubject: WOConditional { condition = isSubject; } IsBody: WOConditional { condition = isSubject; - negate = YES; + negate = YES; +} + +organizer: WOString { + value = organizerName; + escapeHTML = NO; +} + +summary: WOString { + value = summary; + escapeHTML = NO; } diff --git a/SoObjects/Appointments/SOGoAptMailItalianRemoval.wo/SOGoAptMailItalianRemoval.html b/SoObjects/Appointments/SOGoAptMailItalianRemoval.wo/SOGoAptMailItalianRemoval.html deleted file mode 100644 index 688e867a0..000000000 --- a/SoObjects/Appointments/SOGoAptMailItalianRemoval.wo/SOGoAptMailItalianRemoval.html +++ /dev/null @@ -1,5 +0,0 @@ -<#IsSubject>Rimozione dall'appuntamento del <#AptStartDate /> alle ore <#AptStartTime /> -<#IsBody> -Sei stato rimosso da <#Organizer /> dall'appuntamento programmato per il giorno <#AptStartDate -/> alle ore <#AptStartTime />. - \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailItalianRemoval.wo/SOGoAptMailItalianRemoval.wod b/SoObjects/Appointments/SOGoAptMailItalianRemoval.wo/SOGoAptMailItalianRemoval.wod deleted file mode 100644 index 3b83a3239..000000000 --- a/SoObjects/Appointments/SOGoAptMailItalianRemoval.wo/SOGoAptMailItalianRemoval.wod +++ /dev/null @@ -1,34 +0,0 @@ -AptStartDate: WOString { - value = newStartDate; - dateformat = "%d/%m/%y"; - escapeHTML = NO; -} - -AptStartTime: WOString { - value = newStartDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -Organizer: WOString { - value = newApt.organizer.cnWithoutQuotes; - escapeHTML = NO; -} - -HasHomePageURL: WOConditional { - condition = homePageURL.length; -} - -HomePageURL: WOString { - value = appointmentURL; - escapeHTML = NO; -} - -IsSubject: WOConditional { - condition = isSubject; -} - -IsBody: WOConditional { - condition = isSubject; - negate = YES; -} diff --git a/SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.html b/SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.html deleted file mode 100644 index c8d10ee86..000000000 --- a/SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.html +++ /dev/null @@ -1,11 +0,0 @@ -<#IsSubject>L'appuntamento fissato in data <#OldAptStartDate /> alle ore <#OldAptStartTime /> è stato modificato -<#IsBody> -Questo appuntamento, fissato precedentemete in data <#OldAptStartDate /> -alle ore <#OldAptStartTime /> è ora programmato il <#NewAptStartDate -/> alle ore <#NewAptStartTime -/> -<#HasHomePageURL> -Per confermare o disdire vai alla pagina <#HomePageURL -/>. - - \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.wod b/SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.wod deleted file mode 100644 index 9310d675e..000000000 --- a/SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.wod +++ /dev/null @@ -1,46 +0,0 @@ -OldAptStartDate: WOString { - value = oldStartDate; - dateformat = "%d/%m/%y"; - escapeHTML = NO; -} - -OldAptStartTime: WOString { - value = oldStartDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -NewAptStartDate: WOString { - value = newStartDate; - dateformat = "%d/%m/%y"; - escapeHTML = NO; -} - -NewAptStartTime: WOString { - value = newStartDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -Organizer: WOString { - value = newApt.organizer.cnWithoutQuotes; - escapeHTML = NO; -} - -HasHomePageURL: WOConditional { - condition = homePageURL.length; -} - -HomePageURL: WOString { - value = appointmentURL; - escapeHTML = NO; -} - -IsSubject: WOConditional { - condition = isSubject; -} - -IsBody: WOConditional { - condition = isSubject; - negate = YES; -} diff --git a/SoObjects/Appointments/SOGoAptMailNotification.h b/SoObjects/Appointments/SOGoAptMailNotification.h index ba774b185..761ee8332 100644 --- a/SoObjects/Appointments/SOGoAptMailNotification.h +++ b/SoObjects/Appointments/SOGoAptMailNotification.h @@ -1,5 +1,6 @@ /* Copyright (C) 2000-2005 SKYRIX Software AG + Copyright (C) 2006-2008 Inverse inc. This file is part of OpenGroupware.org. @@ -33,8 +34,7 @@ */ @interface SOGoAptMailNotification : SoComponent { - iCalEntityObject* oldApt; - iCalEntityObject* newApt; + iCalEntityObject* apt; NSString *homePageURL; NSTimeZone *viewTZ; NSCalendarDate *oldStartDate; @@ -42,22 +42,8 @@ BOOL isSubject; } -- (id) oldApt; -- (void) setOldApt: (iCalEntityObject *) _oldApt; - -- (id) newApt; -- (void) setNewApt: (iCalEntityObject *) _newApt; - -- (NSString *) homePageURL; -- (void) setHomePageURL: (NSString *) _homePageURL; - -- (NSTimeZone *) viewTZ; -- (void) setViewTZ: (NSTimeZone *) _viewTZ; - -/* Helpers */ - -- (NSCalendarDate *) oldStartDate; -- (NSCalendarDate *) newStartDate; +- (iCalEntityObject *) apt; +- (void) setApt: (iCalEntityObject *) newApt; /* Content Generation */ diff --git a/SoObjects/Appointments/SOGoAptMailNotification.m b/SoObjects/Appointments/SOGoAptMailNotification.m index 5c66dd1e3..93ee223ce 100644 --- a/SoObjects/Appointments/SOGoAptMailNotification.m +++ b/SoObjects/Appointments/SOGoAptMailNotification.m @@ -28,6 +28,7 @@ #import #import #import +#import #import @@ -54,75 +55,32 @@ static NSTimeZone *UTC = nil; } } +- (id) init +{ + if ((self = [super init])) + { + apt = nil; + } + + return self; +} + - (void) dealloc { - [oldApt release]; - [newApt release]; - [homePageURL release]; - [viewTZ release]; - - [oldStartDate release]; - [newStartDate release]; + [apt release]; [super dealloc]; } -- (id) oldApt +- (iCalEntityObject *) apt { - return oldApt; + return apt; } -- (void) setOldApt: (iCalEntityObject *) newOldApt +- (void) setApt: (iCalEntityObject *) newApt { - ASSIGN (oldApt, newOldApt); + ASSIGN (apt, newApt); } -- (id) newApt -{ - return newApt; -} - -- (void) setNewApt: (iCalEntityObject *) newNewApt -{ - ASSIGN (newApt, newNewApt); -} - -- (NSString *) homePageURL -{ - return homePageURL; -} - -- (void) setHomePageURL: (NSString *) newhomePageURL -{ - ASSIGN (homePageURL, newhomePageURL); -} - -- (NSString *) appointmentURL -{ - NSString *aptUID; - - aptUID = [[self newApt] uid]; - - return [NSString stringWithFormat: @"%@/Calendar/personal/%@/edit?mail-invitation=yes", - [self homePageURL], - aptUID]; -} - -- (NSTimeZone *) viewTZ -{ - NSTimeZone *tz; - - if (viewTZ) - tz = viewTZ; - else - tz = UTC; - - return tz; -} - -- (void) setViewTZ: (NSTimeZone *) newViewTZ -{ - ASSIGN (viewTZ, newViewTZ); -} - (BOOL) isSubject { @@ -134,30 +92,18 @@ static NSTimeZone *UTC = nil; isSubject = newIsSubject; } +- (NSString *) summary +{ + return [apt summary]; +} + +- (NSString *) organizerName +{ + return [[apt organizer] cn]; +} + /* Helpers */ -- (NSCalendarDate *) oldStartDate -{ - if (!oldStartDate) - { - ASSIGN (oldStartDate, [[self oldApt] startDate]); - [oldStartDate setTimeZone: [self viewTZ]]; - } - - return oldStartDate; -} - -- (NSCalendarDate *) newStartDate -{ - if (!newStartDate) - { - ASSIGN (newStartDate, [[self newApt] startDate]); - [newStartDate setTimeZone: [self viewTZ]]; - } - - return newStartDate; -} - /* Generate Response */ - (NSString *) getSubject @@ -166,7 +112,7 @@ static NSTimeZone *UTC = nil; [self setIsSubject: YES]; subject = [[[self generateResponse] contentAsString] - stringByTrimmingCharactersInSet:wsSet]; + stringByTrimmingCharactersInSet: wsSet]; if (!subject) { [self errorWithFormat:@"Failed to properly generate subject! Please check " diff --git a/SoObjects/Appointments/SOGoAptMailRemoval.m b/SoObjects/Appointments/SOGoAptMailRemoval.m deleted file mode 100644 index a35bab183..000000000 --- a/SoObjects/Appointments/SOGoAptMailRemoval.m +++ /dev/null @@ -1,47 +0,0 @@ -/* - Copyright (C) 2000-2005 SKYRIX Software AG - - This file is part of OpenGroupware.org. - - OGo is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - OGo is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with OGo; see the file COPYING. If not, write to the - Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. -*/ - -#import "SOGoAptMailNotification.h" - -@interface SOGoAptMailEnglishRemoval : SOGoAptMailNotification -@end - -@implementation SOGoAptMailEnglishRemoval -@end - -@interface SOGoAptMailFrenchRemoval : SOGoAptMailNotification -@end - -@implementation SOGoAptMailFrenchRemoval -@end - -@interface SOGoAptMailGermanRemoval : SOGoAptMailNotification -@end - -@implementation SOGoAptMailGermanRemoval -@end - -@interface SOGoAptMailItalianRemoval : SOGoAptMailNotification -@end - -@implementation SOGoAptMailItalianRemoval -@end - diff --git a/SoObjects/Appointments/SOGoAptMailSpanishDeletion.wo/SOGoAptMailSpanishDeletion.html b/SoObjects/Appointments/SOGoAptMailSpanishDeletion.wo/SOGoAptMailSpanishDeletion.html index 2353f8f3c..f70c7ff33 100644 --- a/SoObjects/Appointments/SOGoAptMailSpanishDeletion.wo/SOGoAptMailSpanishDeletion.html +++ b/SoObjects/Appointments/SOGoAptMailSpanishDeletion.wo/SOGoAptMailSpanishDeletion.html @@ -1,4 +1,2 @@ -<#IsSubject>Appointment <#AptStartDate /> at <#AptStartTime /> has been cancelled -<#IsBody> -The appointment at <#AptStartDate /> <#AptStartTime /> has been cancelled by <#Organizer />. - \ No newline at end of file +<#IsSubject>Evento cancelado: <#summary/> +<#IsBody><#organizer/> ha cancelado este evento: « <#summary/> ». \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailSpanishDeletion.wo/SOGoAptMailSpanishDeletion.wod b/SoObjects/Appointments/SOGoAptMailSpanishDeletion.wo/SOGoAptMailSpanishDeletion.wod index 3e37496c4..6d3d52eca 100644 --- a/SoObjects/Appointments/SOGoAptMailSpanishDeletion.wo/SOGoAptMailSpanishDeletion.wod +++ b/SoObjects/Appointments/SOGoAptMailSpanishDeletion.wo/SOGoAptMailSpanishDeletion.wod @@ -1,34 +1,18 @@ -AptStartDate: WOString { - value = newStartDate; - dateformat = "%d/%m/%y"; - escapeHTML = NO; -} - -AptStartTime: WOString { - value = newStartDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -Organizer: WOString { - value = newApt.organizer.cnWithoutQuotes; - escapeHTML = NO; -} - -HasHomePageURL: WOConditional { - condition = homePageURL.length; -} - -HomePageURL: WOString { - value = appointmentURL; - escapeHTML = NO; -} - IsSubject: WOConditional { condition = isSubject; } IsBody: WOConditional { condition = isSubject; - negate = YES; + negate = YES; +} + +organizer: WOString { + value = organizerName; + escapeHTML = NO; +} + +summary: WOString { + value = summary; + escapeHTML = NO; } diff --git a/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.html b/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.html index c861c2714..92051e37d 100644 --- a/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.html +++ b/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.html @@ -1,4 +1,2 @@ -<#IsSubject>Re: rendez-vous le <#AptStartDate/> à <#AptStartTime/> -<#IsBody> -<#Attendee/> has <#HasAccepted>accepted<#HasDeclined>declined your invitation. - +<#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 diff --git a/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.wod b/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.wod index 71a954616..bbb5bbfa4 100644 --- a/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.wod +++ b/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.wod @@ -1,17 +1,19 @@ -AptStartDate: WOString { - value = startDate; - dateformat = "%d/%m/%y"; +IsSubject: WOConditional { + condition = isSubject; +} + +IsBody: WOConditional { + condition = isSubject; + negate = YES; +} + +summary: WOString { + value = summary; escapeHTML = NO; } -AptStartTime: WOString { - value = startDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -Attendee: WOString { - value = attendee.cnWithoutQuotes; +attendee: WOString { + value = attendeeName; escapeHTML = NO; } @@ -22,12 +24,3 @@ HasAccepted: WOConditional { HasDeclined: WOConditional { condition = hasDeclined; } - -IsSubject: WOConditional { - condition = isSubject; -} - -IsBody: WOConditional { - condition = isSubject; - negate = YES; -} diff --git a/SoObjects/Appointments/SOGoAptMailSpanishInvitation.wo/SOGoAptMailSpanishInvitation.html b/SoObjects/Appointments/SOGoAptMailSpanishInvitation.wo/SOGoAptMailSpanishInvitation.html index 4d6bbab40..88d568790 100644 --- a/SoObjects/Appointments/SOGoAptMailSpanishInvitation.wo/SOGoAptMailSpanishInvitation.html +++ b/SoObjects/Appointments/SOGoAptMailSpanishInvitation.wo/SOGoAptMailSpanishInvitation.html @@ -1,7 +1,2 @@ -<#IsSubject>Appointment on <#AptStartDate /> at <#AptStartTime /> -<#IsBody> -You're invited by <#Organizer /> to a meeting. -<#HasHomePageURL> -Please make a decision for this invitation at <#HomePageURL />. - - \ No newline at end of file +<#IsSubject>Invitación a evento: <#summary/> +<#IsBody><#organizer/> le ha invitado a <#summary/>. diff --git a/SoObjects/Appointments/SOGoAptMailSpanishInvitation.wo/SOGoAptMailSpanishInvitation.wod b/SoObjects/Appointments/SOGoAptMailSpanishInvitation.wo/SOGoAptMailSpanishInvitation.wod index 3e37496c4..6d3d52eca 100644 --- a/SoObjects/Appointments/SOGoAptMailSpanishInvitation.wo/SOGoAptMailSpanishInvitation.wod +++ b/SoObjects/Appointments/SOGoAptMailSpanishInvitation.wo/SOGoAptMailSpanishInvitation.wod @@ -1,34 +1,18 @@ -AptStartDate: WOString { - value = newStartDate; - dateformat = "%d/%m/%y"; - escapeHTML = NO; -} - -AptStartTime: WOString { - value = newStartDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -Organizer: WOString { - value = newApt.organizer.cnWithoutQuotes; - escapeHTML = NO; -} - -HasHomePageURL: WOConditional { - condition = homePageURL.length; -} - -HomePageURL: WOString { - value = appointmentURL; - escapeHTML = NO; -} - IsSubject: WOConditional { condition = isSubject; } IsBody: WOConditional { condition = isSubject; - negate = YES; + negate = YES; +} + +organizer: WOString { + value = organizerName; + escapeHTML = NO; +} + +summary: WOString { + value = summary; + escapeHTML = NO; } diff --git a/SoObjects/Appointments/SOGoAptMailSpanishRemoval.wo/SOGoAptMailSpanishRemoval.html b/SoObjects/Appointments/SOGoAptMailSpanishRemoval.wo/SOGoAptMailSpanishRemoval.html deleted file mode 100644 index 32fdc2623..000000000 --- a/SoObjects/Appointments/SOGoAptMailSpanishRemoval.wo/SOGoAptMailSpanishRemoval.html +++ /dev/null @@ -1,4 +0,0 @@ -<#IsSubject>Removed from appointment <#AptStartDate /> at <#AptStartTime /> -<#IsBody> -You have been removed by <#Organizer /> from the appointment scheduled at <#AptStartDate /> <#AptStartTime />. - \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailSpanishRemoval.wo/SOGoAptMailSpanishRemoval.wod b/SoObjects/Appointments/SOGoAptMailSpanishRemoval.wo/SOGoAptMailSpanishRemoval.wod deleted file mode 100644 index 3e37496c4..000000000 --- a/SoObjects/Appointments/SOGoAptMailSpanishRemoval.wo/SOGoAptMailSpanishRemoval.wod +++ /dev/null @@ -1,34 +0,0 @@ -AptStartDate: WOString { - value = newStartDate; - dateformat = "%d/%m/%y"; - escapeHTML = NO; -} - -AptStartTime: WOString { - value = newStartDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -Organizer: WOString { - value = newApt.organizer.cnWithoutQuotes; - escapeHTML = NO; -} - -HasHomePageURL: WOConditional { - condition = homePageURL.length; -} - -HomePageURL: WOString { - value = appointmentURL; - escapeHTML = NO; -} - -IsSubject: WOConditional { - condition = isSubject; -} - -IsBody: WOConditional { - condition = isSubject; - negate = YES; -} diff --git a/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.html b/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.html deleted file mode 100644 index 6a733247b..000000000 --- a/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.html +++ /dev/null @@ -1,8 +0,0 @@ -<#IsSubject>The appointment for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed -<#IsBody> -This appointment, previously set for <#OldAptStartDate /> -at <#OldAptStartTime /> is now scheduled for <#NewAptStartDate /> at <#NewAptStartTime /> -<#HasHomePageURL> -Please make a decision for these new settings at <#HomePageURL />. - - \ No newline at end of file diff --git a/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.wod b/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.wod deleted file mode 100644 index 3dccef2aa..000000000 --- a/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.wod +++ /dev/null @@ -1,46 +0,0 @@ -OldAptStartDate: WOString { - value = oldStartDate; - dateformat = "%d/%m/%y"; - escapeHTML = NO; -} - -OldAptStartTime: WOString { - value = oldStartDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -NewAptStartDate: WOString { - value = newStartDate; - dateformat = "%d/%m/%y"; - escapeHTML = NO; -} - -NewAptStartTime: WOString { - value = newStartDate; - dateformat = "%H:%M"; - escapeHTML = NO; -} - -Organizer: WOString { - value = newApt.organizer.cnWithoutQuotes; - escapeHTML = NO; -} - -HasHomePageURL: WOConditional { - condition = homePageURL.length; -} - -HomePageURL: WOString { - value = appointmentURL; - escapeHTML = NO; -} - -IsSubject: WOConditional { - condition = isSubject; -} - -IsBody: WOConditional { - condition = isSubject; - negate = YES; -} diff --git a/SoObjects/Appointments/SOGoAptMailUpdate.m b/SoObjects/Appointments/SOGoAptMailUpdate.m deleted file mode 100644 index 3ff6ff326..000000000 --- a/SoObjects/Appointments/SOGoAptMailUpdate.m +++ /dev/null @@ -1,57 +0,0 @@ -/* - Copyright (C) 2000-2005 SKYRIX Software AG - - This file is part of OpenGroupware.org. - - OGo is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - OGo is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with OGo; see the file COPYING. If not, write to the - Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. -*/ - -#include "SOGoAptMailNotification.h" - -@interface SOGoAptMailEnglishUpdate : SOGoAptMailNotification -{ -} -@end - -@implementation SOGoAptMailEnglishUpdate -@end - -@interface SOGoAptMailFrenchUpdate : SOGoAptMailNotification -{ -} -@end - -@implementation SOGoAptMailFrenchUpdate -@end - - -@interface SOGoAptMailGermanUpdate : SOGoAptMailNotification -{ -} -@end - -@implementation SOGoAptMailGermanUpdate -@end - - -@interface SOGoAptMailItalianUpdate : SOGoAptMailNotification -{ -} -@end - -@implementation SOGoAptMailItalianUpdate -@end - diff --git a/SoObjects/Appointments/SOGoCalendarComponent.h b/SoObjects/Appointments/SOGoCalendarComponent.h index 50e9fb961..2c3847dc5 100644 --- a/SoObjects/Appointments/SOGoCalendarComponent.h +++ b/SoObjects/Appointments/SOGoCalendarComponent.h @@ -1,6 +1,6 @@ /* SOGoCalendarComponent.h - this file is part of SOGo * - * Copyright (C) 2006 Inverse inc. + * Copyright (C) 2006-2008 Inverse inc. * * Author: Wolfgang Sourdeau * @@ -59,10 +59,9 @@ /* mail notifications */ - (BOOL) sendEMailNotifications; -- (void) sendEMailUsingTemplateNamed: (NSString *) _pageName - forOldObject: (iCalRepeatableEntityObject *) _oldObject - andNewObject: (iCalRepeatableEntityObject *) _newObject - toAttendees: (NSArray *) _attendees; +- (void) sendEMailUsingTemplateNamed: (NSString *) pageName + forObject: (iCalRepeatableEntityObject *) object + toAttendees: (NSArray *) attendees; - (void) sendIMIPReplyForEvent: (iCalRepeatableEntityObject *) event to: (iCalPerson *) recipient; - (void) sendResponseToOrganizer: (iCalRepeatableEntityObject *) newComponent; diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m index 1874bef6f..3e755616a 100644 --- a/SoObjects/Appointments/SOGoCalendarComponent.m +++ b/SoObjects/Appointments/SOGoCalendarComponent.m @@ -1,6 +1,6 @@ /* SOGoCalendarComponent.m - this file is part of SOGo * - * Copyright (C) 2006 Inverse inc. + * Copyright (C) 2006-2008 Inverse inc. * * Author: Wolfgang Sourdeau * @@ -465,10 +465,9 @@ _occurenceHasID (iCalRepeatableEntityObject *occurence, NSString *recID) } } -- (void) sendEMailUsingTemplateNamed: (NSString *) _pageName - forOldObject: (iCalRepeatableEntityObject *) _oldObject - andNewObject: (iCalRepeatableEntityObject *) _newObject - toAttendees: (NSArray *) _attendees +- (void) sendEMailUsingTemplateNamed: (NSString *) newPageName + forObject: (iCalRepeatableEntityObject *) object + toAttendees: (NSArray *) attendees { NSString *pageName; NSString *senderEmail, *shortSenderEmail, *email, *iCalString; @@ -485,9 +484,9 @@ _occurenceHasID (iCalRepeatableEntityObject *occurence, NSString *recID) SOGoUser *ownerUser, *currentUser; if (sendEMailNotifications - && [_newObject isStillRelevant]) + && [object isStillRelevant]) { - count = [_attendees count]; + count = [attendees count]; if (count) { /* sender */ @@ -496,11 +495,11 @@ _occurenceHasID (iCalRepeatableEntityObject *occurence, NSString *recID) shortSenderEmail = [[currentUser allEmails] objectAtIndex: 0]; senderEmail = [NSString stringWithFormat: @"%@ <%@>", [ownerUser cn], shortSenderEmail]; - [self _setupSentByIfNeeded: [_newObject organizer]]; + [self _setupSentByIfNeeded: [object organizer]]; // NSLog (@"sending '%@' from %@", -// [(iCalCalendar *) [_newObject parent] method], senderEmail); +// [(iCalCalendar *) [object parent] method], senderEmail); /* generate iCalString once */ - iCalString = [[_newObject parent] versitString]; + iCalString = [[object parent] versitString]; /* get WOApplication instance */ app = [WOApplication application]; @@ -509,7 +508,7 @@ _occurenceHasID (iCalRepeatableEntityObject *occurence, NSString *recID) for (i = 0; i < count; i++) { - attendee = [_attendees objectAtIndex: i]; + attendee = [attendees objectAtIndex: i]; if (![[attendee uid] isEqualToString: owner]) { /* construct recipient */ @@ -521,13 +520,10 @@ _occurenceHasID (iCalRepeatableEntityObject *occurence, NSString *recID) SOGoObject acl notification mechanism /* create page name */ pageName = [NSString stringWithFormat: @"SOGoAptMail%@%@", - language, _pageName]; + language, newPageName]; /* construct message content */ p = [app pageWithName: pageName inContext: context]; - [p setNewApt: _newObject]; - [p setOldApt: _oldObject]; - [p setHomePageURL: [self homePageURLForPerson: attendee]]; - [p setViewTZ: [self timeZoneForUser: email]]; + [p setApt: object]; subject = [p getSubject]; text = [p getBody]; @@ -563,7 +559,7 @@ _occurenceHasID (iCalRepeatableEntityObject *occurence, NSString *recID) /* calendar part */ header = [NSString stringWithFormat: @"text/calendar; method=%@;" @" charset=utf-8", - [(iCalCalendar *) [_newObject parent] method]]; + [(iCalCalendar *) [object parent] method]]; headerMap = [NGMutableHashMap hashMapWithCapacity: 1]; [headerMap setObject:header forKey: @"content-type"]; bodyPart = [NGMimeBodyPart bodyPartWithHeader: headerMap];