From bb06008b4f4c1cb3006a6686d1009dae4eee794c Mon Sep 17 00:00:00 2001
From: XSpielinbox <55600187+xspielinbox@users.noreply.github.com>
Date: Tue, 10 Oct 2023 22:39:02 +0200
Subject: [PATCH] Fix Bavaria #269

Signed-off-by: XSpielinbox <55600187+xspielinbox@users.noreply.github.com>
---
 .../country_descriptions.properties           |  4 ---
 .../country_descriptions_de.properties        |  4 ---
 .../country_descriptions_el.properties        |  4 ---
 .../country_descriptions_fr.properties        |  4 ---
 .../country_descriptions_nl.properties        |  4 ---
 .../country_descriptions_pt.properties        |  4 ---
 .../country_descriptions_sv.properties        |  4 ---
 .../main/resources/holidays/Holidays_de.xml   | 31 ++++---------------
 .../holidays/Holidays_test_de_2010.xml        | 22 +------------
 .../holidays/Holidays_test_de_2022.xml        | 22 +------------
 .../holidays/Holidays_test_de_2023.xml        | 22 +------------
 11 files changed, 9 insertions(+), 116 deletions(-)

diff --git a/jollyday-core/src/main/resources/descriptions/country_descriptions.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions.properties
index 412dfaf4f..858e8076d 100644
--- a/jollyday-core/src/main/resources/descriptions/country_descriptions.properties
+++ b/jollyday-core/src/main/resources/descriptions/country_descriptions.properties
@@ -154,10 +154,6 @@ country.description.de.be     = Berlin
 country.description.de.bw     = Baden-Württemberg
 country.description.de.by     = Bavaria
 country.description.de.by.ag  = Augsburg
-country.description.de.by.in  = Ingolstadt
-country.description.de.by.mu  = Munich
-country.description.de.by.re  = Regensburg
-country.description.de.by.wu  = Würzburg
 country.description.de.hb     = Bremen
 country.description.de.he     = Hesse
 country.description.de.hh     = Hamburg
diff --git a/jollyday-core/src/main/resources/descriptions/country_descriptions_de.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions_de.properties
index 2e03224fd..09af39df9 100644
--- a/jollyday-core/src/main/resources/descriptions/country_descriptions_de.properties
+++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_de.properties
@@ -154,10 +154,6 @@ country.description.de.be     = Berlin
 country.description.de.bw     = Baden-Württemberg
 country.description.de.by     = Bayern
 country.description.de.by.ag  = Augsburg
-country.description.de.by.in  = Ingolstadt
-country.description.de.by.mu  = München
-country.description.de.by.re  = Regensburg
-country.description.de.by.wu  = Würzburg
 country.description.de.hb     = Bremen
 country.description.de.he     = Hessen
 country.description.de.hh     = Hamburg
diff --git a/jollyday-core/src/main/resources/descriptions/country_descriptions_el.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions_el.properties
index d2197a190..60b5c648f 100644
--- a/jollyday-core/src/main/resources/descriptions/country_descriptions_el.properties
+++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_el.properties
@@ -154,10 +154,6 @@ country.description.de.be     = Βερολίνο
 country.description.de.bw     = Μπάντεν-Βίρτεμπεργκ
 country.description.de.by     = Βαυαρία
 country.description.de.by.ag  = Άουγκσμπουργκ
-country.description.de.by.in  = Ίνγκολστατ
-country.description.de.by.mu  = Μόναχο
-country.description.de.by.re  = Ρέγκενσμπουργκ
-country.description.de.by.wu  = Βίρτσμπουργκ
 country.description.de.hb     = Βρέμη
 country.description.de.he     = Έσση
 country.description.de.hh     = Αμβούργο
diff --git a/jollyday-core/src/main/resources/descriptions/country_descriptions_fr.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions_fr.properties
index ecbecdd0c..7dcdbebc3 100644
--- a/jollyday-core/src/main/resources/descriptions/country_descriptions_fr.properties
+++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_fr.properties
@@ -154,10 +154,6 @@ country.description.de.be     = Berlin
 country.description.de.bw     = Bade-Wurtemberg
 country.description.de.by     = Bavière
 country.description.de.by.ag  = Augsburg
-country.description.de.by.in  = Ingolstadt
-country.description.de.by.mu  = Munich
-country.description.de.by.re  = Regensburg
-country.description.de.by.wu  = Würzburg
 country.description.de.hb     = Brême
 country.description.de.he     = Hesse
 country.description.de.hh     = Hambourg
diff --git a/jollyday-core/src/main/resources/descriptions/country_descriptions_nl.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions_nl.properties
index 0e2b396a7..bd04719a1 100644
--- a/jollyday-core/src/main/resources/descriptions/country_descriptions_nl.properties
+++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_nl.properties
@@ -154,10 +154,6 @@ country.description.de.be     = Berlin
 country.description.de.bw     = Baden-Württemberg
 country.description.de.by     = Bavaria
 country.description.de.by.ag  = Augsburg
