Merging changes from BRANCH_1_0 to HEAD..

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
@@ -63,3 +63,8 @@ void DateBookWeekLstHeader::setDate(const QDate &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);
@@ -119,3 +124,3 @@ DateBookWeekLstDayHdr::DateBookWeekLstDayHdr(const QDate &d, bool /* onM */,
 
-        static const char *wdays={"MTWTFSSM"};
+        static const QString wdays=tr("MTWTFSSM",  "Week days");
         char day=wdays[d.dayOfWeek()-1];
@@ -239,2 +244,3 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
         if(bStartOnMonday) dayoffset--;
+        else if( dayoffset == 7 ) dayoffset = 0;