From c7e7f0fe36798ebfbad51f73988e9ec1ceba30d8 Mon Sep 17 00:00:00 2001 From: Alex Dunae Date: Mon, 15 Nov 2010 11:11:02 -0800 Subject: [PATCH] CA: Remembrance Day typo -- closes GH-4 --- data/ca.yaml | 4 ++-- lib/holidays/ca.rb | 2 +- lib/holidays/north_america.rb | 2 +- test/defs/test_defs_ca.rb | 2 +- test/defs/test_defs_north_america.rb | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/ca.yaml b/data/ca.yaml index 451a764..d4bd6d3 100644 --- a/data/ca.yaml +++ b/data/ca.yaml @@ -98,7 +98,7 @@ months: regions: [ca] wday: 1 11: - - name: Rememberance Day + - name: Remembrance Day regions: [ca] mday: 11 12: @@ -128,7 +128,7 @@ tests: | Date.civil(2008,7,1) => 'Canada Day', Date.civil(2008,9,1) => 'Labour Day', Date.civil(2008,10,13) => 'Thanksgiving', - Date.civil(2008,11,11) => 'Rememberance Day', + Date.civil(2008,11,11) => 'Remembrance Day', Date.civil(2008,12,25) => 'Christmas Day', Date.civil(2008,12,26) => 'Boxing Day'}.each do |date, name| assert_equal name, (Holidays.on(date, :ca, :informal)[0] || {})[:name] diff --git a/lib/holidays/ca.rb b/lib/holidays/ca.rb index e749822..ef0c05c 100644 --- a/lib/holidays/ca.rb +++ b/lib/holidays/ca.rb @@ -43,7 +43,7 @@ module Holidays 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 => "Rememberance Day", :regions => [: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]}, diff --git a/lib/holidays/north_america.rb b/lib/holidays/north_america.rb index bb22993..ebc634c 100644 --- a/lib/holidays/north_america.rb +++ b/lib/holidays/north_america.rb @@ -65,7 +65,7 @@ module Holidays {: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 => "Rememberance Day", :regions => [: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]}, diff --git a/test/defs/test_defs_ca.rb b/test/defs/test_defs_ca.rb index aa84205..0c52b69 100644 --- a/test/defs/test_defs_ca.rb +++ b/test/defs/test_defs_ca.rb @@ -14,7 +14,7 @@ class CaDefinitionTests < Test::Unit::TestCase # :nodoc: Date.civil(2008,7,1) => 'Canada Day', Date.civil(2008,9,1) => 'Labour Day', Date.civil(2008,10,13) => 'Thanksgiving', - Date.civil(2008,11,11) => 'Rememberance Day', + Date.civil(2008,11,11) => 'Remembrance Day', Date.civil(2008,12,25) => 'Christmas Day', Date.civil(2008,12,26) => 'Boxing Day'}.each do |date, name| assert_equal name, (Holidays.on(date, :ca, :informal)[0] || {})[:name] diff --git a/test/defs/test_defs_north_america.rb b/test/defs/test_defs_north_america.rb index 2a3d76b..f598e96 100644 --- a/test/defs/test_defs_north_america.rb +++ b/test/defs/test_defs_north_america.rb @@ -14,7 +14,7 @@ class North_americaDefinitionTests < Test::Unit::TestCase # :nodoc: Date.civil(2008,7,1) => 'Canada Day', Date.civil(2008,9,1) => 'Labour Day', Date.civil(2008,10,13) => 'Thanksgiving', - Date.civil(2008,11,11) => 'Rememberance Day', + Date.civil(2008,11,11) => 'Remembrance Day', Date.civil(2008,12,25) => 'Christmas Day', Date.civil(2008,12,26) => 'Boxing Day'}.each do |date, name| assert_equal name, (Holidays.on(date, :ca, :informal)[0] || {})[:name]