| -rw-r--r-- | core/pim/datebook/holiday/christian/chrisholiday.cpp | 1 |
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 @@ -52,64 +52,65 @@ void ChrisHoliday::calc_easter() { unsigned long n = 0; unsigned long p = 0; if ( _lastyear > 1582 ) { unsigned long a = _lastyear%19; unsigned long b = _lastyear/100; unsigned long c = _lastyear%100; unsigned long d = b/4; unsigned long e = b%4; unsigned long f = (b+8)/25; unsigned long g = (b+f+1)/3; unsigned long h = (19*a+b-d-g+15)%30; unsigned long i = c/4; unsigned long j = c%4; unsigned long k = j%100; unsigned long l = (32+2*e+2*i-h-k)%7; unsigned long m = (a+11*h+22*l)/451; n = (h+l-7*m+114)/31; p = (h+l-7*m+114)%31; } 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); return ret; } QDate d; int daysto; if (end < start) { d = end; daysto = end.daysTo(start); } else { d = start; daysto = start.daysTo(end); } QStringList temp; for (int i=0;i<=daysto;++i) { temp = entries(d.addDays(i)); if (temp.count()==0) continue; ret[d.addDays(i)]+=temp; temp.clear(); } return ret; } |