parent
92cebaa029
commit
7ef8252a3c
|
|
@ -124,9 +124,9 @@ months:
|
|||
regions: [au_act]
|
||||
week: -1
|
||||
wday: 1
|
||||
- name: National Day of Morning
|
||||
- name: National Day of Mourning
|
||||
regions: [au]
|
||||
function: national_day_of_morning_2022(year)
|
||||
function: national_day_of_mourning_2022(year)
|
||||
10:
|
||||
- name: Friday before the AFL Grand Final
|
||||
regions: [au_vic]
|
||||
|
|
@ -266,9 +266,9 @@ methods:
|
|||
else
|
||||
Date.civil(year, 5, Holidays::Factory::DateCalculator.day_of_month_calculator.call(year, 5, :third, :monday))
|
||||
end
|
||||
national_day_of_morning_2022:
|
||||
national_day_of_mourning_2022:
|
||||
# https://www.pm.gov.au/media/commemorating-her-majesty-queen-elizabeth-ii
|
||||
# 22 / 2022 - National day of Morning for the Queen
|
||||
# 22 / 2022 - National day of Mourning for the Queen
|
||||
arguments: year
|
||||
ruby: |
|
||||
year == 2022 ? 22 : nil
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ module Holidays
|
|||
8 => [{:wday => 3, :week => -3, :name => "Ekka", :regions => [:au_qld_brisbane]}],
|
||||
9 => [{:wday => 1, :week => -1, :name => "Queen's Birthday", :regions => [:au_wa]},
|
||||
{:wday => 1, :week => -1, :name => "Family & Community Day", :regions => [:au_act]},
|
||||
{:function => "national_day_of_morning_2022(year)", :function_arguments => [:year], :name => "National Day of Morning", :regions => [:au]}],
|
||||
{:function => "national_day_of_mourning_2022(year)", :function_arguments => [:year], :name => "National Day of Mourning", :regions => [:au]}],
|
||||
10 => [{:function => "afl_grand_final(year)", :function_arguments => [:year], :name => "Friday before the AFL Grand Final", :regions => [:au_vic]},
|
||||
{:wday => 1, :week => 1, :name => "Labour Day", :regions => [:au_act, :au_nsw, :au_sa]},
|
||||
{:function => "qld_labour_day_october(year)", :function_arguments => [:year], :observed => "to_monday_if_weekend(date)", :observed_arguments => [:date], :name => "Labour Day", :regions => [:au_qld]},
|
||||
|
|
@ -129,7 +129,7 @@ else
|
|||
end
|
||||
},
|
||||
|
||||
"national_day_of_morning_2022(year)" => Proc.new { |year|
|
||||
"national_day_of_mourning_2022(year)" => Proc.new { |year|
|
||||
year == 2022 ? 22 : nil
|
||||
},
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue