amorfo77/sogo
1
0 Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-10-12 23:37:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #223 from inverse-inc/v2

Browse Source 
SOGo v2.3.4
This commit is contained in:
Enrique J. Hernández committed 2015-12-29 22:41:02 +01:00
2 parents 5b25f85c02 135535e00e
commit 8b04a468c2
299 files changed
+5366 -11083
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

SoObjects/SOGo/SOGoUser.m
+15 -4
View File
@@ -514,15 +514,26 @@
- (unsigned int) weekNumberForDate: (NSCalendarDate *) date
{
NSCalendarDate *firstWeek;
NSCalendarDate *firstWeek, *previousWeek;
unsigned int weekNumber;
firstWeek = [self firstWeekOfYearForDate: date];
if ([firstWeek earlierDate: date] == firstWeek)
weekNumber = ([date timeIntervalSinceDate: firstWeek]
/ (86400 * 7) + 1);
{
weekNumber = ([date timeIntervalSinceDate: firstWeek] / (86400 * 7) + 1);
}
else
weekNumber = 0;
{
// Date is within the last week of the previous year;
// Compute the previous week number to find the week number of the requested date.
// The number will either be 52 or 53.
previousWeek = [date dateByAddingYears: 0
months: 0
days: -7];
firstWeek = [self firstWeekOfYearForDate: previousWeek];
weekNumber = ([previousWeek timeIntervalSinceDate: firstWeek] / (86400 * 7) + 1);
weekNumber += 1;
}
return weekNumber;
}