From 22591732e28c7f6a1abdf357a807f70725b6da43 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 0db200c41..f7311aa11 100644 --- a/jollyday-core/src/main/resources/descriptions/country_descriptions.properties +++ b/jollyday-core/src/main/resources/descriptions/country_descriptions.properties @@ -138,10 +138,6 @@ 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 index 8db61bdeb..c692442d7 100644 --- a/jollyday-core/src/main/resources/descriptions/country_descriptions_de.properties +++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_de.properties @@ -138,10 +138,6 @@ 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 index bdbac802e..bd59f7e83 100644 --- a/jollyday-core/src/main/resources/descriptions/country_descriptions_el.properties +++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_el.properties @@ -138,10 +138,6 @@ 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 index bb9915921..a4f199ffb 100644 --- a/jollyday-core/src/main/resources/descriptions/country_descriptions_fr.properties +++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_fr.properties @@ -138,10 +138,6 @@ 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 index 941467239..06ebc43eb 100644 --- a/jollyday-core/src/main/resources/descriptions/country_descriptions_nl.properties +++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_nl.properties @@ -138,10 +138,6 @@ 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 index 9ac4b5e00..0b498585a 100644 --- a/jollyday-core/src/main/resources/descriptions/country_descriptions_pt.properties +++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_pt.properties @@ -138,10 +138,6 @@ 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 index 4ae0354ad..ee3d5db98 100644 --- a/jollyday-core/src/main/resources/descriptions/country_descriptions_sv.properties +++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_sv.properties @@ -138,10 +138,6 @@ 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/holidays/Holidays_de.xml b/jollyday-core/src/main/resources/holidays/Holidays_de.xml index 6335f06fb..c1fabea7a 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 @@ -73,6 +74,11 @@ + + + + WEDNESDAY @@ -82,34 +88,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 b120c17ab..c8bed6d38 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 0328da959..1dfb3745a 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 d6ab54ec9..93e85e5ae 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 @@ + - - - - - - - - - - - - - - - - - - - - -