author | alwin <alwin> | 2005-03-17 01:28:40 (UTC) |
---|---|---|
committer | alwin <alwin> | 2005-03-17 01:28:40 (UTC) |
commit | 56bedc269df8d5838834895971c7688161eb930d (patch) (side-by-side diff) | |
tree | c782505c895f3fcabe0a9a030f5e0703a57504db /core/pim | |
parent | 2968c1e512240492bd71295320bd5153ee4a58be (diff) | |
download | opie-56bedc269df8d5838834895971c7688161eb930d.zip opie-56bedc269df8d5838834895971c7688161eb930d.tar.gz opie-56bedc269df8d5838834895971c7688161eb930d.tar.bz2 |
inserted missing
corrected spelling
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 @@ -73,23 +73,24 @@ void ChrisHoliday::calc_easter() 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(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&,const QDate&)
{
QMap<QDate,QStringList> ret;
return ret;
}
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 @@ -2,17 +2,17 @@ #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"));
}
} 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 |