From 4352fc918756ab483e3118543873178fa67153f5 Mon Sep 17 00:00:00 2001 From: Michael Pfeiffer Date: Sat, 30 Aug 2008 18:15:44 +0000 Subject: [PATCH] Bug fix: The calculated day of week is based on a week that starts on Sunday, in a calendar with Monday as week start this number has to be adjusted in case of a Sunday. It would be 0 but should be 7. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27244 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/shared/CalendarView.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/kits/shared/CalendarView.cpp b/src/kits/shared/CalendarView.cpp index 5e1899c20c..44d1dd5313 100644 --- a/src/kits/shared/CalendarView.cpp +++ b/src/kits/shared/CalendarView.cpp @@ -917,7 +917,12 @@ BCalendarView::_SetupWeekNumbers() return; // date on Thursday determines week number (ISO 8601) - date.AddDays(4 - date.DayOfWeek()); + int dayOfWeek = date.DayOfWeek(); + // adjust weekday if Monday is week start, + // then Sunday is last day in week + if (fWeekStart == B_WEEK_START_MONDAY && dayOfWeek == 0) + dayOfWeek = 7; + date.AddDays(4 - dayOfWeek); for (int32 row = 0; row < 6; ++row) { fWeekNumbers[row].SetTo("");