summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--microkde/kdecore/klocale.cpp32
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
@@ -325,24 +325,32 @@ QString KLocale::formatDate(const QDate &pDate, bool shortFormat, IntDateFormat
325 return ret; 325 return ret;
326} 326}
327 327
328QString KLocale::formatDateTime(const QDateTime &pDateTime, 328QString KLocale::formatDateTime(const QDateTime &pDateTime,
329 bool shortFormat, 329 bool shortFormat,
330 bool includeSeconds, 330 bool includeSeconds,
331 IntDateFormat intIntDateFormat) const 331 IntDateFormat intIntDateFormat) const
332{ 332{
333 return QString( "%1 %2") 333 QString format("%1 %2");
334 .arg( formatDate( pDateTime.date(), shortFormat, intIntDateFormat ) ) 334
335 .arg( formatTime( pDateTime.time(), includeSeconds , intIntDateFormat ) ); 335 if ( intIntDateFormat == Default )
336 format = "%1 %2";
337 else if ( intIntDateFormat == Format1 )
338 format = "%1 %2";
339 else if ( intIntDateFormat == ISODate )
340 format = "%1T%2";
341
342 return format.arg(formatDate( pDateTime.date(), shortFormat, intIntDateFormat ))
343 .arg(formatTime( pDateTime.time(), includeSeconds , intIntDateFormat ));
336} 344}
337 345
338QString KLocale::formatDateTime(const QDateTime &pDateTime, IntDateFormat intIntDateFormat) const 346QString KLocale::formatDateTime(const QDateTime &pDateTime, IntDateFormat intIntDateFormat) const
339{ 347{
340 return formatDateTime(pDateTime, true, intIntDateFormat); 348 return formatDateTime(pDateTime, true, true, intIntDateFormat);
341} 349}
342 350
343QDate KLocale::readDate(const QString &intstr, bool* ok) const 351QDate KLocale::readDate(const QString &intstr, bool* ok) const
344{ 352{
345 QDate date; 353 QDate date;
346 date = readDate(intstr, true, ok); 354 date = readDate(intstr, true, ok);
347 if (date.isValid()) return date; 355 if (date.isValid()) return date;
348 return readDate(intstr, false, ok); 356 return readDate(intstr, false, ok);
@@ -565,16 +573,32 @@ QTime KLocale::readTime(const QString &intstr, bool seconds, bool *ok) const
565 573
566 error: 574 error:
567 if (ok) *ok = false; 575 if (ok) *ok = false;
568 return QTime(-1, -1, -1); // return invalid date if it didn't work 576 return QTime(-1, -1, -1); // return invalid date if it didn't work
569 // This will be removed in the near future, since it gives a warning on stderr. 577 // This will be removed in the near future, since it gives a warning on stderr.
570 // The presence of the bool* (since KDE-3.0) removes the need for an invalid QTime. 578 // The presence of the bool* (since KDE-3.0) removes the need for an invalid QTime.
571} 579}
572 580
581QDateTime KLocale::readDateTime(const QString &intstr,
582 bool shortFormat,
583 bool includeSeconds,
584 IntDateFormat intIntDateFormat,
585 bool* ok) const
586{
587 bool ok1, ok2;
588
589 QDate m_date = readDate(date, &ok1);
590 QTime m_time = KGlobal::locale()->readTime(time, &ok2);
591 if ((ok1 == false) || (ok2 == false))
592 qDebug("Serializer::extractMeta invalid date or time !!!!!!!!!!!!!");
593
594}
595
596
573bool KLocale::use12Clock() const 597bool KLocale::use12Clock() const
574{ 598{
575 return !mHourF24Format ;; 599 return !mHourF24Format ;;
576} 600}
577 601
578bool KLocale::weekStartsMonday() const 602bool KLocale::weekStartsMonday() const
579{ 603{
580 return mWeekStartsMonday; 604 return mWeekStartsMonday;