-rw-r--r-- | korganizer/calendarview.cpp | 2 | ||||
-rw-r--r-- | korganizer/kowhatsnextview.cpp | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index c3c3d47..58b3d70 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1778,3 +1778,3 @@ void CalendarView::writeLocale() | |||
1778 | KGlobal::locale()->setWeekStartMonday( !KOPrefs::instance()->mWeekStartsOnSunday ); | 1778 | KGlobal::locale()->setWeekStartMonday( !KOPrefs::instance()->mWeekStartsOnSunday ); |
1779 | KGlobal::locale()->setIntDateFormat( KOPrefs::instance()->mPreferredDate ); | 1779 | KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)KOPrefs::instance()->mPreferredDate ); |
1780 | KGlobal::locale()->setLanguage( KOPrefs::instance()->mPreferredLanguage ); | 1780 | KGlobal::locale()->setLanguage( KOPrefs::instance()->mPreferredLanguage ); |
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp index 0547a2e..b2001ec 100644 --- a/korganizer/kowhatsnextview.cpp +++ b/korganizer/kowhatsnextview.cpp | |||
@@ -452,8 +452,5 @@ void KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed ) | |||
452 | QString dfs = KGlobal::locale()->dateFormatShort(); | 452 | QString dfs = KGlobal::locale()->dateFormatShort(); |
453 | KGlobal::locale()->setIntDateFormat( 3 ); | ||
454 | KGlobal::locale()->setDateFormatShort("%d.%b"); | 453 | KGlobal::locale()->setDateFormatShort("%d.%b"); |
455 | mText +="<font color=\"#F00000\">" + KGlobal::locale()->formatDate(((Todo*)ev)->dtDue().date(), true) + "</font>"; | 454 | mText +="<font color=\"#F00000\">" + KGlobal::locale()->formatDate(((Todo*)ev)->dtDue().date(), true, KLocale::Userdefined) + "</font>"; |
456 | |||
457 | KGlobal::locale()->setDateFormatShort(dfs); | 455 | KGlobal::locale()->setDateFormatShort(dfs); |
458 | KGlobal::locale()->setIntDateFormat( KOPrefs::instance()->mPreferredDate ); | ||
459 | } else { | 456 | } else { |
@@ -569,8 +566,5 @@ bool KOWhatsNextView::appendTodo(Incidence *ev, QString ind , bool isSub ) | |||
569 | QString dfs = KGlobal::locale()->dateFormatShort(); | 566 | QString dfs = KGlobal::locale()->dateFormatShort(); |
570 | KGlobal::locale()->setIntDateFormat( 3 ); | ||
571 | KGlobal::locale()->setDateFormatShort("%d.%b"); | 567 | KGlobal::locale()->setDateFormatShort("%d.%b"); |
572 | mText +="<font color=\"#00A000\"> [" + KGlobal::locale()->formatDate(((Todo*)ev)->dtDue().date(), true) + "."+ year +"]</font>"; | 568 | mText +="<font color=\"#00A000\"> [" + KGlobal::locale()->formatDate(((Todo*)ev)->dtDue().date(), true, KLocale::Userdefined) + "."+ year +"]</font>"; |
573 | |||
574 | KGlobal::locale()->setDateFormatShort(dfs); | 569 | KGlobal::locale()->setDateFormatShort(dfs); |
575 | KGlobal::locale()->setIntDateFormat( KOPrefs::instance()->mPreferredDate ); | ||
576 | } | 570 | } |