1 files changed, 8 insertions, 2 deletions

diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp
index 7817042..aad1f3a 100644
--- a/core/pim/datebook/datebookweeklst.cpp
+++ b/core/pim/datebook/datebookweeklst.cpp
@@ -52,25 +52,30 @@ DateBookWeekLstHeader::DateBookWeekLstHeader(bool onM, QWidget* parent, const ch
         connect(forwardweek, SIGNAL(clicked()), this, SLOT(nextWeek()));
         connect(forwardmonth, SIGNAL(clicked()), this, SLOT(nextMonth()));
         connect(labelDate, SIGNAL(clicked()), this, SLOT(pickDate()));
         connect(dbl, SIGNAL(toggled(bool)), this, SIGNAL(setDbl(bool)));
         bStartOnMonday=onM;
 }
 DateBookWeekLstHeader::~DateBookWeekLstHeader(){}
 
 void DateBookWeekLstHeader::setDate(const QDate &d) {
         int year,week,dayofweek;
         date=d;
         dayofweek=d.dayOfWeek();
-        if(bStartOnMonday) dayofweek--;
+        if(bStartOnMonday)
+            dayofweek--;
+        else if( dayofweek == 7 )
+            /* we already have the right day -7 would lead to the same week */
+            dayofweek = 0;
+
         date=date.addDays(-dayofweek);
 
         calcWeek(date,week,year,bStartOnMonday);
         QDate start=date;
         QDate stop=start.addDays(6);
         labelDate->setText( QString::number(start.day()) + "." +
                         start.monthName(start.month()) + "-" +
                         QString::number(stop.day()) + "." +
                         start.monthName(stop.month()) +" ("+
                         tr("w")+":"+QString::number( week ) +")");
         emit dateChanged(date);
 }
@@ -108,25 +113,25 @@ void DateBookWeekLstHeader::prevMonth()
 {
         setDate(date.addDays(-28));
 }
 
 DateBookWeekLstDayHdr::DateBookWeekLstDayHdr(const QDate &d, bool /* onM */,
                                              QWidget* parent,
                                              const char* name,
                                              WFlags fl )
     : DateBookWeekLstDayHdrBase(parent, name, fl) {
 
         date=d;
 
-        static const char *wdays={"MTWTFSSM"};
+        static const QString wdays=tr("MTWTFSSM",  "Week days");
         char day=wdays[d.dayOfWeek()-1];
 
         label->setText( QString(QObject::tr(QString(QChar(day)))) + " " +QString::number(d.day()) );
         add->setText("+");
 
         if (d == QDate::currentDate()) {
                 QPalette pal=label->palette();
                 pal.setColor(QColorGroup::Foreground, QColor(0,0,255));
                 label->setPalette(pal);
 
                 /*
                 QFont f=label->font();
@@ -228,24 +233,25 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
 
         int dayOrder[7];
         if (bStartOnMonday) {
                 for (int d=0; d<7; d++) dayOrder[d]=d+1;
         } else {
                 for (int d=0; d<7; d++) dayOrder[d]=d;
                 dayOrder[0]=7;
         }
 
         // Calculate offset to first day of week.
         int dayoffset=d.dayOfWeek();
         if(bStartOnMonday) dayoffset--;
+        else if( dayoffset == 7 ) dayoffset = 0;
 
         for (int i=0; i<7; i++) {
         // Header
                 DateBookWeekLstDayHdr *hdr=new DateBookWeekLstDayHdr(d.addDays(i-dayoffset), bStartOnMonday,this);
                 connect(hdr, SIGNAL(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int)));
                 connect(hdr, SIGNAL(addEvent(const QDateTime &, const QDateTime &, const QString &, const QString &)),
                         this, SIGNAL(addEvent(const QDateTime &, const QDateTime &, const QString &, const QString &)));
                 layout->addWidget(hdr);
 
                 // Events
                 while ( (*it).date().dayOfWeek() == dayOrder[i] && it!=ev.end() ) {
                                 if(!(((*it).end().hour()==0) && ((*it).end().minute()==0) && ((*it).startDate()!=(*it).date()))) {// Skip events ending at 00:00 starting at another day.