1 files changed, 15 insertions, 5 deletions

diff --git a/microkde/kdecore/klocale.cpp b/microkde/kdecore/klocale.cpp
index 8b4513e..27acfec 100644
--- a/microkde/kdecore/klocale.cpp
+++ b/microkde/kdecore/klocale.cpp
@@ -336,14 +336,18 @@ QString KLocale::formatDateTime(const QDateTime &pDateTime,
     format = "%1 %2";
   else if ( intIntDateFormat == Format1 )
     format = "%1 %2";
   else  if ( intIntDateFormat == ISODate )
     format = "%1T%2";
 
-  return format.arg(formatDate( pDateTime.date(), shortFormat, intIntDateFormat ))
+  QString res = format.arg(formatDate( pDateTime.date(), shortFormat, intIntDateFormat ))
                .arg(formatTime( pDateTime.time(), includeSeconds , intIntDateFormat ));
+
+  //qDebug("KLocale::formatDateTime transformed %s, into %s", pDateTime.toString().latin1(), res.latin1() );
+
+  return res;
 }
 
 QString KLocale::formatDateTime(const QDateTime &pDateTime, IntDateFormat intIntDateFormat) const
 {
   return formatDateTime(pDateTime, true, true, intIntDateFormat);
 }
@@ -598,24 +602,30 @@ QDateTime KLocale::readDateTime(const QString &intstr,
   QString dformat = dateFormat(intIntDateFormat);
   QString tformat = timeFormat(intIntDateFormat);
 
   QDate m_date = readDate(date, dformat, &ok1);
   QTime m_time = readTime(time, tformat, &ok2);
 
+  QDateTime m_dt;
+
   if (ok)
     {
       if ((ok1 == false) || (ok2 == false))
         *ok = false;
       else
         *ok = true;
     }
-  QDateTime m_dt;
-  m_dt.setDate(m_date);
-  m_dt.setTime(m_time);
 
-  qDebug("KLocale::readDateTime() transformed %s into %s (%s), %s (%s) : err1=%i, err2=%i", intstr.latin1(), date.latin1(), dformat.latin1(), time.latin1(), tformat.latin1(), ok1, ok2);
+  //only set values if both operations returned true.
+  if ((ok1 == true) && (ok2 == true))
+    {
+      m_dt.setDate(m_date);
+      m_dt.setTime(m_time);
+    }
+
+  //qDebug("KLocale::readDateTime() transformed %s into %s (%s), %s (%s) : err1=%i, err2=%i", intstr.latin1(), date.latin1(), dformat.latin1(), time.latin1(), tformat.latin1(), ok1, ok2);
   return m_dt;
 }
 
 QDate KLocale::readDate(const QString &intstr, 
                                 IntDateFormat intIntDateFormat, 
                                 bool* ok) const