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
@@ -220,68 +220,71 @@ void KDateNavigator::updateDates()
   daymatrix->updateView(dayone.addDays(index));
 //each updateDates is followed by an updateView -> repaint is issued there !
 //  daymatrix->repaint();
 }
 
 void KDateNavigator::updateDayMatrix()
 {
   daymatrix->updateView();
   daymatrix->repaint();
 }
 
 
 void KDateNavigator::updateView()
 {
    
   setUpdatesEnabled( false );
 
   int i;
 
 //  kdDebug() << "updateView() -> daymatrix->updateView()" << endl;
   daymatrix->updateView();
 
   // set the week numbers.
   for(i = 0; i < 6; i++) {
     QString weeknum;
     // remember, according to ISO 8601, the first week of the year is the
     // first week that contains a thursday.  Thus we must subtract off 4,
     // not just 1.
 
     //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 );
 //  kdDebug() << "updateView() -> repaint()" << endl;
   repaint();
   daymatrix->repaint();
 }
 
 void KDateNavigator::updateConfig()
 {
   int day;
   for(int i=0; i<7; i++) {
     // take the first letter of the day name to be the abbreviation
     if (KGlobal::locale()->weekStartsMonday()) {
       day = i+1;
     } else {
       if (i==0) day = 7;
       else day = i;
     }
     QString dayName = KOGlobals::self()->calendarSystem()->weekDayName( day,
                                                                         true );
     if ( KOPrefs::instance()->mCompactDialogs ) dayName = dayName.left( 1 );
     headings[i]->setText( dayName );
   }
   updateDates();
   updateView();
 }
 
 void KDateNavigator::setShowWeekNums(bool enabled)
 {
   m_bShowWeekNums = enabled;
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp
index 584d1ed..4209e10 100644
--- a/korganizer/koeditorrecurrence.cpp
+++ b/korganizer/koeditorrecurrence.cpp
@@ -1023,65 +1023,65 @@ void KOEditorRecurrence::readEvent(Event *event)
 
   mExceptions->setDates( event->exDates() );
 }
 
 void KOEditorRecurrence::writeEvent( Event *event )
 {
   Recurrence *r = event->recurrence();
 
   // clear out any old settings;
   r->unsetRecurs();
 
   if ( mEnabledCheck->isChecked() ) {
     int duration = mRecurrenceRange->duration();
     QDate endDate;
     if ( duration == 0 ) endDate = mRecurrenceRange->endDate();
 
     int recurrenceType = mRecurrenceChooser->type();
 
     if ( recurrenceType == RecurrenceChooser::Daily ) {
       int freq = mDaily->frequency();
       if ( duration != 0 ) r->setDaily( freq, duration );
       else  r->setDaily( freq, endDate );
     } else if ( recurrenceType == RecurrenceChooser::Weekly ) {
       int freq = mWeekly->frequency();
       QBitArray days = mWeekly->days();
       int j;
       bool found = false;
       for (j = 0; j < 7 ; ++j ) {
           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 ) {
       int freq = mMonthly->frequency();
       if ( mMonthly->byPos() ) {
         int pos = mMonthly->count();
 
         QBitArray days( 7 );
         days.fill( false );
 
         days.setBit( mMonthly->weekday() );
         if ( duration != 0 )
           r->setMonthly( Recurrence::rMonthlyPos, freq, duration );
         else
           r->setMonthly( Recurrence::rMonthlyPos, freq, endDate );
         r->addMonthlyPos( pos, days );
       } else {
         // it's by day
         int day = mMonthly->day();
 
         if ( duration != 0 ) {
           r->setMonthly( Recurrence::rMonthlyDay, freq, duration );
         } else {
           r->setMonthly( Recurrence::rMonthlyDay, freq, endDate );
         }
         r->addMonthlyDay( day );
       }
     } else if ( recurrenceType == RecurrenceChooser::Yearly ) {
         qDebug("RecurrenceChooser::Yearly ");
       int freq = mYearly->frequency();
       if ( mYearly->byDay() ) {