From a989a5fa28569aded9e5c7c50fb224fc45e14891 Mon Sep 17 00:00:00 2001 From: John Manuel Derecho Date: Mon, 29 Sep 2025 06:19:02 +0800 Subject: [PATCH] Customized UK holidays --- definitions/gb.yaml | 4 ++-- lib/generated_definitions/europe.rb | 4 ++-- lib/generated_definitions/gb.rb | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/definitions/gb.yaml b/definitions/gb.yaml index 3356c95b..c19c1b50 100644 --- a/definitions/gb.yaml +++ b/definitions/gb.yaml @@ -22,7 +22,7 @@ months: regions: [gb] function: easter(year) - name: Easter Monday - regions: [gb_eng, gb_wls, gb_eaw, gb_nir] + regions: [gb, gb_eng, gb_wls, gb_eaw, gb_nir] function: easter(year) function_modifier: 1 1: @@ -66,7 +66,7 @@ months: week: 1 wday: 1 - name: Bank Holiday - regions: [gb_eng, gb_wls, gb_eaw, gb_nir] + regions: [gb, gb_eng, gb_wls, gb_eaw, gb_nir] week: -1 wday: 1 11: diff --git a/lib/generated_definitions/europe.rb b/lib/generated_definitions/europe.rb index fd0b54e2..8733ded8 100644 --- a/lib/generated_definitions/europe.rb +++ b/lib/generated_definitions/europe.rb @@ -77,7 +77,7 @@ def self.holidays_by_month {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 50, :name => "Lundi de Pentecôte", :regions => [:fr]}, {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Good Friday", :regions => [:gb]}, {:function => "easter(year)", :function_arguments => [:year], :name => "Easter Sunday", :regions => [:gb]}, - {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Easter Monday", :regions => [:gb_eng, :gb_wls, :gb_eaw, :gb_nir]}, + {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Easter Monday", :regions => [:gb, :gb_eng, :gb_wls, :gb_eaw, :gb_nir]}, {:function => "easter(year)", :function_arguments => [:year], :name => "Uskrs", :regions => [:hr]}, {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Uskrsni ponedjeljak", :regions => [:hr]}, {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 60, :name => "Tijelovo", :regions => [:hr]}, @@ -254,7 +254,7 @@ def self.holidays_by_month {:mday => 15, :observed => "to_monday_if_sunday(date)", :observed_arguments => [:date], :name => "Asunción", :regions => [:es]}, {:mday => 15, :name => "Assomption", :regions => [:fr]}, {: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]}, + {:wday => 1, :week => -1, :name => "Bank Holiday", :regions => [:gb, :gb_eng, :gb_wls, :gb_eaw, :gb_nir]}, {:mday => 5, :name => "Dan pobjede i domovinske zahvalnosti i dan hrvatskih branitelja", :regions => [:hr]}, {:mday => 15, :name => "Velika Gospa", :regions => [:hr]}, {:mday => 20, :name => "Az államalapítás ünnepe", :regions => [:hu]}, diff --git a/lib/generated_definitions/gb.rb b/lib/generated_definitions/gb.rb index e33b01a2..fe6f9427 100644 --- a/lib/generated_definitions/gb.rb +++ b/lib/generated_definitions/gb.rb @@ -20,7 +20,7 @@ def self.holidays_by_month { 0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Good Friday", :regions => [:gb]}, {:function => "easter(year)", :function_arguments => [:year], :name => "Easter Sunday", :regions => [:gb]}, - {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Easter Monday", :regions => [:gb_eng, :gb_wls, :gb_eaw, :gb_nir]}], + {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Easter Monday", :regions => [:gb, :gb_eng, :gb_wls, :gb_eaw, :gb_nir]}], 1 => [{:mday => 1, :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "New Year's Day", :regions => [:gb]}, {:mday => 2, :observed => "to_weekday_if_boxing_weekend(date)", :observed_arguments => [:date], :name => "2nd January", :regions => [:gb_sct]}], 3 => [{:mday => 5, :name => "St. Piran's Day", :regions => [:gb_con]}, @@ -31,7 +31,7 @@ def self.holidays_by_month 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]}], + {:wday => 1, :week => -1, :name => "Bank Holiday", :regions => [:gb, :gb_eng, :gb_wls, :gb_eaw, :gb_nir]}], 11 => [{:mday => 5, :type => :informal, :name => "Guy Fawkes Day", :regions => [:gb]}, {:mday => 30, :year_ranges => [{:before => 2006}],:observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :type => :informal, :name => "St. Andrew's Day", :regions => [:gb_sct]}, {:mday => 30, :year_ranges => [{:after => 2007}],:observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "St. Andrew's Day", :regions => [:gb_sct]}],