Diffstat (limited to 'microkde/kdecore/klocale.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | microkde/kdecore/klocale.cpp | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/microkde/kdecore/klocale.cpp b/microkde/kdecore/klocale.cpp index 1da1e99..d7e384c 100644 --- a/microkde/kdecore/klocale.cpp +++ b/microkde/kdecore/klocale.cpp @@ -847,65 +847,66 @@ QString KLocale::dateFormat(IntDateFormat intIntDateFormat) const } return mDateFormat ; } QString KLocale::dateFormatShort(IntDateFormat intIntDateFormat) const { const IntDateFormat dformat = (intIntDateFormat == Undefined)?mIntDateFormat:intIntDateFormat; if ( dformat == Default ) return "%d.%m.%Y"; else if ( dformat == Format1 ) return "%m.%d.%Y"; else if ( dformat == ISODate ) // = Qt::ISODate return "%Y-%m-%d"; return mDateFormatShort ; } QString KLocale::timeFormat(IntDateFormat intIntTimeFormat) const { const IntDateFormat tformat = (intIntTimeFormat == Undefined)?mIntTimeFormat:intIntTimeFormat; if ( tformat == Default ) - if ( mHourF24Format) - return "%H:%M:%S"; - else - return "%I:%M:%S%p"; + if ( mHourF24Format) + return "%H:%M:%S"; + else + return "%I:%M:%S%p"; else if ( tformat == Format1 ) - if ( mHourF24Format) - return "%H:%M:%S"; - else - return "%I:%M:%S%p"; + if ( mHourF24Format) + return "%H:%M:%S"; + else + return "%I:%M:%S%p"; else if ( tformat == ISODate ) // = Qt::ISODate - if ( mHourF24Format) - return "%H:%M:%S"; - else - return "%I:%M:%S%p"; - + if ( mHourF24Format) + return "%H:%M:%S"; + else + return "%I:%M:%S%p"; + // to satisfy the compiler + return "%H:%M:%S"; } void KLocale::insertCatalogue ( const QString & ) { } KCalendarSystem *KLocale::calendar() { if ( !mCalendarSystem ) { mCalendarSystem = new KCalendarSystemGregorian; } return mCalendarSystem; } int KLocale::timezoneOffset( QString timeZone ) { int ret = 1001; int index = mTimeZoneList.findIndex( timeZone ); if ( index < 24 ) ret = ( index-11 ) * 60 ; return ret; } |