From 3e57241f89c1695a0b7205fd3e8cbd9296eb6b44 Mon Sep 17 00:00:00 2001 From: Alex Dunae Date: Wed, 14 Sep 2011 10:36:20 -0700 Subject: [PATCH] Update definitions --- lib/holidays/at.rb | 10 ++-- lib/holidays/au.rb | 20 ++++---- lib/holidays/br.rb | 12 ++--- lib/holidays/ca.rb | 36 +++++++-------- lib/holidays/cz.rb | 14 +++--- lib/holidays/de.rb | 14 +++--- lib/holidays/dk.rb | 16 +++---- lib/holidays/el.rb | 10 ++-- lib/holidays/es.rb | 34 +++++++------- lib/holidays/fi.rb | 20 ++++---- lib/holidays/fr.rb | 12 ++--- lib/holidays/gb.rb | 18 ++++---- lib/holidays/ie.rb | 12 ++--- lib/holidays/is.rb | 18 ++++---- lib/holidays/it.rb | 12 ++--- lib/holidays/jp.rb | 86 +++++++++++++++++------------------ lib/holidays/mx.rb | 32 ++++++------- lib/holidays/nl.rb | 8 ++-- lib/holidays/no.rb | 4 +- lib/holidays/north_america.rb | 86 +++++++++++++++++------------------ lib/holidays/nyse.rb | 10 ++-- lib/holidays/nz.rb | 26 +++++------ lib/holidays/pt.rb | 14 +++--- lib/holidays/scandinavia.rb | 78 +++++++++++++++---------------- lib/holidays/se.rb | 22 ++++----- lib/holidays/ups.rb | 8 ++-- lib/holidays/us.rb | 20 ++++---- lib/holidays/za.rb | 14 +++--- 28 files changed, 333 insertions(+), 333 deletions(-) diff --git a/lib/holidays/at.rb b/lib/holidays/at.rb index 4fe0ad9..8741934 100644 --- a/lib/holidays/at.rb +++ b/lib/holidays/at.rb @@ -15,19 +15,19 @@ module Holidays DEFINED_REGIONS = [:at] HOLIDAYS_BY_MONTH = { - 5 => [{:mday => 1, :name => "Staatsfeiertag", :regions => [:at]}], 0 => [{:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Ostermontag", :regions => [:at]}, {:function => lambda { |year| Holidays.easter(year)+39 }, :function_id => "easter(year)+39", :name => "Christi Himmelfahrt", :regions => [:at]}, {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "Pfingstmontag", :regions => [:at]}, {:function => lambda { |year| Holidays.easter(year)+60 }, :function_id => "easter(year)+60", :name => "Fronleichnam", :regions => [:at]}], - 11 => [{:mday => 1, :name => "Allerheiligen", :regions => [:at]}], 1 => [{:mday => 1, :name => "Neujahrstag", :regions => [:at]}, {:mday => 6, :name => "Heilige Drei K√∂nige", :regions => [:at]}], + 5 => [{:mday => 1, :name => "Staatsfeiertag", :regions => [:at]}], + 8 => [{:mday => 15, :name => "Mari√§ Himmelfahrt", :regions => [:at]}], + 10 => [{:mday => 26, :name => "Nationalfeiertag", :regions => [:at]}], + 11 => [{:mday => 1, :name => "Allerheiligen", :regions => [:at]}], 12 => [{:mday => 8, :name => "Mari√§ Empf√§ngnis", :regions => [:at]}, {:mday => 25, :name => "1. Weihnachtstag", :regions => [:at]}, - {:mday => 26, :name => "2. Weihnachtstag", :regions => [:at]}], - 8 => [{:mday => 15, :name => "Mari√§ Himmelfahrt", :regions => [:at]}], - 10 => [{:mday => 26, :name => "Nationalfeiertag", :regions => [:at]}] + {:mday => 26, :name => "2. Weihnachtstag", :regions => [:at]}] } end diff --git a/lib/holidays/au.rb b/lib/holidays/au.rb index 7904682..f2f9fd5 100644 --- a/lib/holidays/au.rb +++ b/lib/holidays/au.rb @@ -12,28 +12,28 @@ module Holidays # # More definitions are available at http://code.dunae.ca/holidays. module AU # :nodoc: - DEFINED_REGIONS = [:au_qld, :au_nt, :au, :au_tas, :au_wa, :au_act, :au_nsw, :au_sa, :au_vic, :au_qld_brisbane] + DEFINED_REGIONS = [:au, :au_tas, :au_wa, :au_vic, :au_qld, :au_nt, :au_act, :au_nsw, :au_sa, :au_qld_brisbane] HOLIDAYS_BY_MONTH = { - 5 => [{:wday => 1, :week => 1, :name => "Labour Day", :regions => [:au_qld]}, - {:wday => 1, :week => 1, :name => "May Day", :regions => [:au_nt]}], 0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Good Friday", :regions => [:au]}, {:function => lambda { |year| Holidays.easter(year)-1 }, :function_id => "easter(year)-1", :name => "Easter Saturday", :regions => [:au]}, {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Easter Monday", :regions => [:au]}, {:function => lambda { |year| Holidays.easter(year)+2 }, :function_id => "easter(year)+2", :name => "Easter Monday", :regions => [:au_tas]}], - 6 => [{:wday => 1, :week => 1, :name => "Foundation Day", :regions => [:au_wa]}, - {:wday => 1, :week => 2, :name => "Queen's Birthday", :regions => [:au_act, :au_nsw, :au_sa, :au_tas, :au_nt, :au_qld, :au_vic]}, - {:mday => 6, :type => :informal, :name => "Queensland Day", :regions => [:au_qld]}], 1 => [{:mday => 1, :name => "New Year's Day", :regions => [:au]}, {:mday => 26, :name => "Australia Day", :regions => [:au]}], - 12 => [{:mday => 25, :name => "Christmas Day", :regions => [:au]}, - {:mday => 26, :name => "Boxing Day", :regions => [:au]}], - 8 => [{:wday => 3, :week => -3, :name => "Ekka", :regions => [:au_qld_brisbane]}], 3 => [{:wday => 1, :week => 1, :name => "Labour Day", :regions => [:au_wa]}, {:wday => 1, :week => 2, :name => "Eight Hours Day", :regions => [:au_tas]}, {:wday => 1, :week => 2, :name => "Labour Day", :regions => [:au_vic]}], 4 => [{:mday => 25, :name => "ANZAC Day", :regions => [:au]}], - 10 => [{:wday => 1, :week => 1, :name => "Labour Day", :regions => [:au_act, :au_nsw, :au_sa]}] + 5 => [{:wday => 1, :week => 1, :name => "Labour Day", :regions => [:au_qld]}, + {:wday => 1, :week => 1, :name => "May Day", :regions => [:au_nt]}], + 6 => [{:wday => 1, :week => 1, :name => "Foundation Day", :regions => [:au_wa]}, + {:wday => 1, :week => 2, :name => "Queen's Birthday", :regions => [:au_act, :au_nsw, :au_sa, :au_tas, :au_nt, :au_qld, :au_vic]}, + {:mday => 6, :type => :informal, :name => "Queensland Day", :regions => [:au_qld]}], + 8 => [{:wday => 3, :week => -3, :name => "Ekka", :regions => [:au_qld_brisbane]}], + 10 => [{:wday => 1, :week => 1, :name => "Labour Day", :regions => [:au_act, :au_nsw, :au_sa]}], + 12 => [{:mday => 25, :name => "Christmas Day", :regions => [:au]}, + {:mday => 26, :name => "Boxing Day", :regions => [:au]}] } end diff --git a/lib/holidays/br.rb b/lib/holidays/br.rb index 959b92e..f50c79c 100644 --- a/lib/holidays/br.rb +++ b/lib/holidays/br.rb @@ -15,18 +15,18 @@ module Holidays DEFINED_REGIONS = [:br] HOLIDAYS_BY_MONTH = { - 5 => [{:mday => 1, :name => "Dia do Trabalho", :regions => [:br]}], 0 => [{:function => lambda { |year| Holidays.easter(year)-47 }, :function_id => "easter(year)-47", :type => :informal, :name => "Carnaval", :regions => [:br]}, {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Sexta-feira Santa", :regions => [:br]}, {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Páscoa", :regions => [:br]}, {:function => lambda { |year| Holidays.easter(year)+60 }, :function_id => "easter(year)+60", :name => "Corpus Christ", :regions => [:br]}], + 1 => [{:mday => 1, :name => "Dia da Confraternização Universal", :regions => [:br]}], + 4 => [{:mday => 21, :name => "Dia de Tiradentes", :regions => [:br]}], + 5 => [{:mday => 1, :name => "Dia do Trabalho", :regions => [:br]}], + 9 => [{:mday => 7, :name => "Proclamação da Independência", :regions => [:br]}], + 10 => [{:mday => 12, :name => "Dia de Nossa Senhora Aparecida", :regions => [:br]}], 11 => [{:mday => 2, :name => "Dia de Finados", :regions => [:br]}, {:mday => 15, :name => "Proclamação da República", :regions => [:br]}], - 1 => [{:mday => 1, :name => "Dia da Confraternização Universal", :regions => [:br]}], - 12 => [{:mday => 25, :name => "Natal", :regions => [:br]}], - 9 => [{:mday => 7, :name => "Proclamação da Independência", :regions => [:br]}], - 4 => [{:mday => 21, :name => "Dia de Tiradentes", :regions => [:br]}], - 10 => [{:mday => 12, :name => "Dia de Nossa Senhora Aparecida", :regions => [:br]}] + 12 => [{:mday => 25, :name => "Natal", :regions => [:br]}] } end diff --git a/lib/holidays/ca.rb b/lib/holidays/ca.rb index 36affa1..ef0c05c 100644 --- a/lib/holidays/ca.rb +++ b/lib/holidays/ca.rb @@ -12,42 +12,42 @@ module Holidays # # More definitions are available at http://code.dunae.ca/holidays. module CA # :nodoc: - DEFINED_REGIONS = [:ca, :ca_qc, :ca_nf, :ca_nt, :ca_nu, :ca_ab, :ca_on, :ca_sk, :ca_mb, :ca_bc, :ca_ns, :ca_yk, :us] + DEFINED_REGIONS = [:ca, :ca_qc, :ca_ab, :ca_on, :ca_sk, :ca_mb, :ca_nf, :ca_nt, :ca_nu, :ca_bc, :ca_ns, :ca_yk, :us] HOLIDAYS_BY_MONTH = { - 5 => [{:function => lambda { |year| Holidays.ca_victoria_day(year) }, :function_id => "ca_victoria_day(year)", :name => "Victoria Day", :regions => [:ca]}, - {:function => lambda { |year| Holidays.ca_victoria_day(year) }, :function_id => "ca_victoria_day(year)", :name => "National Patriotes Day", :regions => [:ca_qc]}, - {:wday => 0, :week => 3, :type => :informal, :name => "Father's Day", :regions => [:us, :ca]}], 0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Good Friday", :regions => [:ca]}, {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :type => :informal, :name => "Easter Monday", :regions => [:ca]}], - 11 => [{:mday => 11, :name => "Remembrance Day", :regions => [:ca]}], - 6 => [{:mday => 24, :name => "Discovery Day", :regions => [:ca_nf]}, - {:mday => 24, :name => "Fête Nationale", :regions => [:ca_qc]}, - {:mday => 21, :name => "National Aboriginal Day", :regions => [:ca_nt]}], 1 => [{:mday => 1, :name => "New Year's Day", :regions => [:ca]}, {:mday => 2, :name => "New Year's", :regions => [:ca_qc]}], - 12 => [{:mday => 25, :name => "Christmas Day", :regions => [:ca]}, - {:mday => 26, :name => "Boxing Day", :regions => [:ca]}], - 7 => [{:mday => 1, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Canada Day", :regions => [:ca]}, - {:mday => 12, :name => "Orangemen's Day", :regions => [:ca_nf]}, - {:mday => 9, :name => "Nunavut Day", :regions => [:ca_nu]}], 2 => [{:wday => 1, :week => 3, :name => "Family Day", :regions => [:ca_ab, :ca_on, :ca_sk]}, {:wday => 1, :week => 3, :name => "Louis Riel Day", :regions => [:ca_mb]}, {:mday => 2, :type => :informal, :name => "Groundhog Day", :regions => [:us, :ca]}, {:mday => 14, :type => :informal, :name => "Valentine's Day", :regions => [:us, :ca]}], + 3 => [{:mday => 23, :name => "St. George's Day", :regions => [:ca_nf]}, + {:mday => 17, :type => :informal, :name => "St. Patrick's Day", :regions => [:us, :ca]}], + 5 => [{:function => lambda { |year| Holidays.ca_victoria_day(year) }, :function_id => "ca_victoria_day(year)", :name => "Victoria Day", :regions => [:ca]}, + {:function => lambda { |year| Holidays.ca_victoria_day(year) }, :function_id => "ca_victoria_day(year)", :name => "National Patriotes Day", :regions => [:ca_qc]}, + {:wday => 0, :week => 3, :type => :informal, :name => "Father's Day", :regions => [:us, :ca]}], + 6 => [{:mday => 24, :name => "Discovery Day", :regions => [:ca_nf]}, + {:mday => 24, :name => "Fête Nationale", :regions => [:ca_qc]}, + {:mday => 21, :name => "National Aboriginal Day", :regions => [:ca_nt]}], + 7 => [{:mday => 1, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Canada Day", :regions => [:ca]}, + {:mday => 12, :name => "Orangemen's Day", :regions => [:ca_nf]}, + {:mday => 9, :name => "Nunavut Day", :regions => [:ca_nu]}], 8 => [{:wday => 1, :week => 1, :name => "BC Day", :regions => [:ca_bc]}, {:wday => 1, :week => 1, :name => "Saskatchewan Day", :regions => [:ca_sk]}, {:wday => 1, :week => 1, :name => "Heritage Day", :regions => [:ca_ab]}, {:wday => 1, :week => 1, :name => "Natal Day", :regions => [:ca_ns]}, {:wday => 1, :week => 1, :name => "Civic Holiday", :regions => [:ca_on]}, {:wday => 1, :week => 3, :name => "Discovery Day", :regions => [:ca_yk]}], - 3 => [{:mday => 23, :name => "St. George's Day", :regions => [:ca_nf]}, - {:mday => 17, :type => :informal, :name => "St. Patrick's Day", :regions => [:us, :ca]}], 9 => [{:wday => 1, :week => 1, :name => "Labour Day", :regions => [:ca]}], - 4 => [{:mday => 1, :type => :informal, :name => "April Fool's Day", :regions => [:us, :ca]}, - {:mday => 22, :type => :informal, :name => "Earth Day", :regions => [:us, :ca]}], 10 => [{:wday => 1, :week => 2, :name => "Thanksgiving", :regions => [:ca]}, - {:mday => 31, :type => :informal, :name => "Halloween", :regions => [:us, :ca]}] + {:mday => 31, :type => :informal, :name => "Halloween", :regions => [:us, :ca]}], + 11 => [{:mday => 11, :name => "Remembrance Day", :regions => [:ca]}], + 12 => [{:mday => 25, :name => "Christmas Day", :regions => [:ca]}, + {:mday => 26, :name => "Boxing Day", :regions => [:ca]}], + 4 => [{:mday => 1, :type => :informal, :name => "April Fool's Day", :regions => [:us, :ca]}, + {:mday => 22, :type => :informal, :name => "Earth Day", :regions => [:us, :ca]}] } end diff --git a/lib/holidays/cz.rb b/lib/holidays/cz.rb index 3fafb01..b3a9aa6 100644 --- a/lib/holidays/cz.rb +++ b/lib/holidays/cz.rb @@ -15,18 +15,18 @@ module Holidays DEFINED_REGIONS = [:cz] HOLIDAYS_BY_MONTH = { + 0 => [{:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Velikonoční pondělí", :regions => [:cz]}], + 1 => [{:mday => 1, :name => "Den obnovy samostatného českého státu", :regions => [:cz]}], 5 => [{:mday => 1, :name => "Svátek práce", :regions => [:cz]}, {:mday => 8, :name => "Den vítězství", :regions => [:cz]}], - 0 => [{:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Velikonoční pondělí", :regions => [:cz]}], - 11 => [{:mday => 17, :name => "Den boje za svobodu a demokracii", :regions => [:cz]}], - 1 => [{:mday => 1, :name => "Den obnovy samostatného českého státu", :regions => [:cz]}], - 12 => [{:mday => 24, :name => "Štědrý den", :regions => [:cz]}, - {:mday => 25, :name => "1. svátek vánoční", :regions => [:cz]}, - {:mday => 26, :name => "2. svátek vánoční", :regions => [:cz]}], 7 => [{:mday => 5, :name => "Den slovanských věrozvěstů Cyrila a Metoděje", :regions => [:cz]}, {:mday => 6, :name => "Den upálení mistra Jana Husa", :regions => [:cz]}], 9 => [{:mday => 28, :name => "Den české státnosti", :regions => [:cz]}], - 10 => [{:mday => 28, :name => "Den vzniku samostatného československého státu", :regions => [:cz]}] + 10 => [{:mday => 28, :name => "Den vzniku samostatného československého státu", :regions => [:cz]}], + 11 => [{:mday => 17, :name => "Den boje za svobodu a demokracii", :regions => [:cz]}], + 12 => [{:mday => 24, :name => "Štědrý den", :regions => [:cz]}, + {:mday => 25, :name => "1. svátek vánoční", :regions => [:cz]}, + {:mday => 26, :name => "2. svátek vánoční", :regions => [:cz]}] } end diff --git a/lib/holidays/de.rb b/lib/holidays/de.rb index 7b6dd49..48fff2a 100644 --- a/lib/holidays/de.rb +++ b/lib/holidays/de.rb @@ -12,24 +12,24 @@ module Holidays # # More definitions are available at http://code.dunae.ca/holidays. module DE # :nodoc: - DEFINED_REGIONS = [:de, :de_bw, :de_by, :de_nw, :de_rp, :de_sl, :de_sn, :de_he, :de_st, :de_bb, :de_mv, :de_th] + DEFINED_REGIONS = [:de, :de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_st, :de_bb, :de_mv, :de_sn, :de_th] HOLIDAYS_BY_MONTH = { - 5 => [{:mday => 1, :name => "Tag der Arbeit", :regions => [:de]}], 0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Karfreitag", :regions => [:de]}, {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Ostermontag", :regions => [:de]}, {:function => lambda { |year| Holidays.easter(year)+39 }, :function_id => "easter(year)+39", :name => "Christi Himmelfahrt", :regions => [:de]}, {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "Pfingstmontag", :regions => [:de]}, {:function => lambda { |year| Holidays.easter(year)+60 }, :function_id => "easter(year)+60", :name => "Fronleichnam", :regions => [:de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl]}], - 11 => [{:mday => 1, :name => "Allerheiligen", :regions => [:de_bw, :de_by, :de_nw, :de_rp, :de_sl]}, - {:function => lambda { |year| Holidays.de_buss_und_bettag(year) }, :function_id => "de_buss_und_bettag(year)", :name => "Buß- und Bettag", :regions => [:de_sn]}], 1 => [{:mday => 1, :name => "Neujahrstag", :regions => [:de]}, {:mday => 6, :name => "Heilige Drei Könige", :regions => [:de_bw, :de_by, :de_st]}], - 12 => [{:mday => 25, :name => "1. Weihnachtstag", :regions => [:de]}, - {:mday => 26, :name => "2. Weihnachtstag", :regions => [:de]}], + 5 => [{:mday => 1, :name => "Tag der Arbeit", :regions => [:de]}], 8 => [{:mday => 15, :name => "Mariä Himmelfahrt", :regions => [:de_by, :de_sl]}], 10 => [{:mday => 3, :name => "Tag der Deutschen Einheit", :regions => [:de]}, - {:mday => 31, :name => "Reformationstag", :regions => [:de_bb, :de_mv, :de_sn, :de_st, :de_th]}] + {:mday => 31, :name => "Reformationstag", :regions => [:de_bb, :de_mv, :de_sn, :de_st, :de_th]}], + 11 => [{:mday => 1, :name => "Allerheiligen", :regions => [:de_bw, :de_by, :de_nw, :de_rp, :de_sl]}, + {:function => lambda { |year| Holidays.de_buss_und_bettag(year) }, :function_id => "de_buss_und_bettag(year)", :name => "Buß- und Bettag", :regions => [:de_sn]}], + 12 => [{:mday => 25, :name => "1. Weihnachtstag", :regions => [:de]}, + {:mday => 26, :name => "2. Weihnachtstag", :regions => [:de]}] } end diff --git a/lib/holidays/dk.rb b/lib/holidays/dk.rb index 5cbfe7a..adbf619 100644 --- a/lib/holidays/dk.rb +++ b/lib/holidays/dk.rb @@ -15,8 +15,6 @@ module Holidays DEFINED_REGIONS = [:dk] HOLIDAYS_BY_MONTH = { - 5 => [{:mday => 1, :name => "Arbejdernes kampdag", :regions => [:dk]}, - {:mday => 5, :type => :informal, :name => "Danmarks befrielse", :regions => [:dk]}], 0 => [{:function => lambda { |year| Holidays.easter(year)-49 }, :function_id => "easter(year)-49", :type => :informal, :name => "Fastelavn", :regions => [:dk]}, {:function => lambda { |year| Holidays.easter(year)-7 }, :function_id => "easter(year)-7", :name => "Palmesøndag", :regions => [:dk]}, {:function => lambda { |year| Holidays.easter(year)-3 }, :function_id => "easter(year)-3", :name => "Skærtorsdag", :regions => [:dk]}, @@ -27,18 +25,20 @@ module Holidays {:function => lambda { |year| Holidays.easter(year)+39 }, :function_id => "easter(year)+39", :name => "Kristi Himmelfartsdag", :regions => [:dk]}, {:function => lambda { |year| Holidays.easter(year)+49 }, :function_id => "easter(year)+49", :name => "Pinsedag", :regions => [:dk]}, {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "2. Pinsedag", :regions => [:dk]}], - 11 => [{:mday => 10, :type => :informal, :name => "Mortensaften", :regions => [:dk]}], + 1 => [{:mday => 1, :name => "Nytårsdag", :regions => [:dk]}], + 4 => [{:mday => 1, :type => :informal, :name => "1. april", :regions => [:dk]}, + {:mday => 9, :type => :informal, :name => "Danmarks besættelse", :regions => [:dk]}, + {:mday => 16, :type => :informal, :name => "Dronningens fødselsdag", :regions => [:dk]}], + 5 => [{:mday => 1, :name => "Arbejdernes kampdag", :regions => [:dk]}, + {:mday => 5, :type => :informal, :name => "Danmarks befrielse", :regions => [:dk]}], 6 => [{:mday => 5, :name => "Grundlovsdag", :regions => [:dk]}, {:mday => 15, :type => :informal, :name => "Valdemarsdag og Genforeningsdag", :regions => [:dk]}, {:mday => 23, :type => :informal, :name => "Sankt Hans aften", :regions => [:dk]}], - 1 => [{:mday => 1, :name => "Nytårsdag", :regions => [:dk]}], + 11 => [{:mday => 10, :type => :informal, :name => "Mortensaften", :regions => [:dk]}], 12 => [{:mday => 13, :type => :informal, :name => "Sankt Lucia", :regions => [:dk]}, {:mday => 24, :name => "Juleaftensdag", :regions => [:dk]}, {:mday => 25, :name => "1. juledag", :regions => [:dk]}, - {:mday => 26, :name => "2. juledag", :regions => [:dk]}], - 4 => [{:mday => 1, :type => :informal, :name => "1. april", :regions => [:dk]}, - {:mday => 9, :type => :informal, :name => "Danmarks besættelse", :regions => [:dk]}, - {:mday => 16, :type => :informal, :name => "Dronningens fødselsdag", :regions => [:dk]}] + {:mday => 26, :name => "2. juledag", :regions => [:dk]}] } end diff --git a/lib/holidays/el.rb b/lib/holidays/el.rb index c72bc3b..6d60c61 100644 --- a/lib/holidays/el.rb +++ b/lib/holidays/el.rb @@ -15,7 +15,6 @@ module Holidays DEFINED_REGIONS = [:el] HOLIDAYS_BY_MONTH = { - 5 => [{:mday => 1, :name => "Πρωτομαγιά", :regions => [:el]}], 0 => [{:function => lambda { |year| Holidays.orthodox_easter(year)-2 }, :function_id => "orthodox_easter(year)-2", :name => "Μεγάλη Παρασκευή", :regions => [:el]}, {:function => lambda { |year| Holidays.orthodox_easter(year)-1 }, :function_id => "orthodox_easter(year)-1", :name => "Μεγάλο Σάββατο", :regions => [:el]}, {:function => lambda { |year| Holidays.orthodox_easter(year) }, :function_id => "orthodox_easter(year)", :name => "Κυριακή του Πάσχα", :regions => [:el]}, @@ -24,11 +23,12 @@ module Holidays {:function => lambda { |year| Holidays.orthodox_easter(year)+50 }, :function_id => "orthodox_easter(year)+50", :name => "Αγίου Πνεύματος", :regions => [:el]}], 1 => [{:mday => 1, :name => "Πρωτοχρονιά", :regions => [:el]}, {:mday => 6, :name => "Θεοφάνεια", :regions => [:el]}], - 12 => [{:mday => 25, :name => "Χριστούγεννα", :regions => [:el]}, - {:mday => 26, :name => "Δεύτερη ημέρα των Χριστουγέννων", :regions => [:el]}], - 8 => [{:mday => 15, :name => "Κοίμηση της Θεοτόκου", :regions => [:el]}], 3 => [{:mday => 25, :name => "Επέτειος της Επανάστασης του 1821", :regions => [:el]}], - 10 => [{:mday => 28, :name => "Επέτειος του Όχι", :regions => [:el]}] + 5 => [{:mday => 1, :name => "Πρωτομαγιά", :regions => [:el]}], + 8 => [{:mday => 15, :name => "Κοίμηση της Θεοτόκου", :regions => [:el]}], + 10 => [{:mday => 28, :name => "Επέτειος του Όχι", :regions => [:el]}], + 12 => [{:mday => 25, :name => "Χριστούγεννα", :regions => [:el]}, + {:mday => 26, :name => "Δεύτερη ημέρα των Χριστουγέννων", :regions => [:el]}] } end diff --git a/lib/holidays/es.rb b/lib/holidays/es.rb index 9173229..96bd4ef 100644 --- a/lib/holidays/es.rb +++ b/lib/holidays/es.rb @@ -12,38 +12,38 @@ module Holidays # # More definitions are available at http://code.dunae.ca/holidays. module ES # :nodoc: - DEFINED_REGIONS = [:es, :es_m, :es_cn, :es_cm, :es_pv, :es_ct, :es_na, :es_v, :es_vc, :es_mu, :es_lo, :es_ib, :es_ga, :es_an, :es_ce, :es_o, :es_ex, :es_ar, :es_cl] + DEFINED_REGIONS = [:es_pv, :es_ct, :es_na, :es_v, :es_vc, :es, :es_an, :es_ib, :es_cm, :es_mu, :es_m, :es_ar, :es_cl, :es_cn, :es_lo, :es_ga, :es_ce, :es_o, :es_ex] HOLIDAYS_BY_MONTH = { + 0 => [{:function => lambda { |year| Holidays.easter(year)-3 }, :function_id => "easter(year)-3", :name => "Jueves Santo", :regions => [:es_pv, :es_ct, :es_na, :es_v, :es_vc]}, + {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Viernes Santo", :regions => [:es]}, + {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Lunes de Pascua", :regions => [:es_pv, :es_ct, :es_na, :es_v, :es_vc]}], + 1 => [{:mday => 1, :name => "Año Nuevo", :regions => [:es]}, + {:mday => 6, :name => "Día de Reyes", :regions => [:es]}], + 2 => [{:mday => 28, :name => "Día de Andalucía", :regions => [:es_an]}], + 3 => [{:mday => 1, :name => "Día de las Islas Baleares", :regions => [:es_ib]}, + {:mday => 19, :name => "San José", :regions => [:es_v, :es_vc, :es_cm, :es_mu, :es_m]}], + 4 => [{:mday => 23, :name => "San Jorge", :regions => [:es_ar, :es_cl]}, + {:mday => 23, :name => "Día de Aragón", :regions => [:es_ar]}], 5 => [{:mday => 1, :name => "Día del Trabajador", :regions => [:es]}, {:mday => 2, :name => "Fiesta de la Comunidad", :regions => [:es_m]}, {:mday => 30, :name => "Día de las Canarias", :regions => [:es_cn]}, {:mday => 31, :name => "Día de la Región Castilla-La Mancha", :regions => [:es_cm]}], - 0 => [{:function => lambda { |year| Holidays.easter(year)-3 }, :function_id => "easter(year)-3", :name => "Jueves Santo", :regions => [:es_pv, :es_ct, :es_na, :es_v, :es_vc]}, - {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Viernes Santo", :regions => [:es]}, - {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Lunes de Pascua", :regions => [:es_pv, :es_ct, :es_na, :es_v, :es_vc]}], - 11 => [{:mday => 1, :name => "Todos los Santos", :regions => [:es]}], 6 => [{:mday => 9, :name => "Día de la Región de Murcia", :regions => [:es_mu]}, {:mday => 9, :name => "Día de La Rioja", :regions => [:es_lo]}], - 1 => [{:mday => 1, :name => "Año Nuevo", :regions => [:es]}, - {:mday => 6, :name => "Día de Reyes", :regions => [:es]}], - 12 => [{:mday => 6, :name => "Día de la Constitución", :regions => [:es]}, - {:mday => 8, :name => "Inmaculada Concepción", :regions => [:es]}, - {:mday => 25, :name => "Navidad del Señor", :regions => [:es]}, - {:mday => 26, :name => "San Esteban", :regions => [:es_ib, :es_ct]}], 7 => [{:mday => 23, :name => "Santiago Apostol", :regions => [:es_ga]}], - 2 => [{:mday => 28, :name => "Día de Andalucía", :regions => [:es_an]}], 8 => [{:mday => 15, :name => "Asunción", :regions => [:es]}], - 3 => [{:mday => 1, :name => "Día de las Islas Baleares", :regions => [:es_ib]}, - {:mday => 19, :name => "San José", :regions => [:es_v, :es_vc, :es_cm, :es_mu, :es_m]}], 9 => [{:mday => 2, :name => "Día de Ceuta", :regions => [:es_ce]}, {:mday => 8, :name => "Día de Asturias", :regions => [:es_o]}, {:mday => 8, :name => "Día de Extremadura", :regions => [:es_ex]}, {:mday => 11, :name => "Fiesta Nacional de Cataluña", :regions => [:es_ct]}], - 4 => [{:mday => 23, :name => "San Jorge", :regions => [:es_ar, :es_cl]}, - {:mday => 23, :name => "Día de Aragón", :regions => [:es_ar]}], 10 => [{:mday => 9, :name => "Día de Valencia", :regions => [:es_vc, :es_v]}, - {:mday => 12, :name => "Día de la Hispanidad", :regions => [:es]}] + {:mday => 12, :name => "Día de la Hispanidad", :regions => [:es]}], + 11 => [{:mday => 1, :name => "Todos los Santos", :regions => [:es]}], + 12 => [{:mday => 6, :name => "Día de la Constitución", :regions => [:es]}, + {:mday => 8, :name => "Inmaculada Concepción", :regions => [:es]}, + {:mday => 25, :name => "Navidad del Señor", :regions => [:es]}, + {:mday => 26, :name => "San Esteban", :regions => [:es_ib, :es_ct]}] } end diff --git a/lib/holidays/fi.rb b/lib/holidays/fi.rb index 3c20fb8..6de4d50 100644 --- a/lib/holidays/fi.rb +++ b/lib/holidays/fi.rb @@ -15,16 +15,16 @@ module Holidays DEFINED_REGIONS = [:fi] HOLIDAYS_BY_MONTH = { - 5 => [{:mday => 1, :name => "Vappu", :regions => [:fi]}], 0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Pitkäperjantai", :regions => [:fi]}, {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Pääsiäispäivä", :regions => [:fi]}, {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "2. Pääsiäispäivä", :regions => [:fi]}, {:function => lambda { |year| Holidays.easter(year)+39 }, :function_id => "easter(year)+39", :name => "Helatorstai", :regions => [:fi]}, {:function => lambda { |year| Holidays.easter(year)+49 }, :function_id => "easter(year)+49", :name => "Helluntaipäivä", :regions => [:fi]}, {:function => lambda { |year| Holidays.fi_pyhainpaiva(year) }, :function_id => "fi_pyhainpaiva(year)", :name => "Pyhäinpäivä", :regions => [:fi]}], - 6 => [{:function => lambda { |year| Holidays.fi_juhannuspaiva(year) }, :function_id => "fi_juhannuspaiva(year)", :name => "Juhannuspäivä", :regions => [:fi]}], 1 => [{:mday => 1, :name => "Uudenvuodenpäivä", :regions => [:fi]}, {:mday => 6, :name => "Loppiainen", :regions => [:fi]}], + 5 => [{:mday => 1, :name => "Vappu", :regions => [:fi]}], + 6 => [{:function => lambda { |year| Holidays.fi_juhannuspaiva(year) }, :function_id => "fi_juhannuspaiva(year)", :name => "Juhannuspäivä", :regions => [:fi]}], 12 => [{:mday => 6, :name => "Itsenäisyyspäivä", :regions => [:fi]}, {:mday => 24, :name => "Jouluaatto", :regions => [:fi]}, {:mday => 25, :name => "Joulupäivä", :regions => [:fi]}, @@ -32,14 +32,6 @@ module Holidays } end -# Finland: All Saint's Day (Saturday between Oct 31 and Nov 6) -def self.fi_pyhainpaiva(year) - date = Date.civil(year,10,31) - date += (6 - date.wday) - date -end - - # Finland: Mid-summer (Saturday between June 20–26) def self.fi_juhannuspaiva(year) date = Date.civil(year,6,20) @@ -48,6 +40,14 @@ def self.fi_juhannuspaiva(year) end +# Finland: All Saint's Day (Saturday between Oct 31 and Nov 6) +def self.fi_pyhainpaiva(year) + date = Date.civil(year,10,31) + date += (6 - date.wday) + date +end + + end diff --git a/lib/holidays/fr.rb b/lib/holidays/fr.rb index f0ea9b8..f9b6021 100644 --- a/lib/holidays/fr.rb +++ b/lib/holidays/fr.rb @@ -15,19 +15,19 @@ module Holidays DEFINED_REGIONS = [:fr] HOLIDAYS_BY_MONTH = { - 5 => [{:mday => 1, :name => "Fête du travail", :regions => [:fr]}, - {:mday => 8, :name => "Victoire 1945", :regions => [:fr]}], 0 => [{:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Pâques", :regions => [:fr]}, {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Lundi de Pâques", :regions => [:fr]}, {:function => lambda { |year| Holidays.easter(year)+39 }, :function_id => "easter(year)+39", :name => "Ascension", :regions => [:fr]}, {:function => lambda { |year| Holidays.easter(year)+49 }, :function_id => "easter(year)+49", :name => "Pentecôte", :regions => [:fr]}, {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "Lundi de Pentecôte", :regions => [:fr]}], + 1 => [{:mday => 1, :name => "Jour de l'an", :regions => [:fr]}], + 5 => [{:mday => 1, :name => "Fête du travail", :regions => [:fr]}, + {:mday => 8, :name => "Victoire 1945", :regions => [:fr]}], + 7 => [{:mday => 14, :name => "Fête nationale", :regions => [:fr]}], + 8 => [{:mday => 15, :name => "Assomption", :regions => [:fr]}], 11 => [{:mday => 1, :name => "Toussaint", :regions => [:fr]}, {:mday => 11, :name => "Armistice 1918", :regions => [:fr]}], - 1 => [{:mday => 1, :name => "Jour de l'an", :regions => [:fr]}], - 12 => [{:mday => 25, :name => "Nöel", :regions => [:fr]}], - 7 => [{:mday => 14, :name => "Fête nationale", :regions => [:fr]}], - 8 => [{:mday => 15, :name => "Assomption", :regions => [:fr]}] + 12 => [{:mday => 25, :name => "Nöel", :regions => [:fr]}] } end diff --git a/lib/holidays/gb.rb b/lib/holidays/gb.rb index d8b541c..a7ee40c 100644 --- a/lib/holidays/gb.rb +++ b/lib/holidays/gb.rb @@ -12,26 +12,26 @@ module Holidays # # More definitions are available at http://code.dunae.ca/holidays. module GB # :nodoc: - DEFINED_REGIONS = [:gb, :je, :gb_jsy, :gg, :gb_gsy, :gb_eng, :gb_wls, :gb_eaw, :gb_nir, :gb_sct, :im, :gb_iom, :gb_con] + DEFINED_REGIONS = [:gb, :gb_eng, :gb_wls, :gb_eaw, :gb_nir, :gb_sct, :gb_con, :je, :gb_jsy, :gg, :gb_gsy, :im, :gb_iom] HOLIDAYS_BY_MONTH = { - 5 => [{:wday => 1, :week => 1, :name => "May Day", :regions => [:gb]}, - {:mday => 9, :name => "Liberation Day", :regions => [:je, :gb_jsy, :gg, :gb_gsy]}, - {:wday => 1, :week => -1, :name => "Bank Holiday", :regions => [:gb]}], 0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Good Friday", :regions => [:gb]}, {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Easter Sunday", :regions => [:gb]}, {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Easter Monday", :regions => [:gb_eng, :gb_wls, :gb_eaw, :gb_nir]}], - 11 => [{:mday => 5, :type => :informal, :name => "Guy Fawkes Day", :regions => [:gb]}], 1 => [{:mday => 1, :name => "New Year's Day", :regions => [:gb]}, {:mday => 2, :name => "New Year's", :regions => [:gb_sct]}], - 12 => [{:mday => 25, :observed => lambda { |date| Holidays.to_monday_if_weekend(date) }, :observed_id => "to_monday_if_weekend", :name => "Christmas Day", :regions => [:gb]}, - {:mday => 26, :observed => lambda { |date| Holidays.to_weekday_if_boxing_weekend(date) }, :observed_id => "to_weekday_if_boxing_weekend", :name => "Boxing Day", :regions => [:gb]}], + 3 => [{:mday => 5, :name => "St. Piran's Day", :regions => [:gb_con]}, + {:mday => 17, :name => "St. Patrick's Day", :regions => [:gb_nir]}], + 5 => [{:wday => 1, :week => 1, :name => "May Day", :regions => [:gb]}, + {:mday => 9, :name => "Liberation Day", :regions => [:je, :gb_jsy, :gg, :gb_gsy]}, + {:wday => 1, :week => -1, :name => "Bank Holiday", :regions => [:gb]}], 7 => [{:mday => 5, :name => "Tynwald Day", :regions => [:im, :gb_iom]}, {:mday => 12, :name => "Battle of the Boyne", :regions => [:gb_nir]}], 8 => [{:wday => 1, :week => 1, :name => "Bank Holiday", :regions => [:gb_sct]}, {:wday => 1, :week => -1, :name => "Bank Holiday", :regions => [:gb_eng, :gb_wls, :gb_eaw, :gb_nir]}], - 3 => [{:mday => 5, :name => "St. Piran's Day", :regions => [:gb_con]}, - {:mday => 17, :name => "St. Patrick's Day", :regions => [:gb_nir]}] + 11 => [{:mday => 5, :type => :informal, :name => "Guy Fawkes Day", :regions => [:gb]}], + 12 => [{:mday => 25, :observed => lambda { |date| Holidays.to_monday_if_weekend(date) }, :observed_id => "to_monday_if_weekend", :name => "Christmas Day", :regions => [:gb]}, + {:mday => 26, :observed => lambda { |date| Holidays.to_weekday_if_boxing_weekend(date) }, :observed_id => "to_weekday_if_boxing_weekend", :name => "Boxing Day", :regions => [:gb]}] } end diff --git a/lib/holidays/ie.rb b/lib/holidays/ie.rb index cc3f59f..ea1042b 100644 --- a/lib/holidays/ie.rb +++ b/lib/holidays/ie.rb @@ -15,15 +15,15 @@ module Holidays DEFINED_REGIONS = [:ie] HOLIDAYS_BY_MONTH = { - 5 => [{:wday => 1, :week => 1, :name => "May Day", :regions => [:ie]}], 0 => [{:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Easter Monday", :regions => [:ie]}], - 6 => [{:wday => 1, :week => 1, :name => "Bank Holiday", :regions => [:ie]}], 1 => [{:mday => 1, :name => "New Year's Day", :regions => [:ie]}], - 12 => [{:mday => 25, :name => "Christmas Day", :regions => [:ie]}, - {:mday => 26, :name => "St. Stephen's Day", :regions => [:ie]}], - 8 => [{:wday => 1, :week => 1, :name => "Bank Holiday", :regions => [:ie]}], 3 => [{:mday => 17, :name => "St. Patrick's Day", :regions => [:ie]}], - 10 => [{:wday => 1, :week => -1, :name => "Bank Holiday", :regions => [:ie]}] + 5 => [{:wday => 1, :week => 1, :name => "May Day", :regions => [:ie]}], + 6 => [{:wday => 1, :week => 1, :name => "Bank Holiday", :regions => [:ie]}], + 8 => [{:wday => 1, :week => 1, :name => "Bank Holiday", :regions => [:ie]}], + 10 => [{:wday => 1, :week => -1, :name => "Bank Holiday", :regions => [:ie]}], + 12 => [{:mday => 25, :name => "Christmas Day", :regions => [:ie]}, + {:mday => 26, :name => "St. Stephen's Day", :regions => [:ie]}] } end diff --git a/lib/holidays/is.rb b/lib/holidays/is.rb index 58ea459..b293b98 100644 --- a/lib/holidays/is.rb +++ b/lib/holidays/is.rb @@ -15,8 +15,6 @@ module Holidays DEFINED_REGIONS = [:is] HOLIDAYS_BY_MONTH = { - 5 => [{:mday => 1, :name => "Verkalýðsdagurinn", :regions => [:is]}, - {:mday => 13, :name => "Mæðradagurinn", :regions => [:is]}], 0 => [{:function => lambda { |year| Holidays.easter(year)-48 }, :function_id => "easter(year)-48", :name => "Bolludagur", :regions => [:is]}, {:function => lambda { |year| Holidays.easter(year)-47 }, :function_id => "easter(year)-47", :name => "Sprengidagur", :regions => [:is]}, {:function => lambda { |year| Holidays.easter(year)-46 }, :function_id => "easter(year)-46", :name => "Öskudagur", :regions => [:is]}, @@ -28,19 +26,21 @@ module Holidays {:function => lambda { |year| Holidays.easter(year)+39 }, :function_id => "easter(year)+39", :name => "Uppstigningardagur", :regions => [:is]}, {:function => lambda { |year| Holidays.easter(year)+49 }, :function_id => "easter(year)+49", :name => "Hvítasunnudagur", :regions => [:is]}, {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "Annar í hvítasunnu", :regions => [:is]}], - 11 => [{:mday => 16, :name => "Dagur íslenskrar tungu", :regions => [:is]}], - 6 => [{:mday => 3, :type => :informal, :name => "Sjómannadagurinn", :regions => [:is]}, - {:mday => 17, :name => "Lýðveldisdagurinn", :regions => [:is]}], 1 => [{:mday => 1, :name => "Nýársdagur", :regions => [:is]}, {:mday => 6, :name => "Þrettándinn", :regions => [:is]}, {:mday => 19, :type => :informal, :name => "Bóndadagur", :regions => [:is]}], + 2 => [{:mday => 18, :type => :informal, :name => "Konudagur", :regions => [:is]}], + 4 => [{:function => lambda { |year| Holidays.is_sumardagurinn_fyrsti(year) }, :function_id => "is_sumardagurinn_fyrsti(year)", :name => "Sumardagurinn fyrsti", :regions => [:is]}], + 5 => [{:mday => 1, :name => "Verkalýðsdagurinn", :regions => [:is]}, + {:mday => 13, :name => "Mæðradagurinn", :regions => [:is]}], + 6 => [{:mday => 3, :type => :informal, :name => "Sjómannadagurinn", :regions => [:is]}, + {:mday => 17, :name => "Lýðveldisdagurinn", :regions => [:is]}], + 8 => [{:wday => 1, :week => 1, :name => "Frídagur verslunarmanna", :regions => [:is]}], + 11 => [{:mday => 16, :name => "Dagur íslenskrar tungu", :regions => [:is]}], 12 => [{:mday => 24, :name => "Jól", :regions => [:is]}, {:mday => 25, :name => "Jól", :regions => [:is]}, {:mday => 26, :name => "Jól", :regions => [:is]}, - {:mday => 31, :name => "Gamlárskvöld", :regions => [:is]}], - 2 => [{:mday => 18, :type => :informal, :name => "Konudagur", :regions => [:is]}], - 8 => [{:wday => 1, :week => 1, :name => "Frídagur verslunarmanna", :regions => [:is]}], - 4 => [{:function => lambda { |year| Holidays.is_sumardagurinn_fyrsti(year) }, :function_id => "is_sumardagurinn_fyrsti(year)", :name => "Sumardagurinn fyrsti", :regions => [:is]}] + {:mday => 31, :name => "Gamlárskvöld", :regions => [:is]}] } end diff --git a/lib/holidays/it.rb b/lib/holidays/it.rb index 8467779..3a86338 100644 --- a/lib/holidays/it.rb +++ b/lib/holidays/it.rb @@ -15,18 +15,18 @@ module Holidays DEFINED_REGIONS = [:it] HOLIDAYS_BY_MONTH = { - 5 => [{:mday => 1, :name => "Festa dei Lavoratori", :regions => [:it]}], 0 => [{:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Pasqua", :regions => [:it]}, {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Lunedì dell'Angelo", :regions => [:it]}], - 11 => [{:mday => 1, :name => "Ognissanti", :regions => [:it]}], - 6 => [{:mday => 2, :name => "Festa della Repubblica", :regions => [:it]}], 1 => [{:mday => 1, :name => "Capodanno", :regions => [:it]}, {:mday => 6, :name => "Epifania", :regions => [:it]}], + 4 => [{:mday => 25, :name => "Festa della Liberazione", :regions => [:it]}], + 5 => [{:mday => 1, :name => "Festa dei Lavoratori", :regions => [:it]}], + 6 => [{:mday => 2, :name => "Festa della Repubblica", :regions => [:it]}], + 8 => [{:mday => 15, :name => "Assunzione", :regions => [:it]}], + 11 => [{:mday => 1, :name => "Ognissanti", :regions => [:it]}], 12 => [{:mday => 8, :name => "Immacolata Concezione", :regions => [:it]}, {:mday => 25, :name => "Natale", :regions => [:it]}, - {:mday => 26, :name => "Santo Stefano", :regions => [:it]}], - 8 => [{:mday => 15, :name => "Assunzione", :regions => [:it]}], - 4 => [{:mday => 25, :name => "Festa della Liberazione", :regions => [:it]}] + {:mday => 26, :name => "Santo Stefano", :regions => [:it]}] } end diff --git a/lib/holidays/jp.rb b/lib/holidays/jp.rb index 52dde44..517e9d6 100644 --- a/lib/holidays/jp.rb +++ b/lib/holidays/jp.rb @@ -15,45 +15,54 @@ module Holidays DEFINED_REGIONS = [:jp] HOLIDAYS_BY_MONTH = { + 1 => [{:mday => 1, :name => "元日", :regions => [:jp]}, + {:wday => 1, :week => 2, :name => "成人の日", :regions => [:jp]}], + 2 => [{:mday => 11, :name => "建国記念日", :regions => [:jp]}, + {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 2, 11) }, :function_id => "jp_substitute_holiday(year, 2, 11)", :name => "振替休日", :regions => [:jp]}], + 3 => [{:function => lambda { |year| Holidays.jp_vernal_equinox_day(year) }, :function_id => "jp_vernal_equinox_day(year)", :name => "春分の日", :regions => [:jp]}, + {:function => lambda { |year| Holidays.jp_substitute_holiday(Holidays.jp_vernal_equinox_day(year)) }, :function_id => "jp_substitute_holiday(Holidays.jp_vernal_equinox_day(year))", :name => "振替休日", :regions => [:jp]}], + 4 => [{:mday => 29, :name => "昭和の日", :regions => [:jp]}, + {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 4, 29) }, :function_id => "jp_substitute_holiday(year, 4, 29)", :name => "振替休日", :regions => [:jp]}], 5 => [{:mday => 3, :name => "憲法記念日", :regions => [:jp]}, {:mday => 4, :name => "みどりの日", :regions => [:jp]}, {:mday => 5, :name => "こどもの日", :regions => [:jp]}, {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 5, 3) }, :function_id => "jp_substitute_holiday(year, 5, 3)", :name => "振替休日", :regions => [:jp]}, {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 5, 5) }, :function_id => "jp_substitute_holiday(year, 5, 5)", :name => "振替休日", :regions => [:jp]}], - 11 => [{:mday => 3, :name => "文化の日", :regions => [:jp]}, - {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 11, 3) }, :function_id => "jp_substitute_holiday(year, 11, 3)", :name => "振替休日", :regions => [:jp]}, - {:mday => 23, :name => "勤労感謝の日", :regions => [:jp]}, - {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 11, 23) }, :function_id => "jp_substitute_holiday(year, 11, 23)", :name => "振替休日", :regions => [:jp]}], - 1 => [{:mday => 1, :name => "元日", :regions => [:jp]}, - {:wday => 1, :week => 2, :name => "成人の日", :regions => [:jp]}], - 12 => [{:mday => 23, :name => "天皇誕生日", :regions => [:jp]}, - {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 12, 23) }, :function_id => "jp_substitute_holiday(year, 12, 23)", :name => "振替休日", :regions => [:jp]}], 7 => [{:wday => 1, :week => 3, :name => "海の日", :regions => [:jp]}, {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 7, Date.calculate_mday(year, 7, 3, 1)) }, :function_id => "jp_substitute_holiday(year, 7, Date.calculate_mday(year, 7, 3, 1))", :name => "振替休日", :regions => [:jp]}], - 2 => [{:mday => 11, :name => "建国記念日", :regions => [:jp]}, - {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 2, 11) }, :function_id => "jp_substitute_holiday(year, 2, 11)", :name => "振替休日", :regions => [:jp]}], - 3 => [{:function => lambda { |year| Holidays.jp_vernal_equinox_day(year) }, :function_id => "jp_vernal_equinox_day(year)", :name => "春分の日", :regions => [:jp]}, - {:function => lambda { |year| Holidays.jp_substitute_holiday(Holidays.jp_vernal_equinox_day(year)) }, :function_id => "jp_substitute_holiday(Holidays.jp_vernal_equinox_day(year))", :name => "振替休日", :regions => [:jp]}], 9 => [{:wday => 1, :week => 3, :name => "敬老の日", :regions => [:jp]}, {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 9, Date.calculate_mday(year, 9, 3, 1)) }, :function_id => "jp_substitute_holiday(year, 9, Date.calculate_mday(year, 9, 3, 1))", :name => "振替休日", :regions => [:jp]}, {:function => lambda { |year| Holidays.jp_citizons_holiday(year) }, :function_id => "jp_citizons_holiday(year)", :name => "国民の休日", :regions => [:jp]}, {:function => lambda { |year| Holidays.jp_national_culture_day(year) }, :function_id => "jp_national_culture_day(year)", :name => "秋分の日", :regions => [:jp]}, {:function => lambda { |year| Holidays.jp_substitute_holiday(Holidays.jp_national_culture_day(year)) }, :function_id => "jp_substitute_holiday(Holidays.jp_national_culture_day(year))", :name => "振替休日", :regions => [:jp]}], - 4 => [{:mday => 29, :name => "昭和の日", :regions => [:jp]}, - {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 4, 29) }, :function_id => "jp_substitute_holiday(year, 4, 29)", :name => "振替休日", :regions => [:jp]}], 10 => [{:wday => 1, :week => 2, :name => "体育の日", :regions => [:jp]}, - {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 10, Date.calculate_mday(year, 10, 2, 1)) }, :function_id => "jp_substitute_holiday(year, 10, Date.calculate_mday(year, 10, 2, 1))", :name => "振替休日", :regions => [:jp]}] + {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 10, Date.calculate_mday(year, 10, 2, 1)) }, :function_id => "jp_substitute_holiday(year, 10, Date.calculate_mday(year, 10, 2, 1))", :name => "振替休日", :regions => [:jp]}], + 11 => [{:mday => 3, :name => "文化の日", :regions => [:jp]}, + {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 11, 3) }, :function_id => "jp_substitute_holiday(year, 11, 3)", :name => "振替休日", :regions => [:jp]}, + {:mday => 23, :name => "勤労感謝の日", :regions => [:jp]}, + {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 11, 23) }, :function_id => "jp_substitute_holiday(year, 11, 23)", :name => "振替休日", :regions => [:jp]}], + 12 => [{:mday => 23, :name => "天皇誕生日", :regions => [:jp]}, + {:function => lambda { |year| Holidays.jp_substitute_holiday(year, 12, 23) }, :function_id => "jp_substitute_holiday(year, 12, 23)", :name => "振替休日", :regions => [:jp]}] } end -def self.jp_citizons_holiday(year) - year < 2003 and return nil - ncd = Holidays.jp_national_culture_day(year) - if ncd.wday == 3 - ncd - 1 - else - nil - end +def self.jp_vernal_equinox_day(year) + day = + case year + when 1851..1899 + 19.8277 + when 1900..1979 + 20.8357 + when 1980..2099 + 20.8431 + when 2100..2150 + 21.8510 + else + raise IndexError.new("Out of range") + end + day += 0.242194 * (year - 1980) - ((year - 1980)/4).floor + day = day.floor + Date.civil(year, 3, day) end @@ -77,29 +86,20 @@ def self.jp_national_culture_day(year) end -def self.jp_substitute_holiday(*date) - date = date[0].kind_of?(Date) ? date.first : Date.civil(*date) - date.wday == 0 ? date+1 : nil +def self.jp_citizons_holiday(year) + year < 2003 and return nil + ncd = Holidays.jp_national_culture_day(year) + if ncd.wday == 3 + ncd - 1 + else + nil + end end -def self.jp_vernal_equinox_day(year) - day = - case year - when 1851..1899 - 19.8277 - when 1900..1979 - 20.8357 - when 1980..2099 - 20.8431 - when 2100..2150 - 21.8510 - else - raise IndexError.new("Out of range") - end - day += 0.242194 * (year - 1980) - ((year - 1980)/4).floor - day = day.floor - Date.civil(year, 3, day) +def self.jp_substitute_holiday(*date) + date = date[0].kind_of?(Date) ? date.first : Date.civil(*date) + date.wday == 0 ? date+1 : nil end diff --git a/lib/holidays/mx.rb b/lib/holidays/mx.rb index 8960fe7..001e511 100644 --- a/lib/holidays/mx.rb +++ b/lib/holidays/mx.rb @@ -15,34 +15,34 @@ module Holidays DEFINED_REGIONS = [:mx, :mx_pue, :us, :ca] HOLIDAYS_BY_MONTH = { + 1 => [{:mday => 1, :name => "Año nuevo", :regions => [:mx]}, + {:mday => 6, :name => "Dia de los Santos Reyes", :regions => [:mx]}], + 2 => [{:wday => 1, :week => 1, :name => "Día de la Constitución", :regions => [:mx]}, + {:mday => 2, :type => :informal, :name => "Groundhog Day", :regions => [:us, :ca]}, + {:mday => 14, :type => :informal, :name => "Valentine's Day", :regions => [:us, :ca]}], + 3 => [{:wday => 1, :week => 3, :name => "Natalicio de Benito Juárez", :regions => [:mx]}, + {:mday => 17, :type => :informal, :name => "St. Patrick's Day", :regions => [:us, :ca]}], + 4 => [{:mday => 30, :type => :informal, :name => "Día del Niño", :regions => [:mx]}, + {:mday => 1, :type => :informal, :name => "April Fool's Day", :regions => [:us, :ca]}, + {:mday => 22, :type => :informal, :name => "Earth Day", :regions => [:us, :ca]}], 5 => [{:mday => 1, :name => "Día del Trabajo", :regions => [:mx]}, {:mday => 5, :type => :informal, :name => "Cinco de Mayo", :regions => [:mx]}, {:mday => 5, :name => "La Batalla de Puebla", :regions => [:mx_pue]}, {:mday => 10, :type => :informal, :name => "Día de la Madre", :regions => [:mx]}, {:mday => 15, :type => :informal, :name => "Día del Maestro", :regions => [:mx]}, {:wday => 0, :week => 3, :type => :informal, :name => "Father's Day", :regions => [:us, :ca]}], + 6 => [{:wday => 0, :week => 3, :type => :informal, :name => "Día del Padre", :regions => [:mx]}], + 9 => [{:mday => 15, :name => "Grito de Dolores", :regions => [:mx]}, + {:mday => 16, :name => "Día de la Independencia", :regions => [:mx]}], + 10 => [{:mday => 12, :type => :informal, :name => "Día de la Raza", :regions => [:mx]}, + {:mday => 31, :type => :informal, :name => "Halloween", :regions => [:us, :ca]}], 11 => [{:mday => 1, :type => :informal, :name => "Todos los Santos", :regions => [:mx]}, {:mday => 2, :type => :informal, :name => "Los Fieles Difuntos", :regions => [:mx]}, {:wday => 1, :week => 3, :name => "Día de la Revolución", :regions => [:mx]}], - 6 => [{:wday => 0, :week => 3, :type => :informal, :name => "Día del Padre", :regions => [:mx]}], - 1 => [{:mday => 1, :name => "Año nuevo", :regions => [:mx]}, - {:mday => 6, :name => "Dia de los Santos Reyes", :regions => [:mx]}], 12 => [{:mday => 12, :type => :informal, :name => "Día de la Virgen de Guadalupe", :regions => [:mx]}, {:mday => 24, :type => :informal, :name => "Nochebuena", :regions => [:mx]}, {:mday => 25, :name => "Navidad", :regions => [:mx]}, - {:mday => 28, :name => "Los Santos Inocentes", :regions => [:mx]}], - 2 => [{:wday => 1, :week => 1, :name => "Día de la Constitución", :regions => [:mx]}, - {:mday => 2, :type => :informal, :name => "Groundhog Day", :regions => [:us, :ca]}, - {:mday => 14, :type => :informal, :name => "Valentine's Day", :regions => [:us, :ca]}], - 3 => [{:wday => 1, :week => 3, :name => "Natalicio de Benito Juárez", :regions => [:mx]}, - {:mday => 17, :type => :informal, :name => "St. Patrick's Day", :regions => [:us, :ca]}], - 9 => [{:mday => 15, :name => "Grito de Dolores", :regions => [:mx]}, - {:mday => 16, :name => "Día de la Independencia", :regions => [:mx]}], - 4 => [{:mday => 30, :type => :informal, :name => "Día del Niño", :regions => [:mx]}, - {:mday => 1, :type => :informal, :name => "April Fool's Day", :regions => [:us, :ca]}, - {:mday => 22, :type => :informal, :name => "Earth Day", :regions => [:us, :ca]}], - 10 => [{:mday => 12, :type => :informal, :name => "Día de la Raza", :regions => [:mx]}, - {:mday => 31, :type => :informal, :name => "Halloween", :regions => [:us, :ca]}] + {:mday => 28, :name => "Los Santos Inocentes", :regions => [:mx]}] } end diff --git a/lib/holidays/nl.rb b/lib/holidays/nl.rb index 130bcc0..831c285 100644 --- a/lib/holidays/nl.rb +++ b/lib/holidays/nl.rb @@ -15,8 +15,6 @@ module Holidays DEFINED_REGIONS = [:nl] HOLIDAYS_BY_MONTH = { - 5 => [{:mday => 4, :name => "Dodenherdenking", :regions => [:nl]}, - {:mday => 5, :name => "Bevrijdingsdag", :regions => [:nl]}], 0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Goede Vrijdag", :regions => [:nl]}, {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Pasen", :regions => [:nl]}, {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Pasen", :regions => [:nl]}, @@ -24,10 +22,12 @@ module Holidays {:function => lambda { |year| Holidays.easter(year)+49 }, :function_id => "easter(year)+49", :name => "Pinksteren", :regions => [:nl]}, {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "Pinksteren", :regions => [:nl]}], 1 => [{:mday => 1, :name => "Nieuwjaar", :regions => [:nl]}], + 4 => [{:mday => 30, :name => "Koninginnedag", :regions => [:nl]}], + 5 => [{:mday => 4, :name => "Dodenherdenking", :regions => [:nl]}, + {:mday => 5, :name => "Bevrijdingsdag", :regions => [:nl]}], 12 => [{:mday => 5, :type => :informal, :name => "Sinterklaas", :regions => [:nl]}, {:mday => 25, :name => "Kerstmis", :regions => [:nl]}, - {:mday => 26, :name => "Kerstmis", :regions => [:nl]}], - 4 => [{:mday => 30, :name => "Koninginnedag", :regions => [:nl]}] + {:mday => 26, :name => "Kerstmis", :regions => [:nl]}] } end diff --git a/lib/holidays/no.rb b/lib/holidays/no.rb index 7663d32..8ac789f 100644 --- a/lib/holidays/no.rb +++ b/lib/holidays/no.rb @@ -15,8 +15,6 @@ module Holidays DEFINED_REGIONS = [:no] HOLIDAYS_BY_MONTH = { - 5 => [{:mday => 1, :name => "1. mai", :regions => [:no]}, - {:mday => 17, :name => "17. mai", :regions => [:no]}], 0 => [{:function => lambda { |year| Holidays.easter(year)-49 }, :function_id => "easter(year)-49", :type => :informal, :name => "Fastelavn", :regions => [:no]}, {:function => lambda { |year| Holidays.easter(year)-7 }, :function_id => "easter(year)-7", :name => "Palmesøndag", :regions => [:no]}, {:function => lambda { |year| Holidays.easter(year)-3 }, :function_id => "easter(year)-3", :name => "Skjærtorsdag", :regions => [:no]}, @@ -27,6 +25,8 @@ module Holidays {:function => lambda { |year| Holidays.easter(year)+49 }, :function_id => "easter(year)+49", :name => "1. pinsedag", :regions => [:no]}, {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "2. pinsedag", :regions => [:no]}], 1 => [{:mday => 1, :name => "Nyttårsdag", :regions => [:no]}], + 5 => [{:mday => 1, :name => "1. mai", :regions => [:no]}, + {:mday => 17, :name => "17. mai", :regions => [:no]}], 12 => [{:mday => 24, :type => :informal, :name => "Julaften", :regions => [:no]}, {:mday => 25, :name => "1. juledag", :regions => [:no]}, {:mday => 26, :name => "2. juledag", :regions => [:no]}, diff --git a/lib/holidays/north_america.rb b/lib/holidays/north_america.rb index 5a523e9..ebc634c 100644 --- a/lib/holidays/north_america.rb +++ b/lib/holidays/north_america.rb @@ -12,9 +12,28 @@ module Holidays # # More definitions are available at http://code.dunae.ca/holidays. module North_America # :nodoc: - DEFINED_REGIONS = [:ca, :ca_qc, :ca_nf, :ca_nt, :ca_nu, :ca_ab, :ca_on, :ca_sk, :ca_mb, :ca_bc, :ca_ns, :ca_yk, :mx, :mx_pue, :us, :us_dc] + DEFINED_REGIONS = [:ca, :ca_qc, :ca_ab, :ca_on, :ca_sk, :ca_mb, :ca_nf, :ca_nt, :ca_nu, :ca_bc, :ca_ns, :ca_yk, :mx, :mx_pue, :us, :us_dc] HOLIDAYS_BY_MONTH = { + 0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Good Friday", :regions => [:ca]}, + {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :type => :informal, :name => "Easter Monday", :regions => [:ca]}, + {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :type => :informal, :name => "Good Friday", :regions => [:us]}], + 1 => [{:mday => 1, :name => "New Year's Day", :regions => [:ca]}, + {:mday => 2, :name => "New Year's", :regions => [:ca_qc]}, + {:mday => 1, :name => "Año nuevo", :regions => [:mx]}, + {:mday => 6, :name => "Dia de los Santos Reyes", :regions => [:mx]}, + {:mday => 1, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "New Year's Day", :regions => [:us]}, + {:wday => 1, :week => 3, :name => "Martin Luther King, Jr. Day", :regions => [:us]}, + {:function => lambda { |year| Holidays.us_inauguration_day(year) }, :function_id => "us_inauguration_day(year)", :name => "Inauguration Day", :regions => [:us_dc]}], + 2 => [{:wday => 1, :week => 3, :name => "Family Day", :regions => [:ca_ab, :ca_on, :ca_sk]}, + {:wday => 1, :week => 3, :name => "Louis Riel Day", :regions => [:ca_mb]}, + {:wday => 1, :week => 1, :name => "Día de la Constitución", :regions => [:mx]}, + {:wday => 1, :week => 3, :name => "Presidents' Day", :regions => [:us]}, + {:mday => 2, :type => :informal, :name => "Groundhog Day", :regions => [:us, :ca]}, + {:mday => 14, :type => :informal, :name => "Valentine's Day", :regions => [:us, :ca]}], + 3 => [{:mday => 23, :name => "St. George's Day", :regions => [:ca_nf]}, + {:wday => 1, :week => 3, :name => "Natalicio de Benito Juárez", :regions => [:mx]}, + {:mday => 17, :type => :informal, :name => "St. Patrick's Day", :regions => [:us, :ca]}], 5 => [{:function => lambda { |year| Holidays.ca_victoria_day(year) }, :function_id => "ca_victoria_day(year)", :name => "Victoria Day", :regions => [:ca]}, {:function => lambda { |year| Holidays.ca_victoria_day(year) }, :function_id => "ca_victoria_day(year)", :name => "National Patriotes Day", :regions => [:ca_qc]}, {:mday => 1, :name => "Día del Trabajo", :regions => [:mx]}, @@ -24,26 +43,34 @@ module Holidays {:mday => 15, :type => :informal, :name => "Día del Maestro", :regions => [:mx]}, {:wday => 1, :week => -1, :name => "Memorial Day", :regions => [:us]}, {:wday => 0, :week => 3, :type => :informal, :name => "Father's Day", :regions => [:us, :ca]}], - 0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Good Friday", :regions => [:ca]}, - {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :type => :informal, :name => "Easter Monday", :regions => [:ca]}, - {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :type => :informal, :name => "Good Friday", :regions => [:us]}], + 6 => [{:mday => 24, :name => "Discovery Day", :regions => [:ca_nf]}, + {:mday => 24, :name => "Fête Nationale", :regions => [:ca_qc]}, + {:mday => 21, :name => "National Aboriginal Day", :regions => [:ca_nt]}, + {:wday => 0, :week => 3, :type => :informal, :name => "Día del Padre", :regions => [:mx]}], + 7 => [{:mday => 1, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Canada Day", :regions => [:ca]}, + {:mday => 12, :name => "Orangemen's Day", :regions => [:ca_nf]}, + {:mday => 9, :name => "Nunavut Day", :regions => [:ca_nu]}, + {:mday => 4, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Independence Day", :regions => [:us]}], + 8 => [{:wday => 1, :week => 1, :name => "BC Day", :regions => [:ca_bc]}, + {:wday => 1, :week => 1, :name => "Saskatchewan Day", :regions => [:ca_sk]}, + {:wday => 1, :week => 1, :name => "Heritage Day", :regions => [:ca_ab]}, + {:wday => 1, :week => 1, :name => "Natal Day", :regions => [:ca_ns]}, + {:wday => 1, :week => 1, :name => "Civic Holiday", :regions => [:ca_on]}, + {:wday => 1, :week => 3, :name => "Discovery Day", :regions => [:ca_yk]}], + 9 => [{:wday => 1, :week => 1, :name => "Labour Day", :regions => [:ca]}, + {:mday => 15, :name => "Grito de Dolores", :regions => [:mx]}, + {:mday => 16, :name => "Día de la Independencia", :regions => [:mx]}, + {:wday => 1, :week => 1, :name => "Labor Day", :regions => [:us]}], + 10 => [{:wday => 1, :week => 2, :name => "Thanksgiving", :regions => [:ca]}, + {:mday => 12, :type => :informal, :name => "Día de la Raza", :regions => [:mx]}, + {:wday => 1, :week => 2, :name => "Columbus Day", :regions => [:us]}, + {:mday => 31, :type => :informal, :name => "Halloween", :regions => [:us, :ca]}], 11 => [{:mday => 11, :name => "Remembrance Day", :regions => [:ca]}, {:mday => 1, :type => :informal, :name => "Todos los Santos", :regions => [:mx]}, {:mday => 2, :type => :informal, :name => "Los Fieles Difuntos", :regions => [:mx]}, {:wday => 1, :week => 3, :name => "Día de la Revolución", :regions => [:mx]}, {:mday => 11, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Veterans Day", :regions => [:us]}, {:wday => 4, :week => 4, :name => "Thanksgiving", :regions => [:us]}], - 6 => [{:mday => 24, :name => "Discovery Day", :regions => [:ca_nf]}, - {:mday => 24, :name => "Fête Nationale", :regions => [:ca_qc]}, - {:mday => 21, :name => "National Aboriginal Day", :regions => [:ca_nt]}, - {:wday => 0, :week => 3, :type => :informal, :name => "Día del Padre", :regions => [:mx]}], - 1 => [{:mday => 1, :name => "New Year's Day", :regions => [:ca]}, - {:mday => 2, :name => "New Year's", :regions => [:ca_qc]}, - {:mday => 1, :name => "Año nuevo", :regions => [:mx]}, - {:mday => 6, :name => "Dia de los Santos Reyes", :regions => [:mx]}, - {:mday => 1, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "New Year's Day", :regions => [:us]}, - {:wday => 1, :week => 3, :name => "Martin Luther King, Jr. Day", :regions => [:us]}, - {:function => lambda { |year| Holidays.us_inauguration_day(year) }, :function_id => "us_inauguration_day(year)", :name => "Inauguration Day", :regions => [:us_dc]}], 12 => [{:mday => 25, :name => "Christmas Day", :regions => [:ca]}, {:mday => 26, :name => "Boxing Day", :regions => [:ca]}, {:mday => 12, :type => :informal, :name => "Día de la Virgen de Guadalupe", :regions => [:mx]}, @@ -51,36 +78,9 @@ module Holidays {:mday => 25, :name => "Navidad", :regions => [:mx]}, {:mday => 28, :name => "Los Santos Inocentes", :regions => [:mx]}, {:mday => 25, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Christmas Day", :regions => [:us]}], - 7 => [{:mday => 1, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Canada Day", :regions => [:ca]}, - {:mday => 12, :name => "Orangemen's Day", :regions => [:ca_nf]}, - {:mday => 9, :name => "Nunavut Day", :regions => [:ca_nu]}, - {:mday => 4, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Independence Day", :regions => [:us]}], - 2 => [{:wday => 1, :week => 3, :name => "Family Day", :regions => [:ca_ab, :ca_on, :ca_sk]}, - {:wday => 1, :week => 3, :name => "Louis Riel Day", :regions => [:ca_mb]}, - {:wday => 1, :week => 1, :name => "Día de la Constitución", :regions => [:mx]}, - {:wday => 1, :week => 3, :name => "Presidents' Day", :regions => [:us]}, - {:mday => 2, :type => :informal, :name => "Groundhog Day", :regions => [:us, :ca]}, - {:mday => 14, :type => :informal, :name => "Valentine's Day", :regions => [:us, :ca]}], - 8 => [{:wday => 1, :week => 1, :name => "BC Day", :regions => [:ca_bc]}, - {:wday => 1, :week => 1, :name => "Saskatchewan Day", :regions => [:ca_sk]}, - {:wday => 1, :week => 1, :name => "Heritage Day", :regions => [:ca_ab]}, - {:wday => 1, :week => 1, :name => "Natal Day", :regions => [:ca_ns]}, - {:wday => 1, :week => 1, :name => "Civic Holiday", :regions => [:ca_on]}, - {:wday => 1, :week => 3, :name => "Discovery Day", :regions => [:ca_yk]}], - 3 => [{:mday => 23, :name => "St. George's Day", :regions => [:ca_nf]}, - {:wday => 1, :week => 3, :name => "Natalicio de Benito Juárez", :regions => [:mx]}, - {:mday => 17, :type => :informal, :name => "St. Patrick's Day", :regions => [:us, :ca]}], - 9 => [{:wday => 1, :week => 1, :name => "Labour Day", :regions => [:ca]}, - {:mday => 15, :name => "Grito de Dolores", :regions => [:mx]}, - {:mday => 16, :name => "Día de la Independencia", :regions => [:mx]}, - {:wday => 1, :week => 1, :name => "Labor Day", :regions => [:us]}], 4 => [{:mday => 30, :type => :informal, :name => "Día del Niño", :regions => [:mx]}, {:mday => 1, :type => :informal, :name => "April Fool's Day", :regions => [:us, :ca]}, - {:mday => 22, :type => :informal, :name => "Earth Day", :regions => [:us, :ca]}], - 10 => [{:wday => 1, :week => 2, :name => "Thanksgiving", :regions => [:ca]}, - {:mday => 12, :type => :informal, :name => "Día de la Raza", :regions => [:mx]}, - {:wday => 1, :week => 2, :name => "Columbus Day", :regions => [:us]}, - {:mday => 31, :type => :informal, :name => "Halloween", :regions => [:us, :ca]}] + {:mday => 22, :type => :informal, :name => "Earth Day", :regions => [:us, :ca]}] } end diff --git a/lib/holidays/nyse.rb b/lib/holidays/nyse.rb index a12d6ac..3f0ebee 100644 --- a/lib/holidays/nyse.rb +++ b/lib/holidays/nyse.rb @@ -15,15 +15,15 @@ module Holidays DEFINED_REGIONS = [:nyse] HOLIDAYS_BY_MONTH = { - 5 => [{:wday => 1, :week => -1, :name => "Memorial Day", :regions => [:nyse]}], 0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Good Friday", :regions => [:nyse]}], - 11 => [{:wday => 4, :week => 4, :name => "Thanksgiving", :regions => [:nyse]}], 1 => [{:mday => 1, :name => "New Year's Day", :regions => [:nyse]}, {:wday => 1, :week => 3, :name => "Martin Luther King, Jr. Day", :regions => [:nyse]}], - 12 => [{:mday => 25, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Christmas Day", :regions => [:nyse]}], - 7 => [{:mday => 4, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Independence Day", :regions => [:nyse]}], 2 => [{:wday => 1, :week => 3, :name => "Presidents' Day", :regions => [:nyse]}], - 9 => [{:wday => 1, :week => 1, :name => "Labor Day", :regions => [:nyse]}] + 5 => [{:wday => 1, :week => -1, :name => "Memorial Day", :regions => [:nyse]}], + 7 => [{:mday => 4, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Independence Day", :regions => [:nyse]}], + 9 => [{:wday => 1, :week => 1, :name => "Labor Day", :regions => [:nyse]}], + 11 => [{:wday => 4, :week => 4, :name => "Thanksgiving", :regions => [:nyse]}], + 12 => [{:mday => 25, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Christmas Day", :regions => [:nyse]}] } end diff --git a/lib/holidays/nz.rb b/lib/holidays/nz.rb index 555a26e..445b37e 100644 --- a/lib/holidays/nz.rb +++ b/lib/holidays/nz.rb @@ -12,33 +12,33 @@ module Holidays # # More definitions are available at http://code.dunae.ca/holidays. module NZ # :nodoc: - DEFINED_REGIONS = [:nz_ca, :nz_ch, :nz, :nz_wl, :nz_sl, :nz_we, :nz_ak, :nz_nl, :nz_ot, :nz_sc, :nz_hb, :nz_mb] + DEFINED_REGIONS = [:nz, :nz_sl, :nz_we, :nz_ak, :nz_nl, :nz_ot, :nz_sc, :nz_hb, :nz_mb, :nz_ca, :nz_ch, :nz_wl] HOLIDAYS_BY_MONTH = { 0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Good Friday", :regions => [:nz]}, {:function => lambda { |year| Holidays.easter(year)-1 }, :function_id => "easter(year)-1", :name => "Easter Saturday", :regions => [:nz]}, {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Easter Monday", :regions => [:nz]}], - 11 => [{:wday => 5, :week => 2, :name => "Canterbury Anniversary Day", :regions => [:nz_ca]}, - {:mday => 30, :observed => lambda { |date| Holidays.closest_monday(date) }, :observed_id => "closest_monday", :name => "Chatham Island Anniversary Day", :regions => [:nz_ch]}], - 6 => [{:wday => 1, :week => 1, :name => "Queen's Birthday", :regions => [:nz]}], 1 => [{:mday => 1, :observed => lambda { |date| Holidays.to_monday_if_weekend(date) }, :observed_id => "to_monday_if_weekend", :name => "New Year's Day", :regions => [:nz]}, {:mday => 2, :observed => lambda { |date| Holidays.to_weekday_if_boxing_weekend(date) }, :observed_id => "to_weekday_if_boxing_weekend", :name => "Day after New Year's Day", :regions => [:nz]}, {:mday => 17, :name => "Southland Anniversary Day", :regions => [:nz_sl]}, {:mday => 22, :observed => lambda { |date| Holidays.closest_monday(date) }, :observed_id => "closest_monday", :name => "Wellington Anniversary Day", :regions => [:nz_we]}, {:mday => 29, :observed => lambda { |date| Holidays.closest_monday(date) }, :observed_id => "closest_monday", :name => "Auckland Anniversary Day", :regions => [:nz_ak]}, {:mday => 29, :observed => lambda { |date| Holidays.closest_monday(date) }, :observed_id => "closest_monday", :name => "Northland Anniversary Day", :regions => [:nz_nl]}], - 12 => [{:mday => 1, :observed => lambda { |date| Holidays.closest_monday(date) }, :observed_id => "closest_monday", :name => "Westland Anniversary Day", :regions => [:nz_wl]}, - {:mday => 25, :observed => lambda { |date| Holidays.to_monday_if_weekend(date) }, :observed_id => "to_monday_if_weekend", :name => "Christmas Day", :regions => [:nz]}, - {:mday => 26, :observed => lambda { |date| Holidays.to_weekday_if_boxing_weekend(date) }, :observed_id => "to_weekday_if_boxing_weekend", :name => "Boxing Day", :regions => [:nz]}], 2 => [{:mday => 1, :observed => lambda { |date| Holidays.closest_monday(date) }, :observed_id => "closest_monday", :name => "Nelson Anniversary Day", :regions => [:nz_ak]}, {:mday => 6, :name => "Waitangi Day", :regions => [:nz]}], 3 => [{:mday => 23, :observed => lambda { |date| Holidays.closest_monday(date) }, :observed_id => "closest_monday", :name => "Otago Anniversary Day", :regions => [:nz_ot]}, {:wday => 1, :week => 2, :name => "Taranaki Anniversary Day", :regions => [:nz_ak]}], - 9 => [{:wday => 1, :week => 4, :name => "Dominion Day", :regions => [:nz_sc]}], 4 => [{:mday => 25, :name => "ANZAC Day", :regions => [:nz]}], + 6 => [{:wday => 1, :week => 1, :name => "Queen's Birthday", :regions => [:nz]}], + 9 => [{:wday => 1, :week => 4, :name => "Dominion Day", :regions => [:nz_sc]}], 10 => [{:wday => 1, :week => 1, :observed => lambda { |date| Holidays.previous_friday(date) }, :observed_id => "previous_friday", :name => "Hawke's bay Anniversary Day", :regions => [:nz_hb]}, {:wday => 1, :week => 4, :name => "Labour Day", :regions => [:nz]}, - {:wday => 1, :week => 4, :observed => lambda { |date| Holidays.next_week(date) }, :observed_id => "next_week", :name => "Marlborough Anniversary Day", :regions => [:nz_mb]}] + {:wday => 1, :week => 4, :observed => lambda { |date| Holidays.next_week(date) }, :observed_id => "next_week", :name => "Marlborough Anniversary Day", :regions => [:nz_mb]}], + 11 => [{:wday => 5, :week => 2, :name => "Canterbury Anniversary Day", :regions => [:nz_ca]}, + {:mday => 30, :observed => lambda { |date| Holidays.closest_monday(date) }, :observed_id => "closest_monday", :name => "Chatham Island Anniversary Day", :regions => [:nz_ch]}], + 12 => [{:mday => 1, :observed => lambda { |date| Holidays.closest_monday(date) }, :observed_id => "closest_monday", :name => "Westland Anniversary Day", :regions => [:nz_wl]}, + {:mday => 25, :observed => lambda { |date| Holidays.to_monday_if_weekend(date) }, :observed_id => "to_monday_if_weekend", :name => "Christmas Day", :regions => [:nz]}, + {:mday => 26, :observed => lambda { |date| Holidays.to_weekday_if_boxing_weekend(date) }, :observed_id => "to_weekday_if_boxing_weekend", :name => "Boxing Day", :regions => [:nz]}] } end @@ -54,15 +54,15 @@ def self.closest_monday(date) end -def self.next_week(date) - date + 7 -end - def self.previous_friday(date) date - 3 end +def self.next_week(date) + date + 7 +end + end diff --git a/lib/holidays/pt.rb b/lib/holidays/pt.rb index af31f3e..4728cf7 100644 --- a/lib/holidays/pt.rb +++ b/lib/holidays/pt.rb @@ -15,20 +15,20 @@ module Holidays DEFINED_REGIONS = [:pt] HOLIDAYS_BY_MONTH = { - 5 => [{:mday => 1, :name => "Dia do Trabalhador", :regions => [:pt]}], 0 => [{:function => lambda { |year| Holidays.easter(year)-47 }, :function_id => "easter(year)-47", :type => :informal, :name => "Carnaval", :regions => [:pt]}, {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Sexta-feira Santa", :regions => [:pt]}, {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Páscoa", :regions => [:pt]}, {:function => lambda { |year| Holidays.easter(year)+60 }, :function_id => "easter(year)+60", :name => "Corpo de Deus", :regions => [:pt]}], - 11 => [{:mday => 1, :name => "Todos os Santos", :regions => [:pt]}], - 6 => [{:mday => 10, :name => "Dia de Portugal", :regions => [:pt]}], 1 => [{:mday => 1, :name => "Ano Novo", :regions => [:pt]}], + 4 => [{:mday => 25, :name => "Dia da Liberdade", :regions => [:pt]}], + 5 => [{:mday => 1, :name => "Dia do Trabalhador", :regions => [:pt]}], + 6 => [{:mday => 10, :name => "Dia de Portugal", :regions => [:pt]}], + 8 => [{:mday => 15, :name => "Assunção de Nossa Senhora", :regions => [:pt]}], + 10 => [{:mday => 5, :name => "Implantação da República", :regions => [:pt]}], + 11 => [{:mday => 1, :name => "Todos os Santos", :regions => [:pt]}], 12 => [{:mday => 1, :name => "Restauração da Independência", :regions => [:pt]}, {:mday => 8, :name => "Imaculada Conceição", :regions => [:pt]}, - {:mday => 25, :name => "Natal", :regions => [:pt]}], - 8 => [{:mday => 15, :name => "Assunção de Nossa Senhora", :regions => [:pt]}], - 4 => [{:mday => 25, :name => "Dia da Liberdade", :regions => [:pt]}], - 10 => [{:mday => 5, :name => "Implantação da República", :regions => [:pt]}] + {:mday => 25, :name => "Natal", :regions => [:pt]}] } end diff --git a/lib/holidays/scandinavia.rb b/lib/holidays/scandinavia.rb index 6a725ca..6f2012c 100644 --- a/lib/holidays/scandinavia.rb +++ b/lib/holidays/scandinavia.rb @@ -15,14 +15,6 @@ module Holidays DEFINED_REGIONS = [:dk, :no, :is, :se, :fi] HOLIDAYS_BY_MONTH = { - 5 => [{:mday => 1, :name => "Arbejdernes kampdag", :regions => [:dk]}, - {:mday => 5, :type => :informal, :name => "Danmarks befrielse", :regions => [:dk]}, - {:mday => 1, :name => "Verkalýðsdagurinn", :regions => [:is]}, - {:mday => 13, :name => "Mæðradagurinn", :regions => [:is]}, - {:mday => 1, :name => "1. mai", :regions => [:no]}, - {:mday => 17, :name => "17. mai", :regions => [:no]}, - {:mday => 1, :name => "Första maj", :regions => [:se]}, - {:mday => 1, :name => "Vappu", :regions => [:fi]}], 0 => [{:function => lambda { |year| Holidays.easter(year)-49 }, :function_id => "easter(year)-49", :type => :informal, :name => "Fastelavn", :regions => [:dk, :no]}, {:function => lambda { |year| Holidays.easter(year)-7 }, :function_id => "easter(year)-7", :name => "Palmesøndag", :regions => [:dk, :no]}, {:function => lambda { |year| Holidays.easter(year)-3 }, :function_id => "easter(year)-3", :name => "Skærtorsdag", :regions => [:dk]}, @@ -60,16 +52,6 @@ module Holidays {:function => lambda { |year| Holidays.easter(year)+39 }, :function_id => "easter(year)+39", :name => "Helatorstai", :regions => [:fi]}, {:function => lambda { |year| Holidays.easter(year)+49 }, :function_id => "easter(year)+49", :name => "Helluntaipäivä", :regions => [:fi]}, {:function => lambda { |year| Holidays.fi_pyhainpaiva(year) }, :function_id => "fi_pyhainpaiva(year)", :name => "Pyhäinpäivä", :regions => [:fi]}], - 11 => [{:mday => 10, :type => :informal, :name => "Mortensaften", :regions => [:dk]}, - {:mday => 16, :name => "Dagur íslenskrar tungu", :regions => [:is]}], - 6 => [{:mday => 5, :name => "Grundlovsdag", :regions => [:dk]}, - {:mday => 15, :type => :informal, :name => "Valdemarsdag og Genforeningsdag", :regions => [:dk]}, - {:mday => 23, :type => :informal, :name => "Sankt Hans aften", :regions => [:dk]}, - {:mday => 3, :type => :informal, :name => "Sjómannadagurinn", :regions => [:is]}, - {:mday => 17, :name => "Lýðveldisdagurinn", :regions => [:is]}, - {:mday => 6, :name => "Nationaldagen", :regions => [:se]}, - {:function => lambda { |year| Holidays.se_midsommardagen(year) }, :function_id => "se_midsommardagen(year)", :name => "Midsommardagen", :regions => [:se]}, - {:function => lambda { |year| Holidays.fi_juhannuspaiva(year) }, :function_id => "fi_juhannuspaiva(year)", :name => "Juhannuspäivä", :regions => [:fi]}], 1 => [{:mday => 1, :name => "Nytårsdag", :regions => [:dk]}, {:mday => 1, :name => "Nýársdagur", :regions => [:is]}, {:mday => 6, :name => "Þrettándinn", :regions => [:is]}, @@ -79,6 +61,28 @@ module Holidays {:mday => 6, :name => "Trettondedag jul", :regions => [:se]}, {:mday => 1, :name => "Uudenvuodenpäivä", :regions => [:fi]}, {:mday => 6, :name => "Loppiainen", :regions => [:fi]}], + 4 => [{:mday => 1, :type => :informal, :name => "1. april", :regions => [:dk]}, + {:mday => 9, :type => :informal, :name => "Danmarks besættelse", :regions => [:dk]}, + {:mday => 16, :type => :informal, :name => "Dronningens fødselsdag", :regions => [:dk]}, + {:function => lambda { |year| Holidays.is_sumardagurinn_fyrsti(year) }, :function_id => "is_sumardagurinn_fyrsti(year)", :name => "Sumardagurinn fyrsti", :regions => [:is]}], + 5 => [{:mday => 1, :name => "Arbejdernes kampdag", :regions => [:dk]}, + {:mday => 5, :type => :informal, :name => "Danmarks befrielse", :regions => [:dk]}, + {:mday => 1, :name => "Verkalýðsdagurinn", :regions => [:is]}, + {:mday => 13, :name => "Mæðradagurinn", :regions => [:is]}, + {:mday => 1, :name => "1. mai", :regions => [:no]}, + {:mday => 17, :name => "17. mai", :regions => [:no]}, + {:mday => 1, :name => "Första maj", :regions => [:se]}, + {:mday => 1, :name => "Vappu", :regions => [:fi]}], + 6 => [{:mday => 5, :name => "Grundlovsdag", :regions => [:dk]}, + {:mday => 15, :type => :informal, :name => "Valdemarsdag og Genforeningsdag", :regions => [:dk]}, + {:mday => 23, :type => :informal, :name => "Sankt Hans aften", :regions => [:dk]}, + {:mday => 3, :type => :informal, :name => "Sjómannadagurinn", :regions => [:is]}, + {:mday => 17, :name => "Lýðveldisdagurinn", :regions => [:is]}, + {:mday => 6, :name => "Nationaldagen", :regions => [:se]}, + {:function => lambda { |year| Holidays.se_midsommardagen(year) }, :function_id => "se_midsommardagen(year)", :name => "Midsommardagen", :regions => [:se]}, + {:function => lambda { |year| Holidays.fi_juhannuspaiva(year) }, :function_id => "fi_juhannuspaiva(year)", :name => "Juhannuspäivä", :regions => [:fi]}], + 11 => [{:mday => 10, :type => :informal, :name => "Mortensaften", :regions => [:dk]}, + {:mday => 16, :name => "Dagur íslenskrar tungu", :regions => [:is]}], 12 => [{:mday => 13, :type => :informal, :name => "Sankt Lucia", :regions => [:dk]}, {:mday => 24, :name => "Juleaftensdag", :regions => [:dk]}, {:mday => 25, :name => "1. juledag", :regions => [:dk, :no]}, @@ -96,30 +100,10 @@ module Holidays {:mday => 25, :name => "Joulupäivä", :regions => [:fi]}, {:mday => 26, :name => "Tapaninpäivä", :regions => [:fi]}], 2 => [{:mday => 18, :type => :informal, :name => "Konudagur", :regions => [:is]}], - 8 => [{:wday => 1, :week => 1, :name => "Frídagur verslunarmanna", :regions => [:is]}], - 4 => [{:mday => 1, :type => :informal, :name => "1. april", :regions => [:dk]}, - {:mday => 9, :type => :informal, :name => "Danmarks besættelse", :regions => [:dk]}, - {:mday => 16, :type => :informal, :name => "Dronningens fødselsdag", :regions => [:dk]}, - {:function => lambda { |year| Holidays.is_sumardagurinn_fyrsti(year) }, :function_id => "is_sumardagurinn_fyrsti(year)", :name => "Sumardagurinn fyrsti", :regions => [:is]}] + 8 => [{:wday => 1, :week => 1, :name => "Frídagur verslunarmanna", :regions => [:is]}] } end -# Sweden: All Saint's Day (Saturday between Oct 31 and Nov 6) -def self.se_alla_helgons_dag(year) - date = Date.civil(year,10,31) - date += (6 - date.wday) - date -end - - -# Finland: All Saint's Day (Saturday between Oct 31 and Nov 6) -def self.fi_pyhainpaiva(year) - date = Date.civil(year,10,31) - date += (6 - date.wday) - date -end - - # Iceland: first day of summer (Thursday after 18 April) def self.is_sumardagurinn_fyrsti(year) date = Date.civil(year,4,18) @@ -140,6 +124,14 @@ def self.se_midsommardagen(year) end +# Sweden: All Saint's Day (Saturday between Oct 31 and Nov 6) +def self.se_alla_helgons_dag(year) + date = Date.civil(year,10,31) + date += (6 - date.wday) + date +end + + # Finland: Mid-summer (Saturday between June 20–26) def self.fi_juhannuspaiva(year) date = Date.civil(year,6,20) @@ -148,6 +140,14 @@ def self.fi_juhannuspaiva(year) end +# Finland: All Saint's Day (Saturday between Oct 31 and Nov 6) +def self.fi_pyhainpaiva(year) + date = Date.civil(year,10,31) + date += (6 - date.wday) + date +end + + end diff --git a/lib/holidays/se.rb b/lib/holidays/se.rb index 355644e..41d80c1 100644 --- a/lib/holidays/se.rb +++ b/lib/holidays/se.rb @@ -15,30 +15,22 @@ module Holidays DEFINED_REGIONS = [:se] HOLIDAYS_BY_MONTH = { - 5 => [{:mday => 1, :name => "Första maj", :regions => [:se]}], 0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Långfredagen", :regions => [:se]}, {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Påskdagen", :regions => [:se]}, {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Annandag påsk", :regions => [:se]}, {:function => lambda { |year| Holidays.easter(year)+39 }, :function_id => "easter(year)+39", :name => "Kristi himmelsfärdsdag", :regions => [:se]}, {:function => lambda { |year| Holidays.easter(year)+49 }, :function_id => "easter(year)+49", :name => "Pingstdagen", :regions => [:se]}, {:function => lambda { |year| Holidays.se_alla_helgons_dag(year) }, :function_id => "se_alla_helgons_dag(year)", :name => "Alla helgons dag", :regions => [:se]}], - 6 => [{:mday => 6, :name => "Nationaldagen", :regions => [:se]}, - {:function => lambda { |year| Holidays.se_midsommardagen(year) }, :function_id => "se_midsommardagen(year)", :name => "Midsommardagen", :regions => [:se]}], 1 => [{:mday => 1, :name => "Nyårsdagen", :regions => [:se]}, {:mday => 6, :name => "Trettondedag jul", :regions => [:se]}], + 5 => [{:mday => 1, :name => "Första maj", :regions => [:se]}], + 6 => [{:mday => 6, :name => "Nationaldagen", :regions => [:se]}, + {:function => lambda { |year| Holidays.se_midsommardagen(year) }, :function_id => "se_midsommardagen(year)", :name => "Midsommardagen", :regions => [:se]}], 12 => [{:mday => 25, :name => "Juldagen", :regions => [:se]}, {:mday => 26, :name => "Annandag jul", :regions => [:se]}] } end -# Sweden: All Saint's Day (Saturday between Oct 31 and Nov 6) -def self.se_alla_helgons_dag(year) - date = Date.civil(year,10,31) - date += (6 - date.wday) - date -end - - # Sweden: Mid-summer (Saturday between June 20–26) def self.se_midsommardagen(year) date = Date.civil(year,6,20) @@ -47,6 +39,14 @@ def self.se_midsommardagen(year) end +# Sweden: All Saint's Day (Saturday between Oct 31 and Nov 6) +def self.se_alla_helgons_dag(year) + date = Date.civil(year,10,31) + date += (6 - date.wday) + date +end + + end diff --git a/lib/holidays/ups.rb b/lib/holidays/ups.rb index 4c28fca..76e219c 100644 --- a/lib/holidays/ups.rb +++ b/lib/holidays/ups.rb @@ -15,14 +15,14 @@ module Holidays DEFINED_REGIONS = [:ups] HOLIDAYS_BY_MONTH = { + 1 => [{:mday => 1, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "New Year's Day", :regions => [:ups]}], 5 => [{:wday => 1, :week => -1, :name => "Memorial Day", :regions => [:ups]}], + 7 => [{:mday => 4, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Independence Day", :regions => [:ups]}], + 9 => [{:wday => 1, :week => 1, :name => "Labor Day", :regions => [:ups]}], 11 => [{:wday => 4, :week => 4, :name => "Thanksgiving", :regions => [:ups]}, {:wday => 5, :week => 4, :name => "Day After Thanksgiving", :regions => [:ups]}], - 1 => [{:mday => 1, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "New Year's Day", :regions => [:ups]}], 12 => [{:mday => 25, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Christmas Day", :regions => [:ups]}, - {:mday => 31, :name => "New Year's Eve", :regions => [:ups]}], - 7 => [{:mday => 4, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Independence Day", :regions => [:ups]}], - 9 => [{:wday => 1, :week => 1, :name => "Labor Day", :regions => [:ups]}] + {:mday => 31, :name => "New Year's Eve", :regions => [:ups]}] } end diff --git a/lib/holidays/us.rb b/lib/holidays/us.rb index 776c4e6..04bebaa 100644 --- a/lib/holidays/us.rb +++ b/lib/holidays/us.rb @@ -15,25 +15,25 @@ module Holidays DEFINED_REGIONS = [:us, :us_dc, :ca] HOLIDAYS_BY_MONTH = { - 5 => [{:wday => 1, :week => -1, :name => "Memorial Day", :regions => [:us]}, - {:wday => 0, :week => 3, :type => :informal, :name => "Father's Day", :regions => [:us, :ca]}], 0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :type => :informal, :name => "Good Friday", :regions => [:us]}], - 11 => [{:mday => 11, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Veterans Day", :regions => [:us]}, - {:wday => 4, :week => 4, :name => "Thanksgiving", :regions => [:us]}], 1 => [{:mday => 1, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "New Year's Day", :regions => [:us]}, {:wday => 1, :week => 3, :name => "Martin Luther King, Jr. Day", :regions => [:us]}, {:function => lambda { |year| Holidays.us_inauguration_day(year) }, :function_id => "us_inauguration_day(year)", :name => "Inauguration Day", :regions => [:us_dc]}], - 12 => [{:mday => 25, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Christmas Day", :regions => [:us]}], - 7 => [{:mday => 4, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Independence Day", :regions => [:us]}], 2 => [{:wday => 1, :week => 3, :name => "Presidents' Day", :regions => [:us]}, {:mday => 2, :type => :informal, :name => "Groundhog Day", :regions => [:us, :ca]}, {:mday => 14, :type => :informal, :name => "Valentine's Day", :regions => [:us, :ca]}], - 3 => [{:mday => 17, :type => :informal, :name => "St. Patrick's Day", :regions => [:us, :ca]}], + 5 => [{:wday => 1, :week => -1, :name => "Memorial Day", :regions => [:us]}, + {:wday => 0, :week => 3, :type => :informal, :name => "Father's Day", :regions => [:us, :ca]}], + 7 => [{:mday => 4, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Independence Day", :regions => [:us]}], 9 => [{:wday => 1, :week => 1, :name => "Labor Day", :regions => [:us]}], - 4 => [{:mday => 1, :type => :informal, :name => "April Fool's Day", :regions => [:us, :ca]}, - {:mday => 22, :type => :informal, :name => "Earth Day", :regions => [:us, :ca]}], 10 => [{:wday => 1, :week => 2, :name => "Columbus Day", :regions => [:us]}, - {:mday => 31, :type => :informal, :name => "Halloween", :regions => [:us, :ca]}] + {:mday => 31, :type => :informal, :name => "Halloween", :regions => [:us, :ca]}], + 11 => [{:mday => 11, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Veterans Day", :regions => [:us]}, + {:wday => 4, :week => 4, :name => "Thanksgiving", :regions => [:us]}], + 12 => [{:mday => 25, :observed => lambda { |date| Holidays.to_weekday_if_weekend(date) }, :observed_id => "to_weekday_if_weekend", :name => "Christmas Day", :regions => [:us]}], + 3 => [{:mday => 17, :type => :informal, :name => "St. Patrick's Day", :regions => [:us, :ca]}], + 4 => [{:mday => 1, :type => :informal, :name => "April Fool's Day", :regions => [:us, :ca]}, + {:mday => 22, :type => :informal, :name => "Earth Day", :regions => [:us, :ca]}] } end diff --git a/lib/holidays/za.rb b/lib/holidays/za.rb index fd97e17..0b74fc5 100644 --- a/lib/holidays/za.rb +++ b/lib/holidays/za.rb @@ -15,18 +15,18 @@ module Holidays DEFINED_REGIONS = [:za] HOLIDAYS_BY_MONTH = { - 5 => [{:mday => 1, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Workers Day", :regions => [:za]}], 0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Good Friday", :regions => [:za]}, {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Family Day", :regions => [:za]}], - 6 => [{:mday => 16, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Youth Day", :regions => [:za]}], 1 => [{:mday => 1, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "New Year's Day", :regions => [:za]}], + 3 => [{:mday => 21, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Human Rights Day", :regions => [:za]}], + 4 => [{:mday => 27, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Freedom Day", :regions => [:za]}], + 5 => [{:mday => 1, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Workers Day", :regions => [:za]}], + 6 => [{:mday => 16, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Youth Day", :regions => [:za]}], + 8 => [{:mday => 9, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "National Women's Day", :regions => [:za]}], + 9 => [{:mday => 24, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Heritage Day", :regions => [:za]}], 12 => [{:mday => 16, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Day of Reconciliation", :regions => [:za]}, {:mday => 25, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Christmas Day", :regions => [:za]}, - {:mday => 26, :observed => lambda { |date| Holidays.to_weekday_if_boxing_weekend(date) }, :observed_id => "to_weekday_if_boxing_weekend", :name => "Day of Goodwill", :regions => [:za]}], - 8 => [{:mday => 9, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "National Women's Day", :regions => [:za]}], - 3 => [{:mday => 21, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Human Rights Day", :regions => [:za]}], - 9 => [{:mday => 24, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Heritage Day", :regions => [:za]}], - 4 => [{:mday => 27, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Freedom Day", :regions => [:za]}] + {:mday => 26, :observed => lambda { |date| Holidays.to_weekday_if_boxing_weekend(date) }, :observed_id => "to_weekday_if_boxing_weekend", :name => "Day of Goodwill", :regions => [:za]}] } end