-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 | |||
@@ -249,10 +249,13 @@ void KDateNavigator::updateView() | |||
249 | //ET int dayOfYear = buttons[(i + 1) * 7 - 4]->date().dayOfYear(); | 249 | //ET int dayOfYear = buttons[(i + 1) * 7 - 4]->date().dayOfYear(); |
250 | int dayOfYear = KOGlobals::self()->calendarSystem()->dayOfYear((daymatrix->getDate((i+1)*7-4))); | 250 | int dayOfYear = KOGlobals::self()->calendarSystem()->dayOfYear((daymatrix->getDate((i+1)*7-4))); |
251 | 251 | ||
252 | int add = 0; | ||
253 | if ( ! KGlobal::locale()->weekStartsMonday() ) | ||
254 | ++add; | ||
252 | if (dayOfYear % 7 != 0) | 255 | if (dayOfYear % 7 != 0) |
253 | weeknum.setNum(dayOfYear / 7 + 1); | 256 | weeknum.setNum(dayOfYear / 7 + 1+add); |
254 | else | 257 | else |
255 | weeknum.setNum(dayOfYear / 7); | 258 | weeknum.setNum(dayOfYear / 7 +add); |
256 | weeknos[i]->setText(weeknum); | 259 | weeknos[i]->setText(weeknum); |
257 | } | 260 | } |
258 | 261 | ||
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp index 584d1ed..4209e10 100644 --- a/korganizer/koeditorrecurrence.cpp +++ b/korganizer/koeditorrecurrence.cpp | |||
@@ -1052,7 +1052,7 @@ void KOEditorRecurrence::writeEvent( Event *event ) | |||
1052 | } | 1052 | } |
1053 | if ( !found ) { | 1053 | if ( !found ) { |
1054 | days.setBit( event->dtStart().date().dayOfWeek()-1); | 1054 | days.setBit( event->dtStart().date().dayOfWeek()-1); |
1055 | qDebug("bit set %d "); | 1055 | qDebug("bit set %d ", event->dtStart().date().dayOfWeek()-1); |
1056 | } | 1056 | } |
1057 | if ( duration != 0 ) r->setWeekly( freq, days, duration ); | 1057 | if ( duration != 0 ) r->setWeekly( freq, days, duration ); |
1058 | else r->setWeekly( freq, days, endDate ); | 1058 | else r->setWeekly( freq, days, endDate ); |