From c816e0792a57141041114c45496d4141fea315c1 Mon Sep 17 00:00:00 2001
From: Alberto Spelta <albertospelta@users.noreply.github.com>
Date: Tue, 26 Mar 2024 13:41:53 +0100
Subject: [PATCH 1/2] Update HolidaysDefinition.json from
 https://github.com/sql-bi/Bravo/pull/771

---
 src/Dax.Template.TestUI/Templates/HolidaysDefinition.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Dax.Template.TestUI/Templates/HolidaysDefinition.json b/src/Dax.Template.TestUI/Templates/HolidaysDefinition.json
index 5d648b0..1455d70 100644
--- a/src/Dax.Template.TestUI/Templates/HolidaysDefinition.json
+++ b/src/Dax.Template.TestUI/Templates/HolidaysDefinition.json
@@ -131,7 +131,7 @@
       "OffsetWeek": 0,
       "OffsetDays": 0,
       "HolidayName": "Christmas Day",
-      "SubstituteHoliday": "NoSubstituteHoliday",
+      "SubstituteHoliday": "FridayIfSaturdayOrMondayIfSunday",
       "ConflictPriority": 100
     },
 

From 84874387f0546690fdecbaa384dea7c062a43563 Mon Sep 17 00:00:00 2001
From: Alberto Spelta <albertospelta@users.noreply.github.com>
Date: Tue, 26 Mar 2024 13:45:02 +0100
Subject: [PATCH 2/2] Update HolidaysDefinition.json from
 https://github.com/sql-bi/Bravo/pull/695

---
 .../Templates/HolidaysDefinition.json         | 143 ++++++++++++++++++
 1 file changed, 143 insertions(+)

diff --git a/src/Dax.Template.TestUI/Templates/HolidaysDefinition.json b/src/Dax.Template.TestUI/Templates/HolidaysDefinition.json
index 1455d70..a966e96 100644
--- a/src/Dax.Template.TestUI/Templates/HolidaysDefinition.json
+++ b/src/Dax.Template.TestUI/Templates/HolidaysDefinition.json
@@ -2309,6 +2309,149 @@
       "HolidayName": "国庆节",
       "SubstituteHoliday": "NoSubstituteHoliday",
       "ConflictPriority": 100
+    },
+    {
+      "IsoCountry": "IS",
+      "MonthNumber": 1,
+      "DayNumber": 1,
+      "WeekDayNumber": 0,
+      "OffsetWeek": 0,
+      "OffsetDays": 0,
+      "HolidayName": "Nýársdagur",
+      "SubstituteHoliday": "NoSubstituteHoliday",
+      "ConflictPriority": 100
+    },
+    {
+      "IsoCountry": "IS",
+      "MonthNumber": 99,
+      "DayNumber": -3,
+      "WeekDayNumber": 0,
+      "OffsetWeek": 0,
+      "OffsetDays": 0,
+      "HolidayName": "Skírdagur",
+      "SubstituteHoliday": "NoSubstituteHoliday",
+      "ConflictPriority": 50
+    },
+    {
+      "IsoCountry": "IS",
+      "MonthNumber": 99,
+      "DayNumber": -2,
+      "WeekDayNumber": 0,
+      "OffsetWeek": 0,
+      "OffsetDays": 0,
+      "HolidayName": "Föstudagurinn langi",
+      "SubstituteHoliday": "NoSubstituteHoliday",
+      "ConflictPriority": 50
+    },
+    {
+      "IsoCountry": "IS",
+      "MonthNumber": 99,
+      "DayNumber": 1,
+      "WeekDayNumber": 0,
+      "OffsetWeek": 0,
+      "OffsetDays": 0,
+      "HolidayName": "Annar í páskum",
+      "SubstituteHoliday": "NoSubstituteHoliday",
+      "ConflictPriority": 50
+    },
+    {
+      "IsoCountry": "IS",
+      "MonthNumber": 99,
+      "DayNumber": 39,
+      "WeekDayNumber": 0,
+      "OffsetWeek": 0,
+      "OffsetDays": 0,
+      "HolidayName": "Uppstigningardagur",
+      "SubstituteHoliday": "NoSubstituteHoliday",
+      "ConflictPriority": 50
+    },
+    {
+      "IsoCountry": "IS",
+      "MonthNumber": 5,
+      "DayNumber": 1,
+      "WeekDayNumber": 0,
+      "OffsetWeek": 0,
+      "OffsetDays": 0,
+      "HolidayName": "Frídagur verkafólks",
+      "SubstituteHoliday": "NoSubstituteHoliday",
+      "ConflictPriority": 100
+    },
+    {
+      "IsoCountry": "IS",
+      "MonthNumber": 8,
+      "DayNumber": 0,
+      "WeekDayNumber": 1,
+      "OffsetWeek": 0,
+      "OffsetDays": 0,
+      "HolidayName": "Frídagur verslunarmanna",
+      "SubstituteHoliday": "NoSubstituteHoliday",
+      "ConflictPriority": 100
+    },
+    {
+      "IsoCountry": "IS",
+      "MonthNumber": 6,
+      "DayNumber": 17,
+      "WeekDayNumber": 0,
+      "OffsetWeek": 0,
+      "OffsetDays": 0,
+      "HolidayName": "Þjóðhátíðardagur Íslendinga",
+      "SubstituteHoliday": "NoSubstituteHoliday",
+      "ConflictPriority": 100
+    },
+    {
+      "IsoCountry": "IS",
+      "MonthNumber": 12,
+      "DayNumber": 25,
+      "WeekDayNumber": 0,
+      "OffsetWeek": 0,
+      "OffsetDays": 0,
+      "HolidayName": "Jóladagur",
+      "SubstituteHoliday": "NoSubstituteHoliday",
+      "ConflictPriority": 100
+    },
+    {
+      "IsoCountry": "IS",
+      "MonthNumber": 12,
+      "DayNumber": 26,
+      "WeekDayNumber": 0,
+      "OffsetWeek": 0,
+      "OffsetDays": 0,
+      "HolidayName": "Annar í jólum",
+      "SubstituteHoliday": "NoSubstituteHoliday",
+      "ConflictPriority": 100
+    },
+    {
+      "IsoCountry": "IS",
+      "MonthNumber": 12,
+      "DayNumber": 24,
+      "WeekDayNumber": 0,
+      "OffsetWeek": 0,
+      "OffsetDays": 0,
+      "HolidayName": "Aðfangadagur",
+      "SubstituteHoliday": "NoSubstituteHoliday",
+      "ConflictPriority": 50
+    },
+    {
+      "IsoCountry": "IS",
+      "MonthNumber": 12,
+      "DayNumber": 31,
+      "WeekDayNumber": 0,
+      "OffsetWeek": 0,
+      "OffsetDays": 0,
+      "HolidayName": "Gamlársdagur",
+      "SubstituteHoliday": "NoSubstituteHoliday",
+      "ConflictPriority": 50
+    },
+    {
+      "IsoCountry": "IS",
+      "MonthNumber": 98,
+      "DayNumber": 0,
+      "WeekDayNumber": 0,
+      "OffsetWeek": 0,
+      "OffsetDays": 0,
+      "HolidayName": "Sumardagurinn fyrsti",
+      "SubstituteHoliday": "NoSubstituteHoliday",
+      "ConflictPriority": 50
     }
   ]
 }
\ No newline at end of file