summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/pim/datebook/holiday/birthday/.cvsignore2
-rw-r--r--core/pim/datebook/holiday/christian/.cvsignore2
-rw-r--r--core/pim/datebook/holiday/christian/hlist.cpp6
-rw-r--r--core/pim/datebook/holiday/national/.cvsignore2
4 files changed, 11 insertions, 1 deletions
diff --git a/core/pim/datebook/holiday/birthday/.cvsignore b/core/pim/datebook/holiday/birthday/.cvsignore
new file mode 100644
index 0000000..42d3c25
--- a/dev/null
+++ b/core/pim/datebook/holiday/birthday/.cvsignore
@@ -0,0 +1,2 @@
+.moc
+Makefile
diff --git a/core/pim/datebook/holiday/christian/.cvsignore b/core/pim/datebook/holiday/christian/.cvsignore
new file mode 100644
index 0000000..42d3c25
--- a/dev/null
+++ b/core/pim/datebook/holiday/christian/.cvsignore
@@ -0,0 +1,2 @@
+.moc
+Makefile
diff --git a/core/pim/datebook/holiday/christian/hlist.cpp b/core/pim/datebook/holiday/christian/hlist.cpp
index 2ce13f5..f1d51f8 100644
--- a/core/pim/datebook/holiday/christian/hlist.cpp
+++ b/core/pim/datebook/holiday/christian/hlist.cpp
@@ -1,18 +1,22 @@
#include "hlist.h"
#include <qobject.h>
const QStringList HList::entries(const QDate&aDate)const
{
QStringList ret;
if (aDate.month()==12) {
if (aDate.day()==24) {
- ret.append(QObject::tr("Christmas","holidays"));
+ ret.append(QObject::tr("Christmas Eve","holidays"));
+ } else if (aDate.day()==25) {
+ ret.append(QObject::tr("Christmas Day","holidays"));
+ } else if (aDate.day()==26) {
+ ret.append(QObject::tr("Boxing Day","holidays"));
}
} else if (aDate.month()==1) {
if (aDate.day()==1) {
ret.append(QObject::tr("New Year","holidays"));
}
}
return ret;
}
diff --git a/core/pim/datebook/holiday/national/.cvsignore b/core/pim/datebook/holiday/national/.cvsignore
new file mode 100644
index 0000000..42d3c25
--- a/dev/null
+++ b/core/pim/datebook/holiday/national/.cvsignore
@@ -0,0 +1,2 @@
+.moc
+Makefile