1 files changed, 7 insertions, 13 deletions

diff --git a/korganizer/calprintbase.cpp b/korganizer/calprintbase.cpp
index f66fddc..7b7d54c 100644
--- a/korganizer/calprintbase.cpp
+++ b/korganizer/calprintbase.cpp
@@ -654,15 +654,3 @@ void CalPrintBase::drawDayBox(QPainter &p, const QDate &qd,
   if (fullDate) {
-    /*int index;
-    dayNumStr= qd.toString();
-    index = dayNumStr.find(' ');
-    dayNumStr.remove(0, index);
-    index = dayNumStr.findRev(' ');
-    dayNumStr.truncate(index);*/
-
-    const KCalendarSystem *calSys = KOGlobals::self()->calendarSystem();
-    dayNumStr = i18n("weekday month date", "%1 %2 %3")
-        .arg( calSys->weekDayName( qd ) )
-        .arg( calSys->monthName( qd ) )
-        .arg( qd.day() );
-//    dayNumStr = local->formatDate(qd);
+    dayNumStr = local->formatDate(qd);
   } else {
@@ -688,2 +676,8 @@ void CalPrintBase::drawDayBox(QPainter &p, const QDate &qd,
   p.setFont(QFont("helvetica", 10, QFont::Bold));
+  if ( fullDate) {
+      // use short date format, if long date is too long
+      QFontMetrics fm ( p.font() );
+      if ( fm.width( dayNumStr ) > width -10 )
+          dayNumStr = local->formatDate(qd, true);
+  }
   p.drawText(x+5, y, width-10, mSubHeaderHeight, AlignRight | AlignVCenter,