holiday: pass struct to Clone vs fixed args

rickar · Jun 19, 2020 · 3414841 · 3414841
1 parent 8640818
commit 3414841
Show file tree

Hide file tree

Showing 23 changed files with 229 additions and 180 deletions.
diff --git a/v2/at/at_holidays.go b/v2/at/at_holidays.go
@@ -12,28 +12,28 @@ import (
 
 var (
 	// Neujahr represents New Year's Day on 1-Jan
-	Neujahr = aa.NewYear.Clone("Neujahrstag", cal.ObservancePublic, nil)
+	Neujahr = aa.NewYear.Clone(&cal.Holiday{Name: "Neujahrstag", Type: cal.ObservancePublic})
 
 	// HeiligeDreiKoenige represents Epiphany on 6-Jan
-	HeiligeDreiKoenige = aa.Epiphany.Clone("Heilige Drei Könige", cal.ObservancePublic, nil)
+	HeiligeDreiKoenige = aa.Epiphany.Clone(&cal.Holiday{Name: "Heilige Drei Könige", Type: cal.ObservancePublic})
 
 	// Ostermontag represents Easter Monday on the day after Easter
-	Ostermontag = aa.EasterMonday.Clone("Ostermontag", cal.ObservancePublic, nil)
+	Ostermontag = aa.EasterMonday.Clone(&cal.Holiday{Name: "Ostermontag", Type: cal.ObservancePublic})
 
 	// TagderArbeit represents Labor Day on the first Monday in May
-	TagderArbeit = aa.WorkersDay.Clone("Tag der Arbeit", cal.ObservancePublic, nil)
+	TagderArbeit = aa.WorkersDay.Clone(&cal.Holiday{Name: "Tag der Arbeit", Type: cal.ObservancePublic})
 
 	// ChristiHimmelfahrt represents Ascension Day on the 39th day after Easter
-	ChristiHimmelfahrt = aa.AscensionDay.Clone("Christi Himmelfahrt", cal.ObservancePublic, nil)
+	ChristiHimmelfahrt = aa.AscensionDay.Clone(&cal.Holiday{Name: "Christi Himmelfahrt", Type: cal.ObservancePublic})
 
 	// Pfingstmontag represents Pentecost Monday on the day after Pentecost (50 days after Easter)
-	Pfingstmontag = aa.PentecostMonday.Clone("Pfingstmontag", cal.ObservancePublic, nil)
+	Pfingstmontag = aa.PentecostMonday.Clone(&cal.Holiday{Name: "Pfingstmontag", Type: cal.ObservancePublic})
 
 	// Fronleichnam represents Corpus Christi on the 60th day after Easter
-	Fronleichnam = aa.CorpusChristi.Clone("Fronleichnam", cal.ObservancePublic, nil)
+	Fronleichnam = aa.CorpusChristi.Clone(&cal.Holiday{Name: "Fronleichnam", Type: cal.ObservancePublic})
 
 	// MariaHimmelfahrt represents Assumption of Mary on 15-Aug
-	MariaHimmelfahrt = aa.AssumptionOfMary.Clone("Mariä Himmelfahrt", cal.ObservancePublic, nil)
+	MariaHimmelfahrt = aa.AssumptionOfMary.Clone(&cal.Holiday{Name: "Mariä Himmelfahrt", Type: cal.ObservancePublic})
 
 	// Nationalfeiertag represents National Day on 26-Oct
 	Nationalfeiertag = &cal.Holiday{
@@ -45,16 +45,16 @@ var (
 	}
 
 	// Allerheiligen represents All Saints' Day on 1-Nov
-	Allerheiligen = aa.AllSaintsDay.Clone("Allerheiligen", cal.ObservancePublic, nil)
+	Allerheiligen = aa.AllSaintsDay.Clone(&cal.Holiday{Name: "Allerheiligen", Type: cal.ObservancePublic})
 
 	// MariaEmpfaengnis represents Immaculate Conception on 8-Dec
-	MariaEmpfaengnis = aa.ImmaculateConception.Clone("Mariä Empfängnis", cal.ObservancePublic, nil)
+	MariaEmpfaengnis = aa.ImmaculateConception.Clone(&cal.Holiday{Name: "Mariä Empfängnis", Type: cal.ObservancePublic})
 
 	// Christtag represents Christmas Day on 25-Dec
-	Christtag = aa.ChristmasDay.Clone("Christtag", cal.ObservancePublic, nil)
+	Christtag = aa.ChristmasDay.Clone(&cal.Holiday{Name: "Christtag", Type: cal.ObservancePublic})
 
 	// Stefanitag represents St. Stephen's Day on 26-Dec
-	Stefanitag = aa.ChristmasDay2.Clone("Stefanitag", cal.ObservancePublic, nil)
+	Stefanitag = aa.ChristmasDay2.Clone(&cal.Holiday{Name: "Stefanitag", Type: cal.ObservancePublic})
 
 	// Holidays provides a list of the standard national holidays
 	Holidays = []*cal.Holiday{

diff --git a/v2/au/au_holidays.go b/v2/au/au_holidays.go
@@ -20,7 +20,7 @@ var (
 	}
 
 	// NewYear represents New Year's Day on 1-Jan
-	NewYear = aa.NewYear.Clone("New Year's Day", cal.ObservancePublic, weekendAlt)
+	NewYear = aa.NewYear.Clone(&cal.Holiday{Name: "New Year's Day", Type: cal.ObservancePublic, Observed: weekendAlt})
 
 	// AustraliaDay represents Australia Day on 26-Jan
 	AustraliaDay = &cal.Holiday{
@@ -33,10 +33,10 @@ var (
 	}
 
 	// GoodFriday represents Good Friday - two days before Easter
-	GoodFriday = aa.GoodFriday.Clone("Good Friday", cal.ObservancePublic, nil)
+	GoodFriday = aa.GoodFriday.Clone(&cal.Holiday{Name: "Good Friday", Type: cal.ObservancePublic})
 
 	// EasterMonday represents Easter Monday - the day after Easter
-	EasterMonday = aa.EasterMonday.Clone("Easter Monday", cal.ObservancePublic, nil)
+	EasterMonday = aa.EasterMonday.Clone(&cal.Holiday{Name: "Easter Monday", Type: cal.ObservancePublic})
 
 	// LabourDayWa represents Labour Day in WA on the first Monday of March
 	LabourDayWa = &cal.Holiday{
@@ -180,21 +180,21 @@ var (
 	}
 
 	// ChristmasDay represents Christmas Day on 25-Dec
-	ChristmasDay = aa.ChristmasDay.Clone("Christmas Day", cal.ObservanceBank, weekendAlt)
+	ChristmasDay = aa.ChristmasDay.Clone(&cal.Holiday{Name: "Christmas Day", Type: cal.ObservanceBank, Observed: weekendAlt})
 
 	// BoxingDay represents Boxing Day on 26-Dec
-	BoxingDay = aa.ChristmasDay2.Clone("Boxing Day", cal.ObservanceBank,
-		[]cal.AltDay{
+	BoxingDay = aa.ChristmasDay2.Clone(&cal.Holiday{Name: "Boxing Day", Type: cal.ObservanceBank,
+		Observed: []cal.AltDay{
 			{Day: time.Saturday, Offset: 2},
 			{Day: time.Sunday, Offset: 2},
-			{Day: time.Monday, Offset: 1}})
+			{Day: time.Monday, Offset: 1}}})
 
 	// ProclamationDay represents Proclamation Day on 26-Dec
-	ProclamationDay = aa.ChristmasDay2.Clone("Proclamation Day", cal.ObservanceBank,
-		[]cal.AltDay{
+	ProclamationDay = aa.ChristmasDay2.Clone(&cal.Holiday{Name: "Proclamation Day", Type: cal.ObservanceBank,
+		Observed: []cal.AltDay{
 			{Day: time.Saturday, Offset: 2},
 			{Day: time.Sunday, Offset: 2},
-			{Day: time.Monday, Offset: 1}})
+			{Day: time.Monday, Offset: 1}}})
 
 	// HolidaysACT provides a list of standard holidays in the Australian Capital Territory region.
 	HolidaysACT = []*cal.Holiday{

diff --git a/v2/be/be_holidays.go b/v2/be/be_holidays.go
@@ -12,19 +12,19 @@ import (
 
 var (
 	// Nieuwjaar represents New Year's Day on 1-Jan
-	Nieuwjaar = aa.NewYear.Clone("Nieuwjaarsdag", cal.ObservancePublic, nil)
+	Nieuwjaar = aa.NewYear.Clone(&cal.Holiday{Name: "Nieuwjaarsdag", Type: cal.ObservancePublic})
 
 	// Paasmaandag represents Easter Monday on the day after Easter
-	Paasmaandag = aa.EasterMonday.Clone("Paasmaandag", cal.ObservancePublic, nil)
+	Paasmaandag = aa.EasterMonday.Clone(&cal.Holiday{Name: "Paasmaandag", Type: cal.ObservancePublic})
 
 	// DagVanDeArbeid represents Labor Day on the first Monday in May
-	DagVanDeArbeid = aa.WorkersDay.Clone("Dag van de Arbeid", cal.ObservancePublic, nil)
+	DagVanDeArbeid = aa.WorkersDay.Clone(&cal.Holiday{Name: "Dag van de Arbeid", Type: cal.ObservancePublic})
 
 	// OnzeLieveHeerHemelvaart represents Ascension Day on the 39th day after Easter
-	OnzeLieveHeerHemelvaart = aa.AscensionDay.Clone("Onze Lieve Heer Hemelvaart", cal.ObservancePublic, nil)
+	OnzeLieveHeerHemelvaart = aa.AscensionDay.Clone(&cal.Holiday{Name: "Onze Lieve Heer Hemelvaart", Type: cal.ObservancePublic})
 
 	// Pinkstermaandag represents Pentecost Monday on the day after Pentecost (50 days after Easter)
-	Pinkstermaandag = aa.PentecostMonday.Clone("Pinkstermaandag", cal.ObservancePublic, nil)
+	Pinkstermaandag = aa.PentecostMonday.Clone(&cal.Holiday{Name: "Pinkstermaandag", Type: cal.ObservancePublic})
 
 	// NationaleFeestdag represents Belgian National Day on 21-Jul
 	NationaleFeestdag = &cal.Holiday{
@@ -36,16 +36,16 @@ var (
 	}
 
 	// OnzeLieveVrouwHemelvaart represents Assumption of Mary on 15-Aug
-	OnzeLieveVrouwHemelvaart = aa.AssumptionOfMary.Clone("Onze Lieve Vrouw Hemelvaart", cal.ObservancePublic, nil)
+	OnzeLieveVrouwHemelvaart = aa.AssumptionOfMary.Clone(&cal.Holiday{Name: "Onze Lieve Vrouw Hemelvaart", Type: cal.ObservancePublic})
 
 	// Allerheiligen represents All Saints' Day on 1-Nov
-	Allerheiligen = aa.AllSaintsDay.Clone("Allerheiligen", cal.ObservancePublic, nil)
+	Allerheiligen = aa.AllSaintsDay.Clone(&cal.Holiday{Name: "Allerheiligen", Type: cal.ObservancePublic})
 
 	// Wapenstilstand represents Armistice Day on 11-Nov
-	Wapenstilstand = aa.ArmisticeDay.Clone("Wapenstilstand", cal.ObservancePublic, nil)
+	Wapenstilstand = aa.ArmisticeDay.Clone(&cal.Holiday{Name: "Wapenstilstand", Type: cal.ObservancePublic})
 
 	// Kerstmis represents Christmas Day on 25-Dec
-	Kerstmis = aa.ChristmasDay.Clone("Kerstmis", cal.ObservancePublic, nil)
+	Kerstmis = aa.ChristmasDay.Clone(&cal.Holiday{Name: "Kerstmis", Type: cal.ObservancePublic})
 
 	// Holidays provides a list of the standard national holidays
 	Holidays = []*cal.Holiday{

diff --git a/v2/ca/ca_holidays.go b/v2/ca/ca_holidays.go
@@ -18,17 +18,17 @@ var (
 	}
 
 	// NewYear represents New Year's Day on 1-Jan
-	NewYear = aa.NewYear.Clone("New Year's Day", cal.ObservancePublic,
-		[]cal.AltDay{
+	NewYear = aa.NewYear.Clone(&cal.Holiday{Name: "New Year's Day", Type: cal.ObservancePublic,
+		Observed: []cal.AltDay{
 			{Day: time.Saturday, Offset: 2},
 			{Day: time.Sunday, Offset: 1},
-		})
+		}})
 
 	// GoodFriday represents Good Friday - two days before Easter
-	GoodFriday = aa.GoodFriday.Clone("Good Friday", cal.ObservancePublic, nil)
+	GoodFriday = aa.GoodFriday.Clone(&cal.Holiday{Name: "Good Friday", Type: cal.ObservancePublic})
 
 	// EasterMonday represents Easter Monday - the day after Easter
-	EasterMonday = aa.EasterMonday.Clone("Easter Monday", cal.ObservancePublic, nil)
+	EasterMonday = aa.EasterMonday.Clone(&cal.Holiday{Name: "Easter Monday", Type: cal.ObservancePublic})
 
 	// VictoriaDay represents Victoria Day on the Monday before 25-May
 	VictoriaDay = &cal.Holiday{
@@ -81,18 +81,18 @@ var (
 	}
 
 	// RemembranceDay represents Remembrance Day on 11-Nov
-	RemembranceDay = aa.ArmisticeDay.Clone("Remembrance Day", cal.ObservancePublic, weekendAlt)
+	RemembranceDay = aa.ArmisticeDay.Clone(&cal.Holiday{Name: "Remembrance Day", Type: cal.ObservancePublic, Observed: weekendAlt})
 
 	// ChristmasDay represents Christmas Day on 25-Dec
-	ChristmasDay = aa.ChristmasDay.Clone("Christmas Day", cal.ObservanceBank,
-		[]cal.AltDay{
+	ChristmasDay = aa.ChristmasDay.Clone(&cal.Holiday{Name: "Christmas Day", Type: cal.ObservanceBank,
+		Observed: []cal.AltDay{
 			{Day: time.Saturday, Offset: -1},
 			{Day: time.Sunday, Offset: 1},
-		})
+		}})
 
 	// BoxingDay represents Boxing Day on 26-Dec
-	BoxingDay = aa.ChristmasDay2.Clone("Boxing Day", cal.ObservanceBank,
-		[]cal.AltDay{{Day: time.Monday, Offset: 1}})
+	BoxingDay = aa.ChristmasDay2.Clone(&cal.Holiday{Name: "Boxing Day", Type: cal.ObservanceBank,
+		Observed: []cal.AltDay{{Day: time.Monday, Offset: 1}}})
 
 	// Holidays provides a list of the standard national holidays
 	Holidays = []*cal.Holiday{

diff --git a/v2/cz/cz_holidays.go b/v2/cz/cz_holidays.go
@@ -12,16 +12,16 @@ import (
 
 var (
 	// NewYear represents New Year's Day on 1-Jan
-	NewYear = aa.NewYear.Clone("Nový rok", cal.ObservancePublic, nil)
+	NewYear = aa.NewYear.Clone(&cal.Holiday{Name: "Nový rok", Type: cal.ObservancePublic})
 
 	// GoodFriday represents Good Friday - two days before Easter
-	GoodFriday = aa.GoodFriday.Clone("Velký pátek", cal.ObservancePublic, nil)
+	GoodFriday = aa.GoodFriday.Clone(&cal.Holiday{Name: "Velký pátek", Type: cal.ObservancePublic})
 
 	// EasterMonday represents Easter Monday - the day after Easter
-	EasterMonday = aa.EasterMonday.Clone("Velikonoční pondělí", cal.ObservancePublic, nil)
+	EasterMonday = aa.EasterMonday.Clone(&cal.Holiday{Name: "Velikonoční pondělí", Type: cal.ObservancePublic})
 
 	// LabourDay represents Labour Day on 1-May
-	LabourDay = aa.WorkersDay.Clone("Svátek práce", cal.ObservancePublic, nil)
+	LabourDay = aa.WorkersDay.Clone(&cal.Holiday{Name: "Svátek práce", Type: cal.ObservancePublic})
 
 	// LiberationDay represents Liberation Day on 8-May
 	LiberationDay = &cal.Holiday{
@@ -87,10 +87,10 @@ var (
 	}
 
 	// ChristmasDay represents Christmas Day on 25-Dec
-	ChristmasDay = aa.ChristmasDay.Clone("1. svátek vánoční", cal.ObservancePublic, nil)
+	ChristmasDay = aa.ChristmasDay.Clone(&cal.Holiday{Name: "1. svátek vánoční", Type: cal.ObservancePublic})
 
 	// SaintStephensDay represents Saints Stephen's Day on 26-Dec
-	SaintStephensDay = aa.ChristmasDay2.Clone("2. svátek vánoční", cal.ObservancePublic, nil)
+	SaintStephensDay = aa.ChristmasDay2.Clone(&cal.Holiday{Name: "2. svátek vánoční", Type: cal.ObservancePublic})
 
 	// Holidays provides a list of the standard national holidays
 	Holidays = []*cal.Holiday{

diff --git a/v2/de/de_holidays.go b/v2/de/de_holidays.go
@@ -12,10 +12,10 @@ import (
 
 var (
 	// Neujahr represents New Year's Day on 1-Jan
-	Neujahr = aa.NewYear.Clone("Neujahrstag", cal.ObservancePublic, nil)
+	Neujahr = aa.NewYear.Clone(&cal.Holiday{Name: "Neujahrstag", Type: cal.ObservancePublic})
 
 	// HeiligeDreiKoenige represents Epiphany on 6-Jan
-	HeiligeDreiKoenige = aa.Epiphany.Clone("Heilige Drei Könige", cal.ObservancePublic, nil)
+	HeiligeDreiKoenige = aa.Epiphany.Clone(&cal.Holiday{Name: "Heilige Drei Könige", Type: cal.ObservancePublic})
 
 	// Frauentag represents Women's Day on 8-Mar
 	Frauentag = &cal.Holiday{
@@ -27,25 +27,25 @@ var (
 	}
 
 	// Karfreitag represents Good Friday on the Friday before Easter
-	Karfreitag = aa.GoodFriday.Clone("Karfreitag", cal.ObservancePublic, nil)
+	Karfreitag = aa.GoodFriday.Clone(&cal.Holiday{Name: "Karfreitag", Type: cal.ObservancePublic})
 
 	// Ostermontag represents Easter Monday on the day after Easter
-	Ostermontag = aa.EasterMonday.Clone("Ostermontag", cal.ObservancePublic, nil)
+	Ostermontag = aa.EasterMonday.Clone(&cal.Holiday{Name: "Ostermontag", Type: cal.ObservancePublic})
 
 	// TagderArbeit represents Labour Day on 1-May
-	TagderArbeit = aa.WorkersDay.Clone("Tag der Arbeit", cal.ObservancePublic, nil)
+	TagderArbeit = aa.WorkersDay.Clone(&cal.Holiday{Name: "Tag der Arbeit", Type: cal.ObservancePublic})
 
 	// ChristiHimmelfahrt represents Ascension Day on the 39th day after Easter
-	ChristiHimmelfahrt = aa.AscensionDay.Clone("Christi Himmelfahrt", cal.ObservancePublic, nil)
+	ChristiHimmelfahrt = aa.AscensionDay.Clone(&cal.Holiday{Name: "Christi Himmelfahrt", Type: cal.ObservancePublic})
 
 	// Pfingstmontag represents Pentecost Monday on the day after Pentecost (50 days after Easter)
-	Pfingstmontag = aa.PentecostMonday.Clone("Pfingstmontag", cal.ObservancePublic, nil)
+	Pfingstmontag = aa.PentecostMonday.Clone(&cal.Holiday{Name: "Pfingstmontag", Type: cal.ObservancePublic})
 
 	// Fronleichnam represents Corpus Christi on the 60th day after Easter
-	Fronleichnam = aa.CorpusChristi.Clone("Fronleichnam", cal.ObservancePublic, nil)
+	Fronleichnam = aa.CorpusChristi.Clone(&cal.Holiday{Name: "Fronleichnam", Type: cal.ObservancePublic})
 
 	// MariaHimmelfahrt represents Assumption of Mary on 15-Aug
-	MariaHimmelfahrt = aa.AssumptionOfMary.Clone("Mariä Himmelfahrt", cal.ObservancePublic, nil)
+	MariaHimmelfahrt = aa.AssumptionOfMary.Clone(&cal.Holiday{Name: "Mariä Himmelfahrt", Type: cal.ObservancePublic})
 
 	// Weltkindertag represents World Children's Day on 20-Sep
 	Weltkindertag = &cal.Holiday{
@@ -76,7 +76,7 @@ var (
 	}
 
 	// Allerheiligen represents All Saints' Day on 1-Nov
-	Allerheiligen = aa.AllSaintsDay.Clone("Allerheiligen", cal.ObservancePublic, nil)
+	Allerheiligen = aa.AllSaintsDay.Clone(&cal.Holiday{Name: "Allerheiligen", Type: cal.ObservancePublic})
 
 	// BussUndBettag represents Repentance and Prayer Day on the first Wednesday between 16-22 Nov
 	BussUndBettag = &cal.Holiday{
@@ -90,10 +90,10 @@ var (
 	}
 
 	// Weihnachtstag represents Christmas Day on 25-Dec
-	Weihnachtstag = aa.ChristmasDay.Clone("Weihnachtstag", cal.ObservancePublic, nil)
+	Weihnachtstag = aa.ChristmasDay.Clone(&cal.Holiday{Name: "Weihnachtstag", Type: cal.ObservancePublic})
 
 	// ZweiterWeihnachtsfeiertag represents Boxing Day on 26-Dec
-	ZweiterWeihnachtsfeiertag = aa.ChristmasDay2.Clone("Zweiter Weihnachtsfeiertag", cal.ObservancePublic, nil)
+	ZweiterWeihnachtsfeiertag = aa.ChristmasDay2.Clone(&cal.Holiday{Name: "Zweiter Weihnachtsfeiertag", Type: cal.ObservancePublic})
 
 	// Holidays provides a list of the standard national holidays
 	Holidays = []*cal.Holiday{

diff --git a/v2/dk/dk_holidays.go b/v2/dk/dk_holidays.go
@@ -12,16 +12,16 @@ import (
 
 var (
 	// Nytaarsdag represents New Year's Day on 1-Jan
-	Nytaarsdag = aa.NewYear.Clone("Nytårsdag", cal.ObservancePublic, nil)
+	Nytaarsdag = aa.NewYear.Clone(&cal.Holiday{Name: "Nytårsdag", Type: cal.ObservancePublic})
 
 	// Skaertorsdag represents Maundy Thursday on the Thursday before Easter
-	Skaertorsdag = aa.MaundyThursday.Clone("Skærtorsdag", cal.ObservancePublic, nil)
+	Skaertorsdag = aa.MaundyThursday.Clone(&cal.Holiday{Name: "Skærtorsdag", Type: cal.ObservancePublic})
 
 	// Langfredag represents Good Friday on the Friday before Easter
-	Langfredag = aa.GoodFriday.Clone("Langfredag", cal.ObservancePublic, nil)
+	Langfredag = aa.GoodFriday.Clone(&cal.Holiday{Name: "Langfredag", Type: cal.ObservancePublic})
 
 	// AndenPaaskedag represents Easter Monday on the day after Easter
-	AndenPaaskedag = aa.EasterMonday.Clone("Anden påskedag", cal.ObservancePublic, nil)
+	AndenPaaskedag = aa.EasterMonday.Clone(&cal.Holiday{Name: "Anden påskedag", Type: cal.ObservancePublic})
 
 	// StoreBededag represents General Prayer Day on the fourth Friday after Easter
 	StoreBededag = &cal.Holiday{
@@ -32,10 +32,10 @@ var (
 	}
 
 	// KristiHimmelfartsdag represents Ascension Day on the 39th day after Easter
-	KristiHimmelfartsdag = aa.AscensionDay.Clone("Kristi Himmelfartsdag", cal.ObservancePublic, nil)
+	KristiHimmelfartsdag = aa.AscensionDay.Clone(&cal.Holiday{Name: "Kristi Himmelfartsdag", Type: cal.ObservancePublic})
 
 	// AndenPinsedag represents Pentecost Monday on the day after Pentecost (50 days after Easter)
-	AndenPinsedag = aa.PentecostMonday.Clone("Anden Pinsedag", cal.ObservancePublic, nil)
+	AndenPinsedag = aa.PentecostMonday.Clone(&cal.Holiday{Name: "Anden Pinsedag", Type: cal.ObservancePublic})
 
 	// Grundlovsdag represents Constitution Day on 5-Jun
 	Grundlovsdag = &cal.Holiday{
@@ -47,10 +47,10 @@ var (
 	}
 
 	// Juledag represents Christmas Day on 25-Dec
-	Juledag = aa.ChristmasDay.Clone("Juledag", cal.ObservancePublic, nil)
+	Juledag = aa.ChristmasDay.Clone(&cal.Holiday{Name: "Juledag", Type: cal.ObservancePublic})
 
 	// AndenJuledag represents the second day of Christmas on 26-Dec
-	AndenJuledag = aa.ChristmasDay2.Clone("Anden juledag", cal.ObservancePublic, nil)
+	AndenJuledag = aa.ChristmasDay2.Clone(&cal.Holiday{Name: "Anden juledag", Type: cal.ObservancePublic})
 
 	// Holidays provides a list of the standard national holidays
 	Holidays = []*cal.Holiday{

diff --git a/v2/ecb/ecb_holidays.go b/v2/ecb/ecb_holidays.go
@@ -10,22 +10,22 @@ import (
 
 var (
 	// NewYear represents New Year's Day on 1-Jan
-	NewYear = aa.NewYear.Clone("New Year's Day", cal.ObservanceBank, nil)
+	NewYear = aa.NewYear.Clone(&cal.Holiday{Name: "New Year's Day", Type: cal.ObservanceBank})
 
 	// GoodFriday represents Good Friday - two days before Easter
-	GoodFriday = aa.GoodFriday.Clone("Good Friday", cal.ObservanceBank, nil)
+	GoodFriday = aa.GoodFriday.Clone(&cal.Holiday{Name: "Good Friday", Type: cal.ObservanceBank})
 
 	// EasterMonday represents Easter Monday - the day after Easter
-	EasterMonday = aa.EasterMonday.Clone("Easter Monday", cal.ObservanceBank, nil)
+	EasterMonday = aa.EasterMonday.Clone(&cal.Holiday{Name: "Easter Monday", Type: cal.ObservanceBank})
 
 	// LabourDay represents Labour Day on 1-May
-	LabourDay = aa.WorkersDay.Clone("Labour Day", cal.ObservanceBank, nil)
+	LabourDay = aa.WorkersDay.Clone(&cal.Holiday{Name: "Labour Day", Type: cal.ObservanceBank})
 
 	// ChristmasDay represents Christmas Day on 25-Dec
-	ChristmasDay = aa.ChristmasDay.Clone("Christmas Day", cal.ObservanceBank, nil)
+	ChristmasDay = aa.ChristmasDay.Clone(&cal.Holiday{Name: "Christmas Day", Type: cal.ObservanceBank})
 
 	// ChristmasHoliday represents the day after Christmas on 26-Dec
-	ChristmasHoliday = aa.ChristmasDay2.Clone("Christmas Holiday", cal.ObservanceBank, nil)
+	ChristmasHoliday = aa.ChristmasDay2.Clone(&cal.Holiday{Name: "Christmas Holiday", Type: cal.ObservanceBank})
 
 	// Holidays provides a list of the standard ECB holidays
 	Holidays = []*cal.Holiday{