diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m index e394ff5d6..33e140282 100644 --- a/SoObjects/Appointments/SOGoAppointmentObject.m +++ b/SoObjects/Appointments/SOGoAppointmentObject.m @@ -357,15 +357,15 @@ [attendees removePerson: organizer]; if ([attendees count]) { - iCalEvent *canceledApt; + iCalEvent *cancelledApt; - canceledApt = [newApt copy]; - [(iCalCalendar *) [canceledApt parent] setMethod: @"cancel"]; + cancelledApt = [newApt copy]; + [(iCalCalendar *) [cancelledApt parent] setMethod: @"cancel"]; [self sendEMailUsingTemplateNamed: @"Removal" forOldObject: nil - andNewObject: canceledApt + andNewObject: cancelledApt toAttendees: attendees]; - [canceledApt release]; + [cancelledApt release]; } } @@ -411,7 +411,7 @@ attendees = [NSMutableArray arrayWithArray:[apt attendees]]; [attendees removePerson:[apt organizer]]; - /* flag appointment as being canceled */ + /* flag appointment as being cancelled */ [(iCalCalendar *) [apt parent] setMethod: @"cancel"]; [apt increaseSequence]; diff --git a/SoObjects/Appointments/SOGoTaskObject.m b/SoObjects/Appointments/SOGoTaskObject.m index ac3b241cf..547d19e04 100644 --- a/SoObjects/Appointments/SOGoTaskObject.m +++ b/SoObjects/Appointments/SOGoTaskObject.m @@ -376,15 +376,15 @@ static NSString *mailTemplateDefaultLanguage = nil; // attendees = [NSMutableArray arrayWithArray:[changes deletedAttendees]]; // [attendees removePerson: organizer]; // if ([attendees count]) { -// iCalToDo *canceledApt; +// iCalToDo *cancelledApt; -// canceledApt = [newApt copy]; -// [(iCalCalendar *) [canceledApt parent] setMethod: @"cancel"]; +// cancelledApt = [newApt copy]; +// [(iCalCalendar *) [cancelledApt parent] setMethod: @"cancel"]; // [self sendEMailUsingTemplateNamed: @"Removal" // forOldObject: nil -// andNewObject: canceledApt +// andNewObject: cancelledApt // toAttendees: attendees]; -// [canceledApt release]; +// [cancelledApt release]; // } // } @@ -428,7 +428,7 @@ static NSString *mailTemplateDefaultLanguage = nil; attendees = [NSMutableArray arrayWithArray:[task attendees]]; [attendees removePerson:[task organizer]]; - /* flag task as being canceled */ + /* flag task as being cancelled */ [(iCalCalendar *) [task parent] setMethod: @"cancel"]; [task increaseSequence];