needs to be fixed

1 files changed, 28 insertions, 4 deletions

diff --git a/microkde/kdecore/klocale.cpp b/microkde/kdecore/klocale.cpp
index 4960b9a..7bd8a70 100644
--- a/microkde/kdecore/klocale.cpp
+++ b/microkde/kdecore/klocale.cpp
@@ -330,14 +330,22 @@ QString KLocale::formatDateTime(const QDateTime &pDateTime,
                                 bool includeSeconds,
                                 IntDateFormat intIntDateFormat) const
 {
-  return QString( "%1 %2")
-    .arg( formatDate( pDateTime.date(), shortFormat, intIntDateFormat ) )
-    .arg( formatTime( pDateTime.time(), includeSeconds , intIntDateFormat ) );
+  QString format("%1 %2");
+
+  if ( intIntDateFormat == Default )
+    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 ))
+               .arg(formatTime( pDateTime.time(), includeSeconds , intIntDateFormat ));
 }
 
 QString KLocale::formatDateTime(const QDateTime &pDateTime, IntDateFormat intIntDateFormat) const
 {
-  return formatDateTime(pDateTime, true, intIntDateFormat);
+  return formatDateTime(pDateTime, true, true, intIntDateFormat);
 }
 
 QDate KLocale::readDate(const QString &intstr, bool* ok) const
@@ -570,6 +578,22 @@ QTime KLocale::readTime(const QString &intstr, bool seconds, bool *ok) const
   // The presence of the bool* (since KDE-3.0) removes the need for an invalid QTime.
 }
 
+QDateTime KLocale::readDateTime(const QString &intstr, 
+                                bool shortFormat,
+                                bool includeSeconds,
+                                IntDateFormat intIntDateFormat, 
+                                bool* ok) const
+{
+  bool ok1, ok2;
+
+  QDate m_date = readDate(date, &ok1);
+                    QTime m_time = KGlobal::locale()->readTime(time, &ok2);
+                    if ((ok1 == false) || (ok2 == false))
+                      qDebug("Serializer::extractMeta invalid date or time !!!!!!!!!!!!!");
+
+}
+
+
 bool KLocale::use12Clock() const
 {
     return !mHourF24Format ;;