Fixed definition index -- PT was using SE defs -- thanks Jaoa Miguel Neves
This commit is contained in:
parent
a63b4cacec
commit
0730f27b2c
51 changed files with 3152 additions and 3167 deletions
|
@ -14,7 +14,7 @@ defs:
|
|||
MX: ['mx.yaml', 'north_america_informal.yaml']
|
||||
NL: ['nl.yaml']
|
||||
NYSE: ['nyse.yaml']
|
||||
PT: ['se.yaml']
|
||||
PT: ['pt.yaml']
|
||||
US: ['us.yaml', 'north_america_informal.yaml']
|
||||
United_Nations: ['united_nations.yaml']
|
||||
UPS: ['ups.yaml']
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
module Holidays
|
||||
# This file is generated by the Ruby Holiday gem.
|
||||
#
|
||||
# Definitions loaded: data/se.yaml
|
||||
# Definitions loaded: data/pt.yaml
|
||||
#
|
||||
# To use the definitions in this file, load them right after you load the
|
||||
# Holiday gem:
|
||||
|
@ -11,41 +11,26 @@ module Holidays
|
|||
#
|
||||
# More definitions are available at http://code.dunae.ca/holidays.
|
||||
module PT # :nodoc:
|
||||
DEFINED_REGIONS = [:se]
|
||||
DEFINED_REGIONS = [:pt]
|
||||
|
||||
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]}],
|
||||
12 => [{:mday => 25, :name => "Juldagen", :regions => [:se]},
|
||||
{:mday => 26, :name => "Annandag jul", :regions => [:se]}]
|
||||
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]}],
|
||||
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]}]
|
||||
}
|
||||
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)
|
||||
date += (6 - date.wday)
|
||||
date
|
||||
end
|
||||
|
||||
|
||||
|
||||
end
|
||||
|
||||
|
|
|
@ -3,30 +3,30 @@ require 'holidays/pt'
|
|||
|
||||
# This file is generated by the Ruby Holiday gem.
|
||||
#
|
||||
# Definitions loaded: data/se.yaml
|
||||
# Definitions loaded: data/pt.yaml
|
||||
class PtDefinitionTests < Test::Unit::TestCase # :nodoc:
|
||||
|
||||
def test_pt
|
||||
{Date.civil(2008,1,1) => 'Nyårsdagen',
|
||||
Date.civil(2008,1,6) => 'Trettondedag jul',
|
||||
Date.civil(2008,3,21) => 'Långfredagen',
|
||||
Date.civil(2008,3,23) => 'Påskdagen',
|
||||
Date.civil(2008,3,24) => 'Annandag påsk',
|
||||
Date.civil(2008,5,1) => 'Första maj',
|
||||
Date.civil(2008,5,1) => 'Kristi himmelsfärdsdag',
|
||||
Date.civil(2008,5,11) => 'Pingstdagen',
|
||||
Date.civil(2008,6,6) => 'Nationaldagen',
|
||||
Date.civil(2005,6,25) => 'Midsommardagen',
|
||||
Date.civil(2006,6,24) => 'Midsommardagen',
|
||||
Date.civil(2007,6,23) => 'Midsommardagen',
|
||||
Date.civil(2008,6,21) => 'Midsommardagen',
|
||||
Date.civil(2005,11,5) => 'Alla helgons dag',
|
||||
Date.civil(2006,11,4) => 'Alla helgons dag',
|
||||
Date.civil(2007,11,3) => 'Alla helgons dag',
|
||||
Date.civil(2008,11,1) => 'Alla helgons dag',
|
||||
Date.civil(2008,12,25) => 'Juldagen',
|
||||
Date.civil(2008,12,26) => 'Annandag jul'}.each do |date, name|
|
||||
assert_equal name, Holidays.on(date, :se, :informal)[0][:name]
|
||||
{Date.civil(2008,1,1) => 'Ano Novo',
|
||||
Date.civil(2005,2,8) => 'Carnaval',
|
||||
Date.civil(2006,2,28) => 'Carnaval',
|
||||
Date.civil(2007,2,20) => 'Carnaval',
|
||||
Date.civil(2008,2,5) => 'Carnaval',
|
||||
Date.civil(2008,3,21) => 'Sexta-feira Santa',
|
||||
Date.civil(2008,3,23) => 'Páscoa',
|
||||
Date.civil(2008,4,25) => 'Dia da Liberdade',
|
||||
Date.civil(2008,5,1) => 'Dia do Trabalhador',
|
||||
Date.civil(2005,5,26) => 'Corpo de Deus',
|
||||
Date.civil(2007,6,7) => 'Corpo de Deus',
|
||||
Date.civil(2008,5,22) => 'Corpo de Deus',
|
||||
Date.civil(2008,6,10) => 'Dia de Portugal',
|
||||
Date.civil(2008,8,15) => 'Assunção de Nossa Senhora',
|
||||
Date.civil(2008,10,5) => 'Implantação da República',
|
||||
Date.civil(2008,11,1) => 'Todos os Santos',
|
||||
Date.civil(2008,12,1) => 'Restauração da Independência',
|
||||
Date.civil(2008,12,8) => 'Imaculada Conceição',
|
||||
Date.civil(2008,12,25) => 'Natal'}.each do |date, name|
|
||||
assert_equal name, Holidays.on(date, :pt, :informal)[0][:name]
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue