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 @@ -81,8 +81,9 @@ void ChrisHoliday::calc_easter() QDate d(_lastyear,n,p);
_days[d].append(QObject::tr("Eastersunday","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"));
}
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 @@ -10,9 +10,9 @@ const QStringList HList::entries(const QDate&aDate)const ret.append(QObject::tr("Christmas","holidays"));
}
} else if (aDate.month()==1) {
if (aDate.day()==1) {
- ret.append(QObject::tr("New year","holidays"));
+ ret.append(QObject::tr("New Year","holidays")); }
}
return ret;
}
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 |