summaryrefslogtreecommitdiff
authoralwin <alwin>2005-03-19 23:26:17 (UTC)
committer alwin <alwin>2005-03-19 23:26:17 (UTC)
commit9b608c7c967b2a22d4c6a8d8b98a4635d3b21204 (patch) (side-by-side diff)
tree457bd3dd5ca2f95e119bff1f4482423cf32b2638
parent3b5693df5af4a08b3261efefa545c706ff305868 (diff)
downloadopie-9b608c7c967b2a22d4c6a8d8b98a4635d3b21204.zip
opie-9b608c7c967b2a22d4c6a8d8b98a4635d3b21204.tar.gz
opie-9b608c7c967b2a22d4c6a8d8b98a4635d3b21204.tar.bz2
inserted missed holiday
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/datebook/holiday/christian/chrisholiday.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/pim/datebook/holiday/christian/chrisholiday.cpp b/core/pim/datebook/holiday/christian/chrisholiday.cpp
index 2cccb85..2a260bf 100644
--- a/core/pim/datebook/holiday/christian/chrisholiday.cpp
+++ b/core/pim/datebook/holiday/christian/chrisholiday.cpp
@@ -72,24 +72,25 @@ void ChrisHoliday::calc_easter()
} else {
unsigned long a = _lastyear%4;
unsigned long b = _lastyear%7;
unsigned long c = _lastyear%19;
unsigned long d = (19*c+15)%30;
unsigned long e = (2*a+4*b-d+34)%7;
n = (d+e+114)/31;
p = (d+e+114)%31;
}
p++;
QDate d(_lastyear,n,p);
_days[d].append(QObject::tr("Eastersunday","holidays"));
+ _days[d.addDays(-2)].append(QObject::tr("Good Friday","holidays"));
_days[d.addDays(49)].append(QObject::tr("Whitsunday","holidays"));
_days[d.addDays(50)].append(QObject::tr("Whitmonday","holidays"));
_days[d.addDays(39)].append(QObject::tr("Ascension Day","holidays"));
_days[d.addDays(-46)].append(QObject::tr("Ash Wednesday","holidays"));
_days[d.addDays(60)].append(QObject::tr("Corpus Christi","holidays"));
}
QMap<QDate,QStringList> ChrisHoliday::entries(const QDate&start,const QDate&end)
{
QMap<QDate,QStringList> ret;
if (start==end) {
ret[start]=entries(start);