resolved merge conflict

1 files changed, 6 insertions, 5 deletions

diff --git a/core/pim/datebook/datebookweekheaderimpl.cpp b/core/pim/datebook/datebookweekheaderimpl.cpp
index 770410e..84b4f1b 100644
--- a/core/pim/datebook/datebookweekheaderimpl.cpp
+++ b/core/pim/datebook/datebookweekheaderimpl.cpp
@@ -100,8 +100,8 @@ void DateBookWeekHeader::setDate(const QDate &d) {
         dayofweek=d.dayOfWeek();
-        if(bStartOnMonday) 
+        if(bStartOnMonday)
             dayofweek--;
         else if( dayofweek == 7 )
-            /* we already have the right day -7 would lead to the current week..*/
+            // we already have the right day -7 would lead to the current week..
             dayofweek = 0;
-                        
+
         date=date.addDays(-dayofweek);
@@ -111,6 +111,7 @@ void DateBookWeekHeader::setDate(const QDate &d) {
         labelDate->setText( QString::number(start.day()) + "." +
-                        start.monthName(start.month()) + "-" +
+                        Calendar::nameOfMonth( start.month()) + "-" +
                         QString::number(stop.day()) + "." +
-                        start.monthName(stop.month()) +" ("+
+                        Calendar::nameOfMonth( stop.month()) +" ("+
                         tr("w")+":"+QString::number( week ) +")");
+        date = d; // bugfix: 0001126 - date has to be the selected date, not monday!
         emit dateChanged(date);