| -rw-r--r-- | korganizer/kdatenavigator.cpp | 7 | ||||
| -rw-r--r-- | korganizer/koeditorrecurrence.cpp | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index 7d0c516..b420351 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp @@ -248,12 +248,15 @@ void KDateNavigator::updateView() //ET int dayOfYear = buttons[(i + 1) * 7 - 4]->date().dayOfYear(); int dayOfYear = KOGlobals::self()->calendarSystem()->dayOfYear((daymatrix->getDate((i+1)*7-4))); + int add = 0; + if ( ! KGlobal::locale()->weekStartsMonday() ) + ++add; if (dayOfYear % 7 != 0) - weeknum.setNum(dayOfYear / 7 + 1); + weeknum.setNum(dayOfYear / 7 + 1+add); else - weeknum.setNum(dayOfYear / 7); + weeknum.setNum(dayOfYear / 7 +add); weeknos[i]->setText(weeknum); } setUpdatesEnabled( true ); diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp index 584d1ed..4209e10 100644 --- a/korganizer/koeditorrecurrence.cpp +++ b/korganizer/koeditorrecurrence.cpp @@ -1051,9 +1051,9 @@ void KOEditorRecurrence::writeEvent( Event *event ) found |=days.at(j); } if ( !found ) { days.setBit( event->dtStart().date().dayOfWeek()-1); - qDebug("bit set %d "); + qDebug("bit set %d ", event->dtStart().date().dayOfWeek()-1); } if ( duration != 0 ) r->setWeekly( freq, days, duration ); else r->setWeekly( freq, days, endDate ); } else if ( recurrenceType == RecurrenceChooser::Monthly ) { |