From 666b8516c4de62a6a8e381e15f49fc807c459797 Mon Sep 17 00:00:00 2001
From: Tobias Schneider <Tobias.Schneider@Tobsch.org>
Date: Thu, 11 Jul 2024 16:00:24 +0200
Subject: [PATCH] bulgaria: add moving conditions..

.. also adds:
- SECOND_CHRISTMAS_DAY
- NATIONAL_DAY

and removes:
- NEW_YEARS_EVE
---
 .../main/resources/holidays/Holidays_bg.xml   | 51 +++++++++++++++----
 .../holidays/Holidays_test_bg_2010.xml        | 23 +++++----
 2 files changed, 54 insertions(+), 20 deletions(-)

diff --git a/jollyday-core/src/main/resources/holidays/Holidays_bg.xml b/jollyday-core/src/main/resources/holidays/Holidays_bg.xml
index fa0e38a0e..7ee5ad2a3 100644
--- a/jollyday-core/src/main/resources/holidays/Holidays_bg.xml
+++ b/jollyday-core/src/main/resources/holidays/Holidays_bg.xml
@@ -5,16 +5,47 @@
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="https://focus_shift.de/jollyday/schema/holiday https://focus_shift.de/jollyday/schema/holiday/holiday.xsd">
   <Holidays>
-    <Fixed month="JANUARY" day="1" descriptionPropertiesKey="NEW_YEAR"/>
-    <Fixed month="MARCH" day="3" descriptionPropertiesKey="LIBERATION"/>
-    <Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
-    <Fixed month="MAY" day="6" descriptionPropertiesKey="ST_GEORGE"/>
-    <Fixed month="MAY" day="24" descriptionPropertiesKey="EDU_CULTURE"/>
-    <Fixed month="SEPTEMBER" day="6" descriptionPropertiesKey="UNIFICATION"/>
-    <Fixed month="SEPTEMBER" day="22" descriptionPropertiesKey="INDEPENDENCE_DAY"/>
-    <Fixed month="DECEMBER" day="24" descriptionPropertiesKey="CHRISTMAS_EVE"/>
-    <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
-    <Fixed month="DECEMBER" day="31" descriptionPropertiesKey="NEW_YEARS_EVE"/>
+    <Fixed month="JANUARY" day="1" descriptionPropertiesKey="NEW_YEAR">
+      <MovingCondition substitute="SATURDAY" with="NEXT" weekday="MONDAY"/>
+      <MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
+    </Fixed>
+    <Fixed month="MARCH" day="3" descriptionPropertiesKey="LIBERATION">
+      <MovingCondition substitute="SATURDAY" with="NEXT" weekday="MONDAY"/>
+      <MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
+    </Fixed>
+    <Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY">
+      <MovingCondition substitute="SATURDAY" with="NEXT" weekday="MONDAY"/>
+      <MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
+    </Fixed>
+    <Fixed month="MAY" day="6" descriptionPropertiesKey="ST_GEORGE">
+      <MovingCondition substitute="SATURDAY" with="NEXT" weekday="MONDAY"/>
+      <MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
+    </Fixed>
+    <Fixed month="MAY" day="24" descriptionPropertiesKey="EDU_CULTURE">
+      <MovingCondition substitute="SATURDAY" with="NEXT" weekday="MONDAY"/>
+      <MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
+    </Fixed>
+    <Fixed month="SEPTEMBER" day="6" descriptionPropertiesKey="UNIFICATION">
+      <MovingCondition substitute="SATURDAY" with="NEXT" weekday="MONDAY"/>
+      <MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
+    </Fixed>
+    <Fixed month="SEPTEMBER" day="22" descriptionPropertiesKey="INDEPENDENCE_DAY">
+      <MovingCondition substitute="SATURDAY" with="NEXT" weekday="MONDAY"/>
+      <MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
+    </Fixed>
+    <Fixed month="NOVEMBER" day="1" descriptionPropertiesKey="NATIONAL_DAY">
+      <MovingCondition substitute="SATURDAY" with="NEXT" weekday="MONDAY"/>
+      <MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
+    </Fixed>
+    <Fixed month="DECEMBER" day="24" descriptionPropertiesKey="CHRISTMAS_EVE">
+      <MovingCondition substitute="SUNDAY" with="NEXT" weekday="WEDNESDAY"/>
+    </Fixed>
+    <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS">
+      <MovingCondition substitute="SUNDAY" with="NEXT" weekday="TUESDAY"/>
+    </Fixed>
+    <Fixed month="DECEMBER" day="26" descriptionPropertiesKey="SECOND_CHRISTMAS_DAY">
+      <MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
+    </Fixed>
     <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY" chronology="JULIAN"/>
     <ChristianHoliday type="EASTER_SATURDAY" descriptionPropertiesKey="christian.EASTER_SATURDAY" chronology="JULIAN"/>
     <ChristianHoliday type="EASTER" descriptionPropertiesKey="christian.EASTER" chronology="JULIAN"/>
diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_bg_2010.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_bg_2010.xml
index d8c06ff78..886ef15a2 100644
--- a/jollyday-tests/src/test/resources/holidays/Holidays_test_bg_2010.xml
+++ b/jollyday-tests/src/test/resources/holidays/Holidays_test_bg_2010.xml
@@ -4,17 +4,20 @@
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="https://focus_shift.de/jollyday/schema/holiday https://focus_shift.de/jollyday/schema/holiday/holiday.xsd">
   <Holidays>
-    <Fixed month="JANUARY" day="1"/>
-    <Fixed month="MARCH" day="3"/>
-    <Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
-    <Fixed month="MAY" day="6"/>
-    <Fixed month="MAY" day="24"/>
-    <Fixed month="SEPTEMBER" day="6"/>
-    <Fixed month="SEPTEMBER" day="22"/>
+    <Fixed month="JANUARY" day="1" descriptionPropertiesKey="NEW_YEAR"/>
+    <Fixed month="MARCH" day="3" descriptionPropertiesKey="LIBERATION"/>
+    <Fixed month="APRIL" day="2" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+    <Fixed month="APRIL" day="3" descriptionPropertiesKey="christian.EASTER_SATURDAY"/>
+    <Fixed month="APRIL" day="4" descriptionPropertiesKey="christian.EASTER"/>
+    <Fixed month="APRIL" day="5" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
+    <Fixed month="MAY" day="3" descriptionPropertiesKey="LABOUR_DAY"/>
+    <Fixed month="MAY" day="6" descriptionPropertiesKey="ST_GEORGE"/>
+    <Fixed month="MAY" day="24" descriptionPropertiesKey="EDU_CULTURE"/>
+    <Fixed month="SEPTEMBER" day="6" descriptionPropertiesKey="UNIFICATION"/>
+    <Fixed month="SEPTEMBER" day="22" descriptionPropertiesKey="INDEPENDENCE_DAY"/>
+    <Fixed month="NOVEMBER" day="1" descriptionPropertiesKey="NATIONAL_DAY"/>
     <Fixed month="DECEMBER" day="24" descriptionPropertiesKey="CHRISTMAS_EVE"/>
     <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
-    <Fixed month="DECEMBER" day="31"/>
-    <Fixed month="APRIL" day="2"/>
-    <Fixed month="APRIL" day="5"/>
+    <Fixed month="DECEMBER" day="27" descriptionPropertiesKey="SECOND_CHRISTMAS_DAY"/>
   </Holidays>
 </Configuration>