summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt2
-rw-r--r--korganizer/kowhatsnextview.cpp15
2 files changed, 14 insertions, 3 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index dce95cd..3d16c1a 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1195,5 +1195,5 @@
{ "New Agendasize: %1","Neue Agendagröße: %1" },
{ " (%1 y.)"," (%1 J.)" },
-{ "","" },
+{ "Allday:","Ganztägig:" },
{ "","" },
{ "","" },
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 4111c5d..57623e6 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -477,4 +477,7 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a
return false;
}
+ bool bDay = false;
+ if ( ev->categories().contains( i18n("Birthday") ) || ev->categories().contains( i18n("Anniversary") ) )
+ bDay = true;
tempText += "<tr><td><b>";
if (ev->type()=="Event") {
@@ -531,5 +534,13 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a
} else {
- tempText += i18n("Allday:");
+ if ( bDay ) {
+
+ if ( ev->categories().contains( i18n("Birthday") ))
+ tempText += "<font color=\"#F00000\">" + i18n("Birthday") +":</font>";
+ else
+ tempText += "<font color=\"#F00000\">" + i18n("Anniversary")+":</font>";
+ } else {
+ tempText += i18n("Allday:");
+ }
}
@@ -601,5 +612,5 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a
else
tempText += i18n("-no summary-");
- if ( ev->categories().contains( i18n("Birthday") ) || ev->categories().contains( i18n("Anniversary") ) ) {
+ if ( bDay ) {
noc = ev->getNextOccurence( cdt, &ok );
if ( ok ) {