Revision: 28346
http://sourceforge.net/p/bibdesk/svn/28346
Author: hofman
Date: 2023-09-14 14:54:50 +0000 (Thu, 14 Sep 2023)
Log Message:
-----------
use NSCalendarUnitYearForWeekOfYear to calculate the bstart of the week
Modified Paths:
--------------
trunk/bibdesk/NSDate_BDSKExtensions.m
Modified: trunk/bibdesk/NSDate_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSDate_BDSKExtensions.m 2023-09-14 09:39:03 UTC (rev
28345)
+++ trunk/bibdesk/NSDate_BDSKExtensions.m 2023-09-14 14:54:50 UTC (rev
28346)
@@ -267,8 +267,11 @@
- (NSDate *)startOfPeriod:(BDSKPeriod)period {
NSCalendar *calendar = [NSCalendar currentCalendar];
- NSUInteger unitFlags = NSYearCalendarUnit | NSMonthCalendarUnit;
- unitFlags |= period == BDSKPeriodWeek ? NSWeekOfMonthCalendarUnit |
NSWeekdayCalendarUnit : NSDayCalendarUnit;
+ NSUInteger unitFlags;
+ if (period == BDSKPeriodWeek)
+ unitFlags = NSCalendarUnitYearForWeekOfYear | NSCalendarUnitWeekOfYear;
+ else
+ unitFlags = NSCalendarUnitYear | NSCalendarUnitMonth |
NSCalendarUnitDay;
NSDateComponents *components = [calendar components:unitFlags
fromDate:self];
[components setHour:0];
@@ -309,8 +312,8 @@
case BDSKPeriodWeek:
[components setWeekday:0];
[components setWeekOfYear:offset];
- [components setDay:NSUndefinedDateComponent];
- [components setMonth:NSUndefinedDateComponent];
+ [components setDay:NSDateComponentUndefined];
+ [components setMonth:NSDateComponentUndefined];
break;
case BDSKPeriodMonth:
[components setMonth:offset];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
