From d953369b6139457494582bfbfb743736950a52d1 Mon Sep 17 00:00:00 2001 From: Alex Dunae Date: Fri, 30 Nov 2007 02:19:54 +0000 Subject: [PATCH] Test cases for IS Merged test/test_region_dk.rb into test/test_region_europe.rb --- data/is.yaml | 23 +++++++++---------- lib/holidays/europe.rb | 17 ++++++++------ lib/holidays/is.rb | 16 +++++++------ lib/holidays/scandinavia.rb | 17 ++++++++------ test/test_region_dk.rb | 26 --------------------- test/test_region_europe.rb | 45 +++++++++++++++++++++++++++++++++++++ 6 files changed, 85 insertions(+), 59 deletions(-) delete mode 100644 test/test_region_dk.rb diff --git a/data/is.yaml b/data/is.yaml index fe71aa4..e0ff66a 100644 --- a/data/is.yaml +++ b/data/is.yaml @@ -1,10 +1,11 @@ # Icelandic holiday definitions for the Ruby Holiday gem. # -# Updated: 2008-11-23. +# Updated: 2008-11-29. # Sources: # - http://www.simnet.is/gardarj/folk/days.htm#days # - http://www.iceland.is/history-and-culture/Traditions/IcelandicHolidays/ # - http://en.wikipedia.org/wiki/Public_holidays_in_Iceland +# - http://www.qppstudio.net/publicholidays2007/iceland.htm --- months: 0: @@ -32,19 +33,13 @@ months: - name: Annar í páskum regions: [is] function: easter(year)+1 - - name: Store Bededag + - name: Uppstigningardagur regions: [is] - function: easter(year)+26 - - name: Kristi Himmelfartsdag - regions: [is] - function: easter(year)+40 - - name: Kristi Himmelfartsdag - regions: [is] - function: easter(year)+40 - - name: 2. Pinsedag + function: easter(year)+39 + - name: Hvítasunnudagur regions: [is] function: easter(year)+49 - - name: Pinsedag + - name: Annar í hvítasunnu regions: [is] function: easter(year)+50 1: @@ -63,6 +58,10 @@ months: regions: [is] mday: 18 type: informal + 4: + - name: Sumardagurinn fyrsti + regions: [is] + function: is_sumardagurinn_fyrsti(year) 5: - name: Verkalýðsdagurinn regions: [is] @@ -70,7 +69,7 @@ months: - name: Mæðradagurinn regions: [is] mday: 13 - 5: + 6: - name: Sjómannadagurinn regions: [is] mday: 3 diff --git a/lib/holidays/europe.rb b/lib/holidays/europe.rb index e34ae22..ce0c381 100644 --- a/lib/holidays/europe.rb +++ b/lib/holidays/europe.rb @@ -11,7 +11,7 @@ module Holidays # # More definitions are available at http://code.dunae.ca/holidays. module EUROPE # :nodoc: - DEFINED_REGIONS = [:dk, :is, :de, :fr, :de_bw, :de_by, :de_nw, :de_rp, :de_sl, :de_sn, :de_he, :de_th, :de_bb, :de_mv, :de_st, :es, :es_m, :es_cn, :es_cm, :es_pv, :es_ct, :es_na, :es_v, :es_vc, :es_mu, :es_lo, :es_ib, :es_ga, :es_an, :es_ce, :es_o, :es_ex, :es_ar, :es_cl, :gb, :ie, :je, :gb_jsy, :gg, :gb_gsy, :gb_eng, :gb_wls, :gb_eaw, :gb_nir, :gb_sct, :im, :gb_iom, :gb_con, :it, :nl, :pt, :se] + DEFINED_REGIONS = [:dk, :de, :fr, :de_bw, :de_by, :de_nw, :de_rp, :de_sl, :de_sn, :de_he, :de_th, :de_bb, :de_mv, :de_st, :es, :es_m, :es_cn, :es_cm, :es_pv, :es_ct, :es_na, :es_v, :es_vc, :es_mu, :es_lo, :es_ib, :es_ga, :es_an, :es_ce, :es_o, :es_ex, :es_ar, :es_cl, :gb, :ie, :je, :gb_jsy, :gg, :gb_gsy, :gb_eng, :gb_wls, :gb_eaw, :gb_nir, :gb_sct, :im, :gb_iom, :gb_con, :is, :it, :nl, :pt, :se] HOLIDAYS_BY_MONTH = { 5 => [{:mday => 1, :name => "Arbejdernes kampdag", :regions => [:dk]}, @@ -26,8 +26,8 @@ module Holidays {:wday => 1, :week => 1, :name => "May Day", :regions => [:gb, :ie]}, {:mday => 9, :name => "Liberation Day", :regions => [:je, :gb_jsy, :gg, :gb_gsy]}, {:wday => 1, :week => -1, :name => "Bank Holiday", :regions => [:gb]}, - {:mday => 3, :type => :informal, :name => "Sjómannadagurinn", :regions => [:is]}, - {:mday => 17, :name => "Lýðveldisdagurinn", :regions => [:is]}, + {:mday => 1, :name => "Verkalýðsdagurinn", :regions => [:is]}, + {:mday => 13, :name => "Mæðradagurinn", :regions => [:is]}, {:mday => 1, :name => "Festa dei Lavoratori", :regions => [:it]}, {:mday => 4, :name => "Dodenherdenking", :regions => [:nl]}, {:mday => 5, :name => "Bevrijdingsdag", :regions => [:nl]}, @@ -39,7 +39,7 @@ module Holidays {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Langfredag", :regions => [:dk]}, {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Påskedag", :regions => [:dk]}, {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "2. påskedag", :regions => [:dk]}, - {:function => lambda { |year| Holidays.easter(year)+26 }, :function_id => "easter(year)+26", :name => "Store Bededag", :regions => [:dk, :is]}, + {:function => lambda { |year| Holidays.easter(year)+26 }, :function_id => "easter(year)+26", :name => "Store Bededag", :regions => [:dk]}, {:function => lambda { |year| Holidays.easter(year)+39 }, :function_id => "easter(year)+39", :name => "Kristi Himmelfartsdag", :regions => [:dk]}, {:function => lambda { |year| Holidays.easter(year)+49 }, :function_id => "easter(year)+49", :name => "Pinsedag", :regions => [:dk]}, {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "2. Pinsedag", :regions => [:dk]}, @@ -68,9 +68,9 @@ module Holidays {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Föstudaginn langi", :regions => [:is]}, {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Páskadagur", :regions => [:is]}, {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Annar í páskum", :regions => [:is]}, - {:function => lambda { |year| Holidays.easter(year)+40 }, :function_id => "easter(year)+40", :name => "Kristi Himmelfartsdag", :regions => [:is, :is]}, - {:function => lambda { |year| Holidays.easter(year)+49 }, :function_id => "easter(year)+49", :name => "2. Pinsedag", :regions => [:is]}, - {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "Pinsedag", :regions => [:is]}, + {:function => lambda { |year| Holidays.easter(year)+39 }, :function_id => "easter(year)+39", :name => "Uppstigningardagur", :regions => [:is]}, + {:function => lambda { |year| Holidays.easter(year)+49 }, :function_id => "easter(year)+49", :name => "Hvítasunnudagur", :regions => [:is]}, + {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "Annar í hvítasunnu", :regions => [:is]}, {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Pasqua", :regions => [:it]}, {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Lunedì dell'Angelo", :regions => [:it]}, {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Goede Vrijdag", :regions => [:nl]}, @@ -105,6 +105,8 @@ module Holidays {:mday => 9, :name => "Día de la Región de Murcia", :regions => [:es_mu]}, {:mday => 9, :name => "Día de La Rioja", :regions => [:es_lo]}, {:wday => 1, :week => 1, :name => "Bank Holiday", :regions => [:ie]}, + {:mday => 3, :type => :informal, :name => "Sjómannadagurinn", :regions => [:is]}, + {:mday => 17, :name => "Lýðveldisdagurinn", :regions => [:is]}, {:mday => 2, :name => "Festa della Repubblica", :regions => [:it]}, {:mday => 10, :name => "Dia de Portugal", :regions => [:pt]}, {:mday => 6, :name => "Nationaldagen", :regions => [:se]}, @@ -183,6 +185,7 @@ module Holidays {:mday => 16, :type => :informal, :name => "Dronningens fødselsdag", :regions => [:dk]}, {:mday => 23, :name => "San Jorge", :regions => [:es_ar, :es_cl]}, {:mday => 23, :name => "Día de Aragón", :regions => [:es_ar]}, + {:function => lambda { |year| Holidays.is_sumardagurinn_fyrsti(year) }, :function_id => "is_sumardagurinn_fyrsti(year)", :name => "Sumardagurinn fyrsti", :regions => [:is]}, {:mday => 25, :name => "Festa della Liberazione", :regions => [:it]}, {:mday => 30, :name => "Koninginnedag", :regions => [:nl]}, {:mday => 25, :name => "Dia da Liberdade", :regions => [:pt]}], diff --git a/lib/holidays/is.rb b/lib/holidays/is.rb index 0afe713..4761488 100644 --- a/lib/holidays/is.rb +++ b/lib/holidays/is.rb @@ -14,8 +14,8 @@ module Holidays DEFINED_REGIONS = [:is] HOLIDAYS_BY_MONTH = { - 5 => [{:mday => 3, :type => :informal, :name => "Sjómannadagurinn", :regions => [:is]}, - {:mday => 17, :name => "Lýðveldisdagurinn", :regions => [:is]}], + 5 => [{:mday => 1, :name => "Verkalýðsdagurinn", :regions => [:is]}, + {:mday => 13, :name => "Mæðradagurinn", :regions => [:is]}], 0 => [{:function => lambda { |year| Holidays.easter(year)-48 }, :function_id => "easter(year)-48", :name => "Bolludagur", :regions => [:is]}, {:function => lambda { |year| Holidays.easter(year)-47 }, :function_id => "easter(year)-47", :name => "Sprengidagur", :regions => [:is]}, {:function => lambda { |year| Holidays.easter(year)-46 }, :function_id => "easter(year)-46", :name => "Öskudagur", :regions => [:is]}, @@ -24,11 +24,12 @@ module Holidays {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Föstudaginn langi", :regions => [:is]}, {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Páskadagur", :regions => [:is]}, {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Annar í páskum", :regions => [:is]}, - {:function => lambda { |year| Holidays.easter(year)+26 }, :function_id => "easter(year)+26", :name => "Store Bededag", :regions => [:is]}, - {:function => lambda { |year| Holidays.easter(year)+40 }, :function_id => "easter(year)+40", :name => "Kristi Himmelfartsdag", :regions => [:is, :is]}, - {:function => lambda { |year| Holidays.easter(year)+49 }, :function_id => "easter(year)+49", :name => "2. Pinsedag", :regions => [:is]}, - {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "Pinsedag", :regions => [:is]}], + {:function => lambda { |year| Holidays.easter(year)+39 }, :function_id => "easter(year)+39", :name => "Uppstigningardagur", :regions => [:is]}, + {:function => lambda { |year| Holidays.easter(year)+49 }, :function_id => "easter(year)+49", :name => "Hvítasunnudagur", :regions => [:is]}, + {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "Annar í hvítasunnu", :regions => [:is]}], 11 => [{:mday => 16, :name => "Dagur íslenskrar tungu", :regions => [:is]}], + 6 => [{:mday => 3, :type => :informal, :name => "Sjómannadagurinn", :regions => [:is]}, + {:mday => 17, :name => "Lýðveldisdagurinn", :regions => [:is]}], 1 => [{:mday => 1, :name => "Nýársdagur", :regions => [:is]}, {:mday => 6, :name => "Þrettándinn", :regions => [:is]}, {:mday => 19, :type => :informal, :name => "Bóndadagur", :regions => [:is]}], @@ -37,7 +38,8 @@ module Holidays {:mday => 26, :name => "Jól", :regions => [:is]}, {:mday => 31, :name => "Gamlárskvöld", :regions => [:is]}], 2 => [{:mday => 18, :type => :informal, :name => "Konudagur", :regions => [:is]}], - 8 => [{:wday => 1, :week => 1, :name => "Frídagur verslunarmanna", :regions => [:is]}] + 8 => [{:wday => 1, :week => 1, :name => "Frídagur verslunarmanna", :regions => [:is]}], + 4 => [{:function => lambda { |year| Holidays.is_sumardagurinn_fyrsti(year) }, :function_id => "is_sumardagurinn_fyrsti(year)", :name => "Sumardagurinn fyrsti", :regions => [:is]}] } end diff --git a/lib/holidays/scandinavia.rb b/lib/holidays/scandinavia.rb index f0535e4..8702b61 100644 --- a/lib/holidays/scandinavia.rb +++ b/lib/holidays/scandinavia.rb @@ -16,8 +16,8 @@ module Holidays HOLIDAYS_BY_MONTH = { 5 => [{:mday => 1, :name => "Arbejdernes kampdag", :regions => [:dk]}, {:mday => 5, :type => :informal, :name => "Danmarks befrielse", :regions => [:dk]}, - {:mday => 3, :type => :informal, :name => "Sjómannadagurinn", :regions => [:is]}, - {:mday => 17, :name => "Lýðveldisdagurinn", :regions => [:is]}, + {:mday => 1, :name => "Verkalýðsdagurinn", :regions => [:is]}, + {:mday => 13, :name => "Mæðradagurinn", :regions => [:is]}, {:mday => 1, :name => "Första maj", :regions => [:se]}], 0 => [{:function => lambda { |year| Holidays.easter(year)-49 }, :function_id => "easter(year)-49", :type => :informal, :name => "Fastelavn", :regions => [:dk]}, {:function => lambda { |year| Holidays.easter(year)-7 }, :function_id => "easter(year)-7", :name => "Palmesøndag", :regions => [:dk]}, @@ -25,7 +25,7 @@ module Holidays {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Langfredag", :regions => [:dk]}, {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Påskedag", :regions => [:dk]}, {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "2. påskedag", :regions => [:dk]}, - {:function => lambda { |year| Holidays.easter(year)+26 }, :function_id => "easter(year)+26", :name => "Store Bededag", :regions => [:dk, :is]}, + {:function => lambda { |year| Holidays.easter(year)+26 }, :function_id => "easter(year)+26", :name => "Store Bededag", :regions => [:dk]}, {:function => lambda { |year| Holidays.easter(year)+39 }, :function_id => "easter(year)+39", :name => "Kristi Himmelfartsdag", :regions => [:dk]}, {:function => lambda { |year| Holidays.easter(year)+49 }, :function_id => "easter(year)+49", :name => "Pinsedag", :regions => [:dk]}, {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "2. Pinsedag", :regions => [:dk]}, @@ -37,9 +37,9 @@ module Holidays {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Föstudaginn langi", :regions => [:is]}, {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Páskadagur", :regions => [:is]}, {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Annar í páskum", :regions => [:is]}, - {:function => lambda { |year| Holidays.easter(year)+40 }, :function_id => "easter(year)+40", :name => "Kristi Himmelfartsdag", :regions => [:is, :is]}, - {:function => lambda { |year| Holidays.easter(year)+49 }, :function_id => "easter(year)+49", :name => "2. Pinsedag", :regions => [:is]}, - {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "Pinsedag", :regions => [:is]}, + {:function => lambda { |year| Holidays.easter(year)+39 }, :function_id => "easter(year)+39", :name => "Uppstigningardagur", :regions => [:is]}, + {:function => lambda { |year| Holidays.easter(year)+49 }, :function_id => "easter(year)+49", :name => "Hvítasunnudagur", :regions => [:is]}, + {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "Annar í hvítasunnu", :regions => [:is]}, {: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]}, @@ -51,6 +51,8 @@ module Holidays 6 => [{:mday => 5, :name => "Grundlovsdag", :regions => [:dk]}, {:mday => 15, :type => :informal, :name => "Valdemarsdag og Genforeningsdag", :regions => [:dk]}, {:mday => 23, :type => :informal, :name => "Sankt Hans aften", :regions => [:dk]}, + {:mday => 3, :type => :informal, :name => "Sjómannadagurinn", :regions => [:is]}, + {:mday => 17, :name => "Lýðveldisdagurinn", :regions => [:is]}, {: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 => "Nytårsdag", :regions => [:dk]}, @@ -73,7 +75,8 @@ module Holidays 8 => [{:wday => 1, :week => 1, :name => "Frídagur verslunarmanna", :regions => [:is]}], 4 => [{:mday => 1, :type => :informal, :name => "1. april", :regions => [:dk]}, {:mday => 9, :type => :informal, :name => "Danmarks besættelse", :regions => [:dk]}, - {:mday => 16, :type => :informal, :name => "Dronningens fødselsdag", :regions => [:dk]}] + {:mday => 16, :type => :informal, :name => "Dronningens fødselsdag", :regions => [:dk]}, + {:function => lambda { |year| Holidays.is_sumardagurinn_fyrsti(year) }, :function_id => "is_sumardagurinn_fyrsti(year)", :name => "Sumardagurinn fyrsti", :regions => [:is]}] } end diff --git a/test/test_region_dk.rb b/test/test_region_dk.rb deleted file mode 100644 index 7bd8ee9..0000000 --- a/test/test_region_dk.rb +++ /dev/null @@ -1,26 +0,0 @@ -require File.dirname(__FILE__) + '/test_helper' -require 'holidays/dk' - -class DKTests < Test::Unit::TestCase - def test_dk - {Date.civil(2007,1,1) => 'Nytårsdag', - Date.civil(2007,2,18) => 'Fastelavn', - Date.civil(2007,4,9) => 'Danmarks besættelse', - Date.civil(2007,4,16) => 'Dronningens fødselsdag', - Date.civil(2007,4,5) => 'Skærtorsdag', - Date.civil(2007,4,6) => 'Langfredag', - Date.civil(2007,4,8) => 'Påskedag', - Date.civil(2007,4,9) => '2. påskedag', - Date.civil(2007,5,1) => 'Arbejdernes kampdag', - Date.civil(2007,5,4) => 'Store Bededag', - Date.civil(2007,5,17) => 'Kristi Himmelfartsdag', - Date.civil(2007,5,27) => 'Pinsedag', - Date.civil(2007,5,28) => '2. Pinsedag', - Date.civil(2007,6,5) => 'Grundlovsdag', - Date.civil(2007,12,24) => 'Juleaftensdag', - Date.civil(2007,12,25) => '1. juledag', - Date.civil(2007,12,26) => '2. juledag'}.each do |date, name| - assert_equal name, Holidays.on(date, :dk, :informal)[0][:name] - end - end -end diff --git a/test/test_region_europe.rb b/test/test_region_europe.rb index bd45ede..f20fb71 100644 --- a/test/test_region_europe.rb +++ b/test/test_region_europe.rb @@ -39,6 +39,27 @@ class EuropeTests < Test::Unit::TestCase assert_equal 'Buß- und Bettag', Date.civil(2009,11,18).holidays(:de_sn)[0][:name] end + def test_dk + {Date.civil(2007,1,1) => 'Nytårsdag', + Date.civil(2007,2,18) => 'Fastelavn', + Date.civil(2007,4,9) => 'Danmarks besættelse', + Date.civil(2007,4,16) => 'Dronningens fødselsdag', + Date.civil(2007,4,5) => 'Skærtorsdag', + Date.civil(2007,4,6) => 'Langfredag', + Date.civil(2007,4,8) => 'Påskedag', + Date.civil(2007,4,9) => '2. påskedag', + Date.civil(2007,5,1) => 'Arbejdernes kampdag', + Date.civil(2007,5,4) => 'Store Bededag', + Date.civil(2007,5,17) => 'Kristi Himmelfartsdag', + Date.civil(2007,5,27) => 'Pinsedag', + Date.civil(2007,5,28) => '2. Pinsedag', + Date.civil(2007,6,5) => 'Grundlovsdag', + Date.civil(2007,12,24) => 'Juleaftensdag', + Date.civil(2007,12,25) => '1. juledag', + Date.civil(2007,12,26) => '2. juledag'}.each do |date, name| + assert_equal name, Holidays.on(date, :dk, :informal)[0][:name] + end + end def test_es {Date.civil(2009,1,1) => 'Año Nuevo', @@ -171,6 +192,30 @@ class EuropeTests < Test::Unit::TestCase assert_equal name, Holidays.on(date, :it, :informal)[0][:name] end end + def test_is + {Date.civil(2007,1,1) => 'Nýársdagur', + Date.civil(2007,1,6) => 'Þrettándinn', + Date.civil(2007,1,19) => 'Bóndadagur', + Date.civil(2007,2,18) => 'Konudagur', + Date.civil(2007,4,5) => 'Skírdagur', + Date.civil(2007,4,6) => 'Föstudaginn langi', + Date.civil(2007,4,8) => 'Páskadagur', + Date.civil(2007,4,9) => 'Annar í páskum', + Date.civil(2007,4,19) => 'Sumardagurinn fyrsti', + Date.civil(2007,5,1) => 'Verkalýðsdagurinn', + Date.civil(2007,5,17) => 'Uppstigningardagur', + Date.civil(2007,5,27) => 'Hvítasunnudagur', + Date.civil(2007,5,28) => 'Annar í hvítasunnu', + Date.civil(2007,6,3) => 'Sjómannadagurinn', + Date.civil(2007,6,17) => 'Lýðveldisdagurinn', + Date.civil(2007,8,6) => 'Frídagur verslunarmanna', + Date.civil(2007,12,24) => 'Jól', + Date.civil(2007,12,25) => 'Jól', + Date.civil(2007,12,26) => 'Jól', + Date.civil(2007,12,31) => 'Gamlárskvöld'}.each do |date, name| + assert_equal name, Holidays.on(date, :is, :informal)[0][:name] + end + end def test_nl {Date.civil(2008,1,1) => 'Nieuwjaar',