On Mon, Jan 11, 2016 at 07:35:50PM GMT, Craig Skinner wrote: > Hi all, > > On 2016-01-06 Wed 23:31 PM |, Craig Skinner wrote: > > > > So I instead had a stab at a calendar.united-kingdom file. > > > > Following on from a bit of discussion, below is an attempt at a UK > calendar file, with major items already in calendar.holiday strippped > out. e.g. New Year's Day, although it is an offical bank/public holiday. > > There is an incorrect entry in calendar.holiday for an August bank > holiday. The name was wrong & dates wrong for 2 countries. 2 other > countries of the UK were missing it on a different date, and as it isn't > of any international significance, I've corrected it in the new UK file. > > Refs (watch out for multiple mistakes on Wikipedia): > http://www.gov.scot/Topics/People/bank-holidays/ > http://www.gov.uk/bank-holidays > http://en.wikipedia.org/wiki/Public_holidays_in_the_United_Kingdom > http://en.wikipedia.org/wiki/Bank_holiday > > To get us going, I've ignored the many regional Scottish holidays. I > guess England has a heap of them too, but that's for another time. > > > Also for simplicity, I'll revisit the New Zealand addition later on. > > > This isn't _perfect_, but it could be a resonable starting point: > > > Index: calendar.1 > =================================================================== > RCS file: /cvs/src/usr.bin/calendar/calendar.1,v > retrieving revision 1.40 > diff -u -p -r1.40 calendar.1 > --- calendar.1 7 Dec 2015 18:46:35 -0000 1.40 > +++ calendar.1 11 Jan 2016 18:22:41 -0000 > @@ -237,6 +237,8 @@ Pagan holidays, celebrations and festiva > Russian calendar. > .It Pa calendar.space > Cosmic history. > +.It Pa calendar.united-kingdom > +U.K. holidays, celebrations and festivals. > .It Pa calendar.ushistory > U.S. history. > .It Pa calendar.usholiday > Index: calendars/calendar.holiday > =================================================================== > RCS file: /cvs/src/usr.bin/calendar/calendars/calendar.holiday,v > retrieving revision 1.33 > diff -u -p -r1.33 calendar.holiday > --- calendars/calendar.holiday 5 Jan 2016 08:28:02 -0000 1.33 > +++ calendars/calendar.holiday 11 Jan 2016 18:22:41 -0000 > @@ -284,7 +284,6 @@ > 08/03 Independence Day in Jamaica, Niger > 08/03 Memorial Day of Archbishop Makarios in Cyprus > 08/04 Freedom Day in Guyana > -08/05* Bank Holiday in Scotland and Northern Ireland > 08/06 Bank Holiday in Australia, British Columbia, Fiji, Iceland, > Ireland, > Ontario > 08/06 Emancipation Day in Bahamas > @@ -434,7 +433,7 @@ > 11/30 Independence Day in Barbados, People's Democratic Yemen Republic > 11/30 National Day in Benin > 11/30 National Heroes Day in Philippines > -11/30 St. Andrew's Day > +11/30 Saint Andrew's Day - a bank holiday in Scotland > 12/01 Independence Day in Central African Republic > 12/01 World AIDS Day > 12/01 National Day in Romania > --- /dev/null Mon Jan 11 18:23:51 2016 > +++ calendars/calendar.united-kingdom Mon Jan 11 18:19:59 2016 > @@ -0,0 +1,38 @@ > +/* > + * United Kingdom holiday > + * > + * $OpenBSD$ > + */ > + > +#ifndef _calendar_united-kingdom_ > +#define _calendar_united-kingdom_ > + > +01/02 2nd January bank holiday in Scotland - another new year's > holiday > +01/25 Burns' Night in Scotland > +03/01 Saint David's Day in Wales > +03/17 Saint Patrick's Day - a bank holiday in Ireland > +03/20* Vernal Equinox > +03/SunLast Daylight Saving Time begins; clocks move forward (last Sunday > of March) > +04/01 April Fool's Day
This I'm not entirely sure of but both Google and Wikipedia use plural possessive - "April Fools' Day". > +04/23 Saint George's Day in England > +Easter-21 Mothering Sunday (Sunday 3 weeks before Easter Sunday) > +Easter-2 Good Friday (bank holiday) > +Easter+1 Easter Monday (bank holiday - except Scotland) > +05/MonFirst Early May Bank Holiday > +05/MonThird* Victoria Day in Scotland (Monday on or immediately before May > 24) > +05/MonLast Spring Bank Holiday > +06/SunThird Father's Day (3rd Sunday of June) > +06/21* Summer Solstice > +07/12 Battle of the Boyne/Orangemen's Day/The Twelfth - a bank > holiday in Northern Ireland > +08/MonFirst Summer Bank Holiday in Scotland > +08/MonLast Summer Bank Holiday - except Scotland > +09/22* Autumnal Equinox > +10/SunLast Daylight Saving Time ends; clocks move back (last Sunday in > October) > +10/31 Halloween > +11/05 Guy Fawkes' Day If Google search results are anything to go by, then "Guy Fawkes Night" might be a bit better as it returns slightly more results. Regardless how you call it, however, it's neither possessive, nor plural. Regards, Raf > +11/11 Remembrance Day > +11/SunSecond Remembrance Sunday > +12/21* Winter Solstice > +12/31 Hogmanay - 3 day year transition festival in Scotland > + > +#endif /* !_calendar_united-kingdom_ */
