4 files changed, 2 insertions, 1 deletions
diff --git a/core/pim/datebook/holiday/christian/chrisholiday.cpp b/core/pim/datebook/holiday/christian/chrisholiday.cpp index be16bd0..ef6516e 100644 --- a/core/pim/datebook/holiday/christian/chrisholiday.cpp +++ b/core/pim/datebook/holiday/christian/chrisholiday.cpp | |||
@@ -61,35 +61,36 @@ void ChrisHoliday::calc_easter() | |||
61 | unsigned long f = (b+8)/25; | 61 | unsigned long f = (b+8)/25; |
62 | unsigned long g = (b+f+1)/3; | 62 | unsigned long g = (b+f+1)/3; |
63 | unsigned long h = (19*a+b-d-g+15)%30; | 63 | unsigned long h = (19*a+b-d-g+15)%30; |
64 | unsigned long i = c/4; | 64 | unsigned long i = c/4; |
65 | unsigned long j = c%4; | 65 | unsigned long j = c%4; |
66 | unsigned long k = j%100; | 66 | unsigned long k = j%100; |
67 | unsigned long l = (32+2*e+2*i-h-k)%7; | 67 | unsigned long l = (32+2*e+2*i-h-k)%7; |
68 | unsigned long m = (a+11*h+22*l)/451; | 68 | unsigned long m = (a+11*h+22*l)/451; |
69 | n = (h+l-7*m+114)/31; | 69 | n = (h+l-7*m+114)/31; |
70 | p = (h+l-7*m+114)%31; | 70 | p = (h+l-7*m+114)%31; |
71 | } else { | 71 | } else { |
72 | unsigned long a = _lastyear%4; | 72 | unsigned long a = _lastyear%4; |
73 | unsigned long b = _lastyear%7; | 73 | unsigned long b = _lastyear%7; |
74 | unsigned long c = _lastyear%19; | 74 | unsigned long c = _lastyear%19; |
75 | unsigned long d = (19*c+15)%30; | 75 | unsigned long d = (19*c+15)%30; |
76 | unsigned long e = (2*a+4*b-d+34)%7; | 76 | unsigned long e = (2*a+4*b-d+34)%7; |
77 | n = (d+e+114)/31; | 77 | n = (d+e+114)/31; |
78 | p = (d+e+114)%31; | 78 | p = (d+e+114)%31; |
79 | } | 79 | } |
80 | p++; | 80 | p++; |
81 | QDate d(_lastyear,n,p); | 81 | QDate d(_lastyear,n,p); |
82 | _days[d].append(QObject::tr("Eastersunday","holidays")); | 82 | _days[d].append(QObject::tr("Eastersunday","holidays")); |
83 | _days[d.addDays(49)].append(QObject::tr("Whitsunday","holidays")); | 83 | _days[d.addDays(49)].append(QObject::tr("Whitsunday","holidays")); |
84 | _days[d.addDays(50)].append(QObject::tr("Whitmonday","holidays")); | 84 | _days[d.addDays(50)].append(QObject::tr("Whitmonday","holidays")); |
85 | _days[d.addDays(39)].append(QObject::tr("Ascension Day","holidays")); | ||
85 | _days[d.addDays(-46)].append(QObject::tr("Ash Wednesday","holidays")); | 86 | _days[d.addDays(-46)].append(QObject::tr("Ash Wednesday","holidays")); |
86 | _days[d.addDays(60)].append(QObject::tr("Corpus Christi","holidays")); | 87 | _days[d.addDays(60)].append(QObject::tr("Corpus Christi","holidays")); |
87 | } | 88 | } |
88 | 89 | ||
89 | QMap<QDate,QStringList> ChrisHoliday::entries(const QDate&,const QDate&) | 90 | QMap<QDate,QStringList> ChrisHoliday::entries(const QDate&,const QDate&) |
90 | { | 91 | { |
91 | QMap<QDate,QStringList> ret; | 92 | QMap<QDate,QStringList> ret; |
92 | return ret; | 93 | return ret; |
93 | } | 94 | } |
94 | 95 | ||
95 | EXPORT_HOLIDAY_PLUGIN(ChrisHoliday); | 96 | EXPORT_HOLIDAY_PLUGIN(ChrisHoliday); |
diff --git a/core/pim/datebook/holiday/christian/chrisholiday.h b/core/pim/datebook/holiday/christian/chrisholiday.h index 8dcf4c6..9ae500e 100644 --- a/core/pim/datebook/holiday/christian/chrisholiday.h +++ b/core/pim/datebook/holiday/christian/chrisholiday.h | |||
diff --git a/core/pim/datebook/holiday/christian/hlist.cpp b/core/pim/datebook/holiday/christian/hlist.cpp index 795b075..2ce13f5 100644 --- a/core/pim/datebook/holiday/christian/hlist.cpp +++ b/core/pim/datebook/holiday/christian/hlist.cpp | |||
@@ -1,18 +1,18 @@ | |||
1 | #include "hlist.h" | 1 | #include "hlist.h" |
2 | 2 | ||
3 | #include <qobject.h> | 3 | #include <qobject.h> |
4 | 4 | ||
5 | const QStringList HList::entries(const QDate&aDate)const | 5 | const QStringList HList::entries(const QDate&aDate)const |
6 | { | 6 | { |
7 | QStringList ret; | 7 | QStringList ret; |
8 | if (aDate.month()==12) { | 8 | if (aDate.month()==12) { |
9 | if (aDate.day()==24) { | 9 | if (aDate.day()==24) { |
10 | ret.append(QObject::tr("Christmas","holidays")); | 10 | ret.append(QObject::tr("Christmas","holidays")); |
11 | } | 11 | } |
12 | } else if (aDate.month()==1) { | 12 | } else if (aDate.month()==1) { |
13 | if (aDate.day()==1) { | 13 | if (aDate.day()==1) { |
14 | ret.append(QObject::tr("New year","holidays")); | 14 | ret.append(QObject::tr("New Year","holidays")); |
15 | } | 15 | } |
16 | } | 16 | } |
17 | return ret; | 17 | return ret; |
18 | } | 18 | } |
diff --git a/core/pim/datebook/holiday/christian/hlist.h b/core/pim/datebook/holiday/christian/hlist.h index 5904852..5a87c50 100644 --- a/core/pim/datebook/holiday/christian/hlist.h +++ b/core/pim/datebook/holiday/christian/hlist.h | |||