diff --git a/SOPE/NGCards/iCalByDayMask.h b/SOPE/NGCards/iCalByDayMask.h index be08e0d9a..f5a1e11bb 100644 --- a/SOPE/NGCards/iCalByDayMask.h +++ b/SOPE/NGCards/iCalByDayMask.h @@ -53,8 +53,8 @@ typedef iCalWeekOccurrence iCalWeekOccurrences[7]; - (id) initWithDays: (iCalWeekOccurrences) theDays; + (id) byDayMaskWithRuleString: (NSString *) byDayRule; - (id) initWithRuleString: (NSString *) byDayRule; -+ (id) byDayMaskWithDaysAndOccurences: (NSArray *) values; -- (id) initWithDaysAndOccurences: (NSArray *) values; ++ (id) byDayMaskWithDaysAndOccurrences: (NSArray *) values; +- (id) initWithDaysAndOccurrences: (NSArray *) values; - (BOOL) occursOnDay: (iCalWeekDay) weekDay; - (BOOL) occursOnDay: (iCalWeekDay) weekDay diff --git a/SOPE/NGCards/iCalByDayMask.m b/SOPE/NGCards/iCalByDayMask.m index 643b37b44..fd3fbf022 100644 --- a/SOPE/NGCards/iCalByDayMask.m +++ b/SOPE/NGCards/iCalByDayMask.m @@ -190,17 +190,17 @@ return self; } -+ (id) byDayMaskWithDaysAndOccurences: (NSArray *) values ++ (id) byDayMaskWithDaysAndOccurrences: (NSArray *) values { id o; - o = [[self alloc] initWithDaysAndOccurences: values]; + o = [[self alloc] initWithDaysAndOccurrences: values]; AUTORELEASE(o); return o; } -- (id) initWithDaysAndOccurences: (NSArray *) values +- (id) initWithDaysAndOccurrences: (NSArray *) values { unsigned int count, max; NSString *value; @@ -258,7 +258,7 @@ if (day != iCalWeekDayUnknown) { - value = [mask objectForKey: @"occurence"]; + value = [mask objectForKey: @"occurrence"]; valueLength = [value length]; if (valueLength > 0) { diff --git a/SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m b/SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m index 66753eae1..dd08d262c 100644 --- a/SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m +++ b/SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m @@ -197,7 +197,7 @@ o = [repeat objectForKey: @"days"]; if ([o isKindOfClass: [NSArray class]]) - [rule setByDayMask: [iCalByDayMask byDayMaskWithDaysAndOccurences: o]]; + [rule setByDayMask: [iCalByDayMask byDayMaskWithDaysAndOccurrences: o]]; o = [repeat objectForKey: @"monthdays"]; if ([o isKindOfClass: [NSArray class]])