Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Bavaria #269 #483

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix Bavaria #269 #483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions jollyday-core/src/main/resources/descriptions/country_descriptions.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions jollyday-core/src/main/resources/descriptions/country_descriptions_de.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions jollyday-core/src/main/resources/descriptions/country_descriptions_el.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = Αμβούργο
Expand Down
4 changes: 0 additions & 4 deletions jollyday-core/src/main/resources/descriptions/country_descriptions_fr.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions jollyday-core/src/main/resources/descriptions/country_descriptions_nl.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions jollyday-core/src/main/resources/descriptions/country_descriptions_pt.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions jollyday-core/src/main/resources/descriptions/country_descriptions_sv.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
31 changes: 6 additions & 25 deletions jollyday-core/src/main/resources/holidays/Holidays_de.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down
22 changes: 1 addition & 21 deletions jollyday-tests/src/test/resources/holidays/Holidays_test_de_2010.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
22 changes: 1 addition & 21 deletions jollyday-tests/src/test/resources/holidays/Holidays_test_de_2022.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
22 changes: 1 addition & 21 deletions jollyday-tests/src/test/resources/holidays/Holidays_test_de_2023.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down