Fix Bavaria focus-shift#269

Signed-off-by: XSpielinbox <55600187+xspielinbox@users.noreply.github.com>
XSpielinbox · Oct 10, 2023 · 41784ae · 41784ae
1 parent 6978965
commit 41784ae
Show file tree

Hide file tree

Showing 18 changed files with 9 additions and 146 deletions.
diff --git a/jollyday-core/src/main/resources/descriptions/country_descriptions.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions.properties
@@ -137,11 +137,6 @@ country.description.de.be     = Berlin
 country.description.de.bb     = Brandenburg
 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
@@ -137,11 +137,6 @@ country.description.de.be     = Berlin
 country.description.de.bb     = Brandenburg
 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
@@ -137,11 +137,6 @@ country.description.de.be     = Βερολίνο
 country.description.de.bb     = Βραδεμβούργο
 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
@@ -137,11 +137,6 @@ country.description.de.be     = Berlin
 country.description.de.bb     = Brandebourg
 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
@@ -137,11 +137,6 @@ country.description.de.be     = Berlin
 country.description.de.bb     = Brandenburg
 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
@@ -137,11 +137,6 @@ country.description.de.be     = Berlin
 country.description.de.bb     = Brandenburgo
 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
@@ -137,11 +137,6 @@ country.description.de.be     = Berlin
 country.description.de.bb     = Brandenburg
 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/holiday_descriptions.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions.properties
@@ -208,7 +208,6 @@ holiday.description.OCT_REVOLUTION                   = October Revolution Day
 holiday.description.OIL_EXPROPRIATION_DAY            = Oil Expropriation Day
 holiday.description.OTAGO_ANNIVERSARY                = Otago Anniversary
 holiday.description.PATRIOT                          = Patriots' Day
-holiday.description.PEACE                            = Peace Festival
 holiday.description.PICHINCHA                        = Battle of Pichincha
 holiday.description.PICNIC                           = Picnic Day
 holiday.description.PIONEER                          = Pioneer Day

diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_de.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_de.properties
@@ -208,7 +208,6 @@ holiday.description.OCT_REVOLUTION                   = Tag der Oktober-Revolutio
 holiday.description.OIL_EXPROPRIATION_DAY            = Erdölentzugstag
 holiday.description.OTAGO_ANNIVERSARY                = Otago Anniversary
 holiday.description.PATRIOT                          = Tag der Patrioten
-holiday.description.PEACE                            = Friedensfest
 holiday.description.PICHINCHA                        = Schlacht von Pichincha
 holiday.description.PICNIC                           = Picnic Tag
 holiday.description.PIONEER                          = Pionier Tag

diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_el.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_el.properties
@@ -208,7 +208,6 @@ holiday.description.OCT_REVOLUTION                   = Ημέρα Οκτωβρι
 holiday.description.OIL_EXPROPRIATION_DAY            = Ημέρα απαλλοτρίωσης πετρελαίου
 holiday.description.OTAGO_ANNIVERSARY                = Επέτειος Otago
 holiday.description.PATRIOT                          = Ημέρα Πατριωτών
-holiday.description.PEACE                            = Φεστιβάλ Ειρήνης
 holiday.description.PICHINCHA                        = Μάχη του Pichincha
 holiday.description.PICNIC                           = Ημέρα πικνίκ
 holiday.description.PIONEER                          = Ημέρα Πρωτοπόρου

diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_fr.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_fr.properties
@@ -208,7 +208,6 @@ holiday.description.OCT_REVOLUTION                   = October Revolution Day
 holiday.description.OIL_EXPROPRIATION_DAY            = Day Expropriation Oil
 holiday.description.OTAGO_ANNIVERSARY                = Otago Anniversary
 holiday.description.PATRIOT                          = Patriots' Day
-holiday.description.PEACE                            = Peace Festival
 holiday.description.PICHINCHA                        = Battle of Pichincha
 holiday.description.PICNIC                           = Picnic Day
 holiday.description.PIONEER                          = Pioneer Day

diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_nl.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_nl.properties
@@ -208,7 +208,6 @@ holiday.description.OCT_REVOLUTION                   = Oktoberdag van de revolut
 holiday.description.OIL_EXPROPRIATION_DAY            = Onteigening van de Aardolie
 holiday.description.OTAGO_ANNIVERSARY                = Otago Anniversary
 holiday.description.PATRIOT                          = Dag van de patriotten
-holiday.description.PEACE                            = Please translate\: Peace Festival
 holiday.description.PICHINCHA                        = Slag bij Pichincha
 holiday.description.PICNIC                           = Picknick dag
 holiday.description.PIONEER                          = Dag van de pioneers

diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_pt.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_pt.properties
@@ -208,7 +208,6 @@ holiday.description.OCT_REVOLUTION                   = Dia da Revolução de Out
 holiday.description.OIL_EXPROPRIATION_DAY            = Dia Expropriação de Petróleo
 holiday.description.OTAGO_ANNIVERSARY                = Otago Anniversary
 holiday.description.PATRIOT                          = Patriots' Day
-holiday.description.PEACE                            = Festival da Paz
 holiday.description.PICHINCHA                        = Batalha Pichincha
 holiday.description.PICNIC                           = Picnic Day
 holiday.description.PIONEER                          = Dia do Pioneiro

diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_sv.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_sv.properties
@@ -208,7 +208,6 @@ holiday.description.OCT_REVOLUTION                   = October Revolution Day
 holiday.description.OIL_EXPROPRIATION_DAY            = Oil Expropriation Day
 holiday.description.OTAGO_ANNIVERSARY                = Otago Anniversary
 holiday.description.PATRIOT                          = Patriots' Day
-holiday.description.PEACE                            = Peace Festival
 holiday.description.PICHINCHA                        = Battle of Pichincha
 holiday.description.PICNIC                           = Picnic Day
 holiday.description.PIONEER                          = Pioneer Day

diff --git 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>
 
@@ -74,6 +75,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">
@@ -84,32 +90,6 @@
 
       <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>
 
   <SubConfigurations hierarchy="he" description="Hessen">

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
@@ -36,34 +36,9 @@
     <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>
   <SubConfigurations hierarchy="he" description="Hessen">
     <Holidays>

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
@@ -37,34 +37,9 @@
     <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>
   <SubConfigurations hierarchy="he" description="Hessen">
     <Holidays>

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
@@ -37,34 +37,9 @@
     <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>
   <SubConfigurations hierarchy="he" description="Hessen">
     <Holidays>