Diffstat (limited to 'core/pim/datebook/datebookweeklst.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/datebook/datebookweeklst.cpp | 10 |
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 | |||
@@ -62,5 +62,10 @@ void DateBookWeekLstHeader::setDate(const QDate &d) { | |||
62 | date=d; | 62 | date=d; |
63 | dayofweek=d.dayOfWeek(); | 63 | dayofweek=d.dayOfWeek(); |
64 | if(bStartOnMonday) dayofweek--; | 64 | if(bStartOnMonday) |
65 | dayofweek--; | ||
66 | else if( dayofweek == 7 ) | ||
67 | /* we already have the right day -7 would lead to the same week */ | ||
68 | dayofweek = 0; | ||
69 | |||
65 | date=date.addDays(-dayofweek); | 70 | date=date.addDays(-dayofweek); |
66 | 71 | ||
@@ -118,5 +123,5 @@ DateBookWeekLstDayHdr::DateBookWeekLstDayHdr(const QDate &d, bool /* onM */, | |||
118 | date=d; | 123 | date=d; |
119 | 124 | ||
120 | static const char *wdays={"MTWTFSSM"}; | 125 | static const QString wdays=tr("MTWTFSSM", "Week days"); |
121 | char day=wdays[d.dayOfWeek()-1]; | 126 | char day=wdays[d.dayOfWeek()-1]; |
122 | 127 | ||
@@ -238,4 +243,5 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev, | |||
238 | int dayoffset=d.dayOfWeek(); | 243 | int dayoffset=d.dayOfWeek(); |
239 | if(bStartOnMonday) dayoffset--; | 244 | if(bStartOnMonday) dayoffset--; |
245 | else if( dayoffset == 7 ) dayoffset = 0; | ||
240 | 246 | ||
241 | for (int i=0; i<7; i++) { | 247 | for (int i=0; i<7; i++) { |