From bfd7f63b1da60a0bafba36fd324c3dd6d0c084a1 Mon Sep 17 00:00:00 2001 From: Joshua Rosenfeld Date: Tue, 6 Feb 2024 12:51:31 -0500 Subject: [PATCH] Remove Lee-Jackson Day - generated definitions (#540) Followup to 7f4b174aa937f44623d6806259e3322b294d8f4a Also updates README with proper command to generate holiday definitions --- README.md | 2 +- vendor/holidays/lib/generated_definitions/ar.rb | 2 +- vendor/holidays/lib/generated_definitions/northamerica.rb | 8 -------- vendor/holidays/lib/generated_definitions/southamerica.rb | 2 +- vendor/holidays/lib/generated_definitions/us.rb | 8 -------- vendor/holidays/test/defs/test_defs_ar.rb | 2 +- vendor/holidays/test/defs/test_defs_northamerica.rb | 4 ---- vendor/holidays/test/defs/test_defs_southamerica.rb | 2 +- vendor/holidays/test/defs/test_defs_us.rb | 4 ---- 9 files changed, 5 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 71c70879..07cdf6bc 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Generate updated holidays as follows. cd vendor/holidays # Generate holiday definitions -bin/rails generate:definitions +rake generate:definitions ``` Install the plugin and switch to the discourse root(not the plugin directory). diff --git a/vendor/holidays/lib/generated_definitions/ar.rb b/vendor/holidays/lib/generated_definitions/ar.rb index 23742481..40ebdaea 100644 --- a/vendor/holidays/lib/generated_definitions/ar.rb +++ b/vendor/holidays/lib/generated_definitions/ar.rb @@ -23,7 +23,7 @@ module Holidays 6 => [{:mday => 20, :name => "Día de la Bandera", :regions => [:ar]}], 7 => [{:mday => 8, :name => "Feriado puente turístico", :regions => [:ar]}, {:mday => 9, :name => "Día de la Independencia", :regions => [:ar]}], - 8 => [{:mday => 15, :name => "Paso a la Inmortalidad del General José de San Martín", :regions => [:ar]}], + 8 => [{:mday => 17, :name => "Paso a la Inmortalidad del General José de San Martín", :regions => [:ar]}], 10 => [{:mday => 12, :name => "Día del Respeto a la Diversidad Cultural", :regions => [:ar]}], 11 => [{:mday => 20, :name => "Día de la Soberanía Nacional", :regions => [:ar]}], 12 => [{:mday => 8, :name => "Inmaculada Concepción de María", :regions => [:ar]}, diff --git a/vendor/holidays/lib/generated_definitions/northamerica.rb b/vendor/holidays/lib/generated_definitions/northamerica.rb index e496bd14..1aba7200 100644 --- a/vendor/holidays/lib/generated_definitions/northamerica.rb +++ b/vendor/holidays/lib/generated_definitions/northamerica.rb @@ -31,7 +31,6 @@ module Holidays {:wday => 1, :week => 3, :name => "Civil Rights Day", :regions => [:us_ar]}, {:wday => 1, :week => 3, :name => "Martin Luther King, Jr. Day", :regions => [:us]}, {:function => "us_inauguration_day(year)", :function_arguments => [:year], :name => "Inauguration Day", :regions => [:us_tx, :us_dc, :us_la, :us_md, :us_va]}, - {:function => "lee_jackson_day(year, month)", :function_arguments => [:year, :month], :name => "Lee-Jackson Day", :regions => [:us_va]}, {:mday => 19, :name => "Confederate Heroes Day", :regions => [:us_tx]}], 2 => [{:wday => 1, :week => 3, :year_ranges => { :from => 1990 },:name => "Family Day", :regions => [:ca_ab]}, {:wday => 1, :week => 3, :year_ranges => { :from => 2007 },:name => "Family Day", :regions => [:ca_sk]}, @@ -196,13 +195,6 @@ state_holiday = Date.civil(year, month, 26) state_holiday.downto(beginning_of_month).find {|date| date if date.wday == 1 } }, -"lee_jackson_day(year, month)" => Proc.new { |year, month| -day_of_holiday = Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, month, 3, 1) -beginning_of_month = Date.civil(year, month, 1) -king_day = Date.civil(year, month, day_of_holiday) -king_day.downto(beginning_of_month).find {|date| date if date.wday == 5 } -}, - "election_day(year)" => Proc.new { |year| Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 11, 1, 1) + 1 }, diff --git a/vendor/holidays/lib/generated_definitions/southamerica.rb b/vendor/holidays/lib/generated_definitions/southamerica.rb index c640e645..9a55be44 100644 --- a/vendor/holidays/lib/generated_definitions/southamerica.rb +++ b/vendor/holidays/lib/generated_definitions/southamerica.rb @@ -76,7 +76,7 @@ module Holidays {:mday => 29, :name => "Segundo Día de la Independencia", :regions => [:pe]}, {:mday => 5, :name => "Día de la Independencia", :regions => [:ve]}, {:mday => 24, :name => "Natalicio de Simón Bolívar", :regions => [:ve]}], - 8 => [{:mday => 15, :name => "Paso a la Inmortalidad del General José de San Martín", :regions => [:ar]}, + 8 => [{:mday => 17, :name => "Paso a la Inmortalidad del General José de San Martín", :regions => [:ar]}, {:mday => 15, :name => "Asunción de la Virgen", :regions => [:cl]}, {:mday => 7, :name => "Batalla de Boyacá", :regions => [:co]}, {:function => "assumption_of_mary(year)", :function_arguments => [:year], :name => "La Asunción de la Virgen", :regions => [:co]}, diff --git a/vendor/holidays/lib/generated_definitions/us.rb b/vendor/holidays/lib/generated_definitions/us.rb index 3e63e033..88ee8181 100644 --- a/vendor/holidays/lib/generated_definitions/us.rb +++ b/vendor/holidays/lib/generated_definitions/us.rb @@ -24,7 +24,6 @@ module Holidays {:wday => 1, :week => 3, :name => "Civil Rights Day", :regions => [:us_ar]}, {:wday => 1, :week => 3, :name => "Martin Luther King, Jr. Day", :regions => [:us]}, {:function => "us_inauguration_day(year)", :function_arguments => [:year], :name => "Inauguration Day", :regions => [:us_tx, :us_dc, :us_la, :us_md, :us_va]}, - {:function => "lee_jackson_day(year, month)", :function_arguments => [:year, :month], :name => "Lee-Jackson Day", :regions => [:us_va]}, {:mday => 19, :name => "Confederate Heroes Day", :regions => [:us_tx]}], 2 => [{:wday => 1, :week => 3, :name => "Presidents' Day", :regions => [:us]}, {:mday => 2, :type => :informal, :name => "Groundhog Day", :regions => [:us, :ca]}, @@ -126,13 +125,6 @@ state_holiday = Date.civil(year, month, 26) state_holiday.downto(beginning_of_month).find {|date| date if date.wday == 1 } }, -"lee_jackson_day(year, month)" => Proc.new { |year, month| -day_of_holiday = Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, month, 3, 1) -beginning_of_month = Date.civil(year, month, 1) -king_day = Date.civil(year, month, day_of_holiday) -king_day.downto(beginning_of_month).find {|date| date if date.wday == 5 } -}, - "election_day(year)" => Proc.new { |year| Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 11, 1, 1) + 1 }, diff --git a/vendor/holidays/test/defs/test_defs_ar.rb b/vendor/holidays/test/defs/test_defs_ar.rb index dfd7bbd0..fa42938e 100644 --- a/vendor/holidays/test/defs/test_defs_ar.rb +++ b/vendor/holidays/test/defs/test_defs_ar.rb @@ -37,7 +37,7 @@ class ArDefinitionTests < Test::Unit::TestCase # :nodoc: assert_equal "Día de la Independencia", (Holidays.on(Date.civil(2016, 7, 9), [:ar], [:informal])[0] || {})[:name] - assert_equal "Paso a la Inmortalidad del General José de San Martín", (Holidays.on(Date.civil(2016, 8, 15), [:ar], [:informal])[0] || {})[:name] + assert_equal "Paso a la Inmortalidad del General José de San Martín", (Holidays.on(Date.civil(2016, 8, 17), [:ar], [:informal])[0] || {})[:name] assert_equal "Día del Respeto a la Diversidad Cultural", (Holidays.on(Date.civil(2016, 10, 12), [:ar], [:informal])[0] || {})[:name] diff --git a/vendor/holidays/test/defs/test_defs_northamerica.rb b/vendor/holidays/test/defs/test_defs_northamerica.rb index 9664a3f5..a2794d54 100644 --- a/vendor/holidays/test/defs/test_defs_northamerica.rb +++ b/vendor/holidays/test/defs/test_defs_northamerica.rb @@ -334,10 +334,6 @@ assert_equal "Inauguration Day", (Holidays.on(Date.civil(2021, 1, 20), [:us_tx, assert_nil (Holidays.on(Date.civil(2018, 1, 12), [:us])[0] || {})[:name] assert_nil (Holidays.on(Date.civil(2019, 1, 18), [:us])[0] || {})[:name] - assert_equal "Lee-Jackson Day", (Holidays.on(Date.civil(2017, 1, 13), [:us_va])[0] || {})[:name] -assert_equal "Lee-Jackson Day", (Holidays.on(Date.civil(2018, 1, 12), [:us_va])[0] || {})[:name] -assert_equal "Lee-Jackson Day", (Holidays.on(Date.civil(2019, 1, 18), [:us_va])[0] || {})[:name] - assert_equal "Confederate Heroes Day", (Holidays.on(Date.civil(2017, 1, 19), [:us_tx])[0] || {})[:name] assert_equal "Presidents' Day", (Holidays.on(Date.civil(2008, 2, 18), [:us])[0] || {})[:name] diff --git a/vendor/holidays/test/defs/test_defs_southamerica.rb b/vendor/holidays/test/defs/test_defs_southamerica.rb index 1bda7f4b..6a76d66c 100644 --- a/vendor/holidays/test/defs/test_defs_southamerica.rb +++ b/vendor/holidays/test/defs/test_defs_southamerica.rb @@ -37,7 +37,7 @@ class SouthamericaDefinitionTests < Test::Unit::TestCase # :nodoc: assert_equal "Día de la Independencia", (Holidays.on(Date.civil(2016, 7, 9), [:ar], [:informal])[0] || {})[:name] - assert_equal "Paso a la Inmortalidad del General José de San Martín", (Holidays.on(Date.civil(2016, 8, 15), [:ar], [:informal])[0] || {})[:name] + assert_equal "Paso a la Inmortalidad del General José de San Martín", (Holidays.on(Date.civil(2016, 8, 17), [:ar], [:informal])[0] || {})[:name] assert_equal "Día del Respeto a la Diversidad Cultural", (Holidays.on(Date.civil(2016, 10, 12), [:ar], [:informal])[0] || {})[:name] diff --git a/vendor/holidays/test/defs/test_defs_us.rb b/vendor/holidays/test/defs/test_defs_us.rb index 360b301b..ef65ac01 100644 --- a/vendor/holidays/test/defs/test_defs_us.rb +++ b/vendor/holidays/test/defs/test_defs_us.rb @@ -73,10 +73,6 @@ assert_equal "Inauguration Day", (Holidays.on(Date.civil(2021, 1, 20), [:us_tx, assert_nil (Holidays.on(Date.civil(2018, 1, 12), [:us])[0] || {})[:name] assert_nil (Holidays.on(Date.civil(2019, 1, 18), [:us])[0] || {})[:name] - assert_equal "Lee-Jackson Day", (Holidays.on(Date.civil(2017, 1, 13), [:us_va])[0] || {})[:name] -assert_equal "Lee-Jackson Day", (Holidays.on(Date.civil(2018, 1, 12), [:us_va])[0] || {})[:name] -assert_equal "Lee-Jackson Day", (Holidays.on(Date.civil(2019, 1, 18), [:us_va])[0] || {})[:name] - assert_equal "Confederate Heroes Day", (Holidays.on(Date.civil(2017, 1, 19), [:us_tx])[0] || {})[:name] assert_equal "Presidents' Day", (Holidays.on(Date.civil(2008, 2, 18), [:us])[0] || {})[:name]