Add handling of BYSETPOS for BYDAY in repeat rule

Alinto · Jan 7, 2017 · d4a4e49 · d4a4e49
1 parent a0e7e9d
commit d4a4e49
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/NEWS b/NEWS
@@ -1,3 +1,9 @@
+2.3.19 (2016-12-DD)
+-------------------
+
+Enhancements
+ - [core] added handling of BYSETPOS for BYDAY in recurrence rules
+
 2.3.18 (2016-11-28)
 -------------------
 

diff --git a/SOPE/NGCards/iCalRecurrenceRule.m b/SOPE/NGCards/iCalRecurrenceRule.m
@@ -472,9 +472,16 @@ - (void) setByDayMask: (iCalByDayMask *) newByDayMask
 
 - (iCalByDayMask *) byDayMask
 {
+  NSArray *setPos;
+  NSString *day;
+
   if (dayMask == nil && [[self byDay] length])
     {
-      dayMask = [iCalByDayMask byDayMaskWithRuleString: [self byDay]];
+      day = [self byDay];
+      setPos = [self bySetPos];
+      if ([setPos count])
+        day = [NSString stringWithFormat: @"%@%@", [setPos lastObject], day];
+      dayMask = [iCalByDayMask byDayMaskWithRuleString: day];
       [dayMask retain];
     }