[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim/kmail
From:       Ingo Klöcker <ingo.kloecker () epost ! de>
Date:       2003-01-18 20:40:08
[Download RAW message or body]

CVS commit by kloecker: 

Fix Bug 53108: fancy 'Date:' format is also used in printing
Use the localized date when printing not only with fancy headers but also with long \
headers.


  M +13 -15    kmreaderwin.cpp   1.614


--- kdepim/kmail/kmreaderwin.cpp  #1.613:1.614
@@ -1760,4 +1760,15 @@ QString KMReaderWin::writeMsgHeader(KMMe
       subjectDir = i18n("No Subject").isRightToLeft() ? "rtl" : "ltr";
 
+   // Prepare the date string (when printing always use the localized date)
+   QString dateString;
+   if( mPrinting ) {
+     QDateTime dateTime;
+     KLocale* locale = KGlobal::locale();
+     dateTime.setTime_t( aMsg->date() );
+     dateString = locale->formatDateTime( dateTime );
+   }
+   else {
+     dateString = aMsg->dateStr();
+   }
 
   if (hasVCard) vcname = mTempFiles.last();
@@ -1876,18 +1887,4 @@ QString KMReaderWin::writeMsgHeader(KMMe
     headerStr.append(visibleHeadersToString(aMsg, "<tr><th \
class=\"fancyHeaderDtls\">%2</th><td class=\"fancyHeaderDtls\">%3</td></tr>", \
ignoreFieldsList));  
-    // the date
-    QString dateString;
-    if (mPrinting)
-    {
-        QDateTime dateTime;
-        KLocale* locale = KGlobal::locale();
-        dateTime.setTime_t(aMsg->date());
-        dateString = locale->formatDateTime(dateTime);
-    }
-    else
-    {
-        dateString = aMsg->dateStr();
-    }
-
     headerStr.append(QString("<tr><th class=\"fancyHeaderDtls\">%1</th><td \
                dir=\"%2\" class=\"fancyHeaderDtls\">%3</td></tr>")
                             .arg(i18n("Date: "))
@@ -1901,5 +1898,6 @@ QString KMReaderWin::writeMsgHeader(KMMe
                         strToHtml(aMsg->subject()) + "</b></div>")
                         .arg(subjectDir);
-    headerStr.append(i18n("Date: ") + strToHtml(aMsg->dateStr())+"<br>");
+
+    headerStr.append(i18n("Date: ") + strToHtml(dateString)+"<br>");
     headerStr.append(i18n("From: ") +
                      KMMessage::emailAddrAsAnchor(aMsg->from(),FALSE));


[prev in list] [next in list] [prev in thread] [next in thread]