diff --git a/jollyday-core/src/main/resources/descriptions/country_descriptions.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions.properties index b2c4bd7a1..4320cc805 100644 --- a/jollyday-core/src/main/resources/descriptions/country_descriptions.properties +++ b/jollyday-core/src/main/resources/descriptions/country_descriptions.properties @@ -167,10 +167,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 f57639c22..d2f901c18 100644 --- a/jollyday-core/src/main/resources/descriptions/country_descriptions_de.properties +++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_de.properties @@ -167,10 +167,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 473d9e86f..e2aa8327c 100644 --- a/jollyday-core/src/main/resources/descriptions/country_descriptions_el.properties +++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_el.properties @@ -167,10 +167,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 bb42ed4e4..3993516f0 100644 --- a/jollyday-core/src/main/resources/descriptions/country_descriptions_fr.properties +++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_fr.properties @@ -167,10 +167,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 bc24b653f..95d171124 100644 --- a/jollyday-core/src/main/resources/descriptions/country_descriptions_nl.properties +++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_nl.properties @@ -167,10 +167,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 ef3a3bce5..8303a1495 100644 --- a/jollyday-core/src/main/resources/descriptions/country_descriptions_pt.properties +++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_pt.properties @@ -167,10 +167,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 f345ddd7f..0b940f3d0 100644 --- a/jollyday-core/src/main/resources/descriptions/country_descriptions_sv.properties +++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_sv.properties @@ -167,10 +167,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 e15a577ea..c9dd73edd 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 @@ https://en.wikipedia.org/wiki/Public_holidays_in_Germany + https://www.iso.org/obp/ui/#iso:code:3166:DE https://en.wikipedia.org/wiki/ISO_3166-2:DE @@ -74,6 +75,11 @@ + + + + WEDNESDAY @@ -83,34 +89,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ + - - - - - - - - - - - - - - - - - - - - - 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 @@ + - - - - - - - - - - - - - - - - - - - - - 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 @@ + - - - - - - - - - - - - - - - - - - - - -