Permalink
Browse files

Merge pull request #2 from philmill/master

Please Merge these changes
  • Loading branch information...
PrismContent committed May 25, 2012
2 parents 8074e7d + 7637803 commit 25930ff25fdc2abf1fcbf98e72c003974e14f71c
View
@@ -6,10 +6,6 @@ months:
- name: Good Friday
regions: [ca]
function: easter(year)-2
- - name: Easter Sunday
- regions: [ca]
- function: easter(year)
- type: informal
- name: Easter Monday
regions: [ca]
function: easter(year)+1
@@ -2,6 +2,11 @@
# Updated 2008-11-22.
---
months:
+ 0:
+ - name: Easter Sunday
+ regions: [us,ca]
+ function: easter(year)
+ type: informal
2:
- name: Groundhog Day
regions: [us, ca]
View
@@ -8,11 +8,7 @@ months:
- name: Good Friday
regions: [us]
function: easter(year)-2
- type: informal
- - name: Easter Sunday
- regions: [us]
- function: easter(year)
- type: informal
+ type: informal
1:
- name: New Year's Day
regions: [us]
@@ -24,7 +20,7 @@ months:
wday: 1
- name: Inauguration Day
function: us_inauguration_day(year)
- regions: [us_dc]
+ regions: [us_dc]
2:
- name: Presidents' Day
week: 3
View
@@ -18,19 +18,19 @@ def self.defined_regions
def self.holidays_by_month
{
- 0 => [{:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Ostermontag", :regions => [:at]},
+ 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ägnis", :regions => [:at]},
{:mday => 25, :name => "1. Weihnachtstag", :regions => [:at]},
- {:mday => 26, :name => "2. 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]}]
}
end
end
View
@@ -13,30 +13,30 @@ module Holidays
# All the definitions are available at https://github.com/alexdunae/holidays
module AU # :nodoc:
def self.defined_regions
- [:au, :au_tas, :au_wa, :au_vic, :au_qld, :au_nt, :au_act, :au_nsw, :au_sa, :au_qld_brisbane]
+ [:au_qld, :au_nt, :au, :au_tas, :au_wa, :au_act, :au_nsw, :au_sa, :au_vic, :au_qld_brisbane]
end
def self.holidays_by_month
{
- 0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Good Friday", :regions => [:au]},
+ 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]}],
- 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]}]
+ 10 => [{:wday => 1, :week => 1, :name => "Labour Day", :regions => [:au_act, :au_nsw, :au_sa]}]
}
end
end
View
@@ -18,18 +18,18 @@ def self.defined_regions
def self.holidays_by_month
{
- 0 => [{:function => lambda { |year| Holidays.easter(year)-47 }, :function_id => "easter(year)-47", :type => :informal, :name => "Carnaval", :regions => [:br]},
+ 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]}],
- 12 => [{:mday => 25, :name => "Natal", :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]}]
}
end
end
View
@@ -13,44 +13,45 @@ module Holidays
# All the definitions are available at https://github.com/alexdunae/holidays
module CA # :nodoc:
def self.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]
+ [:ca, :ca_qc, :ca_nf, :ca_nt, :ca_nu, :ca_ab, :ca_on, :ca_sk, :ca_mb, :ca_bc, :ca_ns, :ca_yk, :us, :us,ca]
end
def self.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]}],
- 1 => [{:mday => 1, :name => "New Year's Day", :regions => [:ca]},
- {:mday => 2, :name => "New Year's", :regions => [:ca_qc]}],
- 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]},
+ 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]},
+ {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :type => :informal, :name => "Easter Sunday", :regions => [:us,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]}],
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]}],
- 10 => [{:wday => 1, :week => 2, :name => "Thanksgiving", :regions => [: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]}]
+ {: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]}]
}
end
end
Oops, something went wrong.

0 comments on commit 25930ff

Please sign in to comment.