-country.description.de.by.in  = Ingolstadt
-country.description.de.by.mu  = Munich
-country.description.de.by.re  = Regensburg
-country.description.de.by.wu  = Würzburg
 country.description.de.hb     = Bremen
 country.description.de.he     = Hesse
 country.description.de.hh     = Hamburg
diff --git a/jollyday-core/src/main/resources/descriptions/country_descriptions_pt.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions_pt.properties
index 98b62aaae..3f30e7d9c 100644
--- a/jollyday-core/src/main/resources/descriptions/country_descriptions_pt.properties
+++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_pt.properties
@@ -154,10 +154,6 @@ country.description.de.be     = Berlin
 country.description.de.bw     = Baden-Wörtemberg
 country.description.de.by     = Bavária
 country.description.de.by.ag  = Augsburg
-country.description.de.by.in  = Ingolstadt
-country.description.de.by.mu  = Munich
-country.description.de.by.re  = Regensburg
-country.description.de.by.wu  = Würzburg
 country.description.de.hb     = Bremen
 country.description.de.he     = Hesse
 country.description.de.hh     = Hamburgo
diff --git a/jollyday-core/src/main/resources/descriptions/country_descriptions_sv.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions_sv.properties
index fe14f6c6f..45981094b 100644
--- a/jollyday-core/src/main/resources/descriptions/country_descriptions_sv.properties
+++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_sv.properties
@@ -154,10 +154,6 @@ country.description.de.be     = Berlin
 country.description.de.bw     = Baden-Württemberg
 country.description.de.by     = Bavaria
 country.description.de.by.ag  = Augsburg
-country.description.de.by.in  = Ingolstadt
-country.description.de.by.mu  = Munich
-country.description.de.by.re  = Regensburg
-country.description.de.by.wu  = Würzburg
 country.description.de.hb     = Bremen
 country.description.de.he     = Hesse
 country.description.de.hh     = Hamburg
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_de.xml b/jollyday-core/src/main/resources/holidays/Holidays_de.xml
index 4bd9ad079..5216816c3 100644
--- a/jollyday-core/src/main/resources/holidays/Holidays_de.xml
+++ b/jollyday-core/src/main/resources/holidays/Holidays_de.xml
@@ -32,6 +32,7 @@
 
   <Sources>
     <Source>https://en.wikipedia.org/wiki/Public_holidays_in_Germany</Source>
+    <Source of="ISO 3166">https://www.iso.org/obp/ui/#iso:code:3166:DE</Source>
     <Source of="ISO 3166-2">https://en.wikipedia.org/wiki/ISO_3166-2:DE</Source>
   </Sources>
 
@@ -73,6 +74,11 @@
   <SubConfigurations hierarchy="by" description="Bavaria">
     <Holidays>
       <Fixed month="JANUARY" day="6" descriptionPropertiesKey="EPIPHANY"/>
+
+      <!-- it actually is not in all of Bavaria, but in most of it:
+      https://www.statistik.bayern.de/statistik/gebiet_bevoelkerung/zensus/himmelfahrt/index.php -->
+      <Fixed day="15" month="AUGUST" descriptionPropertiesKey="ASSUMPTION_DAY"/>
+
       <Fixed month="NOVEMBER" day="1" descriptionPropertiesKey="ALL_SAINTS"/>
       <RelativeToFixed validFrom="1981" validTo="1989" descriptionPropertiesKey="REPENTANCE_PRAYER">
         <Weekday>WEDNESDAY</Weekday>
@@ -82,34 +88,9 @@
       <ChristianHoliday type="CORPUS_CHRISTI" descriptionPropertiesKey="christian.CORPUS_CHRISTI"/>
     </Holidays>
 
-    <SubConfigurations hierarchy="mu" description="Munich">
-      <Holidays>
-        <Fixed day="15" month="AUGUST" descriptionPropertiesKey="ASSUMPTION_DAY"/>
-      </Holidays>
-    </SubConfigurations>
-
     <SubConfigurations hierarchy="ag" description="Augsburg">
       <Holidays>
         <Fixed day="8" month="AUGUST" descriptionPropertiesKey="PEACE"/>
-        <Fixed day="15" month="AUGUST" descriptionPropertiesKey="ASSUMPTION_DAY"/>
-      </Holidays>
-    </SubConfigurations>
-
-    <SubConfigurations hierarchy="wu" description="Würzburg">
-      <Holidays>
-        <Fixed day="15" month="AUGUST" descriptionPropertiesKey="ASSUMPTION_DAY"/>
-      </Holidays>
-    </SubConfigurations>
-
-    <SubConfigurations hierarchy="re" description="Regensburg">
-      <Holidays>
-        <Fixed day="15" month="AUGUST" descriptionPropertiesKey="ASSUMPTION_DAY"/>
-      </Holidays>
-    </SubConfigurations>
-
-    <SubConfigurations hierarchy="in" description="Ingolstadt">
-      <Holidays>
-        <Fixed day="15" month="AUGUST" descriptionPropertiesKey="ASSUMPTION_DAY"/>
       </Holidays>
     </SubConfigurations>
   </SubConfigurations>
diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_de_2010.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_de_2010.xml
index 1491fd0b7..c3ee62524 100644
--- a/jollyday-tests/src/test/resources/holidays/Holidays_test_de_2010.xml
+++ b/jollyday-tests/src/test/resources/holidays/Holidays_test_de_2010.xml
@@ -36,32 +36,12 @@
     <Holidays>
       <Fixed month="JANUARY" day="6" descriptionPropertiesKey="EPIPHANY"/>
       <Fixed month="JUNE" day="3" descriptionPropertiesKey="christian.CORPUS_CHRISTI"/>
+      <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>
       <Fixed month="NOVEMBER" day="1" descriptionPropertiesKey="ALL_SAINTS"/>
     </Holidays>
-    <SubConfigurations hierarchy="mu" description="München">
-      <Holidays>
-        <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>
-      </Holidays>
-    </SubConfigurations>
     <SubConfigurations hierarchy="ag" description="Augsburg">
       <Holidays>
         <Fixed month="AUGUST" day="8" descriptionPropertiesKey="PEACE"/>
-        <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>
-      </Holidays>
-    </SubConfigurations>
-    <SubConfigurations hierarchy="wu" description="Würzburg">
-      <Holidays>
-        <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>
-      </Holidays>
-    </SubConfigurations>
-    <SubConfigurations hierarchy="re" description="Regensburg">
-      <Holidays>
-        <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>
-      </Holidays>
-    </SubConfigurations>
-    <SubConfigurations hierarchy="in" description="Ingolstadt">
-      <Holidays>
-        <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>
       </Holidays>
     </SubConfigurations>
   </SubConfigurations>
diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_de_2022.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_de_2022.xml
index 3905e352b..df2c05cc0 100644
--- a/jollyday-tests/src/test/resources/holidays/Holidays_test_de_2022.xml
+++ b/jollyday-tests/src/test/resources/holidays/Holidays_test_de_2022.xml
@@ -37,32 +37,12 @@
     <Holidays>
       <Fixed month="JANUARY" day="6" descriptionPropertiesKey="EPIPHANY"/>
       <Fixed month="JUNE" day="16" descriptionPropertiesKey="christian.CORPUS_CHRISTI"/>
+      <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>
       <Fixed month="NOVEMBER" day="1" descriptionPropertiesKey="ALL_SAINTS"/>
     </Holidays>
-    <SubConfigurations hierarchy="mu" description="München">
-      <Holidays>
-        <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>
-      </Holidays>
-    </SubConfigurations>
     <SubConfigurations hierarchy="ag" description="Augsburg">
       <Holidays>
         <Fixed month="AUGUST" day="8" descriptionPropertiesKey="PEACE"/>
-        <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>
-      </Holidays>
-    </SubConfigurations>
-    <SubConfigurations hierarchy="wu" description="Würzburg">
-      <Holidays>
-        <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>
-      </Holidays>
-    </SubConfigurations>
-    <SubConfigurations hierarchy="re" description="Regensburg">
-      <Holidays>
-        <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>
-      </Holidays>
-    </SubConfigurations>
-    <SubConfigurations hierarchy="in" description="Ingolstadt">
-      <Holidays>
-        <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>
       </Holidays>
     </SubConfigurations>
   </SubConfigurations>
diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_de_2023.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_de_2023.xml
index 147fbed9e..cc82e9b25 100644
--- a/jollyday-tests/src/test/resources/holidays/Holidays_test_de_2023.xml
+++ b/jollyday-tests/src/test/resources/holidays/Holidays_test_de_2023.xml
@@ -37,32 +37,12 @@
     <Holidays>
       <Fixed month="JANUARY" day="6" descriptionPropertiesKey="EPIPHANY"/>
       <Fixed month="JUNE" day="8" descriptionPropertiesKey="christian.CORPUS_CHRISTI"/>
+      <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>
       <Fixed month="NOVEMBER" day="1" descriptionPropertiesKey="ALL_SAINTS"/>
     </Holidays>
-    <SubConfigurations hierarchy="mu" description="München">
-      <Holidays>
-        <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>
-      </Holidays>
-    </SubConfigurations>
     <SubConfigurations hierarchy="ag" description="Augsburg">
       <Holidays>
         <Fixed month="AUGUST" day="8" descriptionPropertiesKey="PEACE"/>
-        <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>
-      </Holidays>
-    </SubConfigurations>
-    <SubConfigurations hierarchy="wu" description="Würzburg">
-      <Holidays>
-        <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>
-      </Holidays>
-    </SubConfigurations>
-    <SubConfigurations hierarchy="re" description="Regensburg">
-      <Holidays>
-        <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>
-      </Holidays>
-    </SubConfigurations>
-    <SubConfigurations hierarchy="in" description="Ingolstadt">
-      <Holidays>
-        <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>
       </Holidays>
     </SubConfigurations>
   </SubConfigurations>