Merge pull request #681 from focus-shift/670-germany-berlin-1953

germany: add 75. Jahrestag des Aufstandes vom 17. Juni 1953 in 2028 b…
focus-shift · Dec 4, 2024 · e95a294 · e95a294
2 parents a3ed1b6 + ae90e38
commit e95a294
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 1 deletion.
diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions.properties
@@ -2,6 +2,7 @@ holiday.description.170_ANNIVERSARY_ARRIVAL_BERMUDA
 holiday.description.1949_GREAT_MARCH_AND_RESTORATION                                    = The Commemoration of the 1949 Great March and the Restoration of the Legislative Council
 holiday.description.2ND_JANUARY                                                         = 2nd January
 holiday.description.70_ANNIVERSARY_VICTORY_CH_VS_JP                                     = The 70th anniversary day of the victory of the Chinese people's war of resistance against Japanese aggression
+holiday.description.75_ANNIVERSARY_OF_THE_UPRISING                                      = 75th anniversary of the uprising of June 17, 1953
 holiday.description.75_ANNIVERSARY_VE_DAY                                               = 75th Anniversary of VE Day
 holiday.description.ABOLITION_OF_SLAVERY                                                = Abolition of Slavery
 holiday.description.ADELAIDE_CUP                                                        = Adelaide Cup

diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_de.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_de.properties
@@ -2,6 +2,7 @@ holiday.description.170_ANNIVERSARY_ARRIVAL_BERMUDA
 holiday.description.1949_GREAT_MARCH_AND_RESTORATION                                    = Das Gedenken an den Großen Marsch von 1949 und die Wiedereinsetzung des Legislativrats
 holiday.description.2ND_JANUARY                                                         = 2. Januar
 holiday.description.70_ANNIVERSARY_VICTORY_CH_VS_JP                                     = Der 70. Jahrestag des Sieges des Widerstandskrieges des chinesischen Volkes gegen die japanische Aggression
+holiday.description.75_ANNIVERSARY_OF_THE_UPRISING                                      = 75. Jahrestag des Aufstandes vom 17. Juni 1953
 holiday.description.75_ANNIVERSARY_VE_DAY                                               = 75. Jahrestag des VE Day
 holiday.description.ABOLITION_OF_SLAVERY                                                = Aufhebung der Sklaverei
 holiday.description.ADELAIDE_CUP                                                        = Adelaide Cup

diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_el.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_el.properties
@@ -2,6 +2,7 @@ holiday.description.170_ANNIVERSARY_ARRIVAL_BERMUDA
 holiday.description.1949_GREAT_MARCH_AND_RESTORATION                                    = Εορτασμός της Μεγάλης Πορείας του 1949 και της Αποκατάστασης του Νομοθετικού Συμβουλίου.
 holiday.description.2ND_JANUARY                                                         = 2 Ιανουαρίου
 holiday.description.70_ANNIVERSARY_VICTORY_CH_VS_JP                                     = Η ημέρα της 70ής επετείου της νίκης του κινεζικού λαού στον πόλεμο αντίστασης κατά της ιαπωνικής επίθεσης
+holiday.description.75_ANNIVERSARY_OF_THE_UPRISING                                      = 75η επέτειος της εξέγερσης της 17ης Ιουνίου 1953
 holiday.description.75_ANNIVERSARY_VE_DAY                                               = 75η επέτειος της Ημέρας της VE
 holiday.description.ABOLITION_OF_SLAVERY                                                = Κατάργηση της δουλείας
 holiday.description.ADELAIDE_CUP                                                        = Κύπελλο Αδελαΐδας

diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_fr.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_fr.properties
@@ -2,6 +2,7 @@ holiday.description.170_ANNIVERSARY_ARRIVAL_BERMUDA
 holiday.description.1949_GREAT_MARCH_AND_RESTORATION                                    = Commémoration de la Grande Marche de 1949 et du rétablissement du Conseil législatif
 holiday.description.2ND_JANUARY                                                         = 2 janvier
 holiday.description.70_ANNIVERSARY_VICTORY_CH_VS_JP                                     = Le jour du 70ème anniversaire de la victoire de la guerre de résistance du peuple chinois contre l'agression japonaise
+holiday.description.75_ANNIVERSARY_OF_THE_UPRISING                                      = 75e anniversaire du soulèvement du 17 juin 1953
 holiday.description.75_ANNIVERSARY_VE_DAY                                               = 75ème anniversaire du Jour de la Victoire en Europe
 holiday.description.ABOLITION_OF_SLAVERY                                                = Abolition de l'esclavage
 holiday.description.ADELAIDE_CUP                                                        = Coupe Adélaïde

diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_nl.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_nl.properties
@@ -2,6 +2,7 @@ holiday.description.170_ANNIVERSARY_ARRIVAL_BERMUDA
 holiday.description.1949_GREAT_MARCH_AND_RESTORATION                                    = De herdenking van de Grote Mars van 1949 en het herstel van de Wetgevende Raad
 holiday.description.2ND_JANUARY                                                         = 2 januari
 holiday.description.70_ANNIVERSARY_VICTORY_CH_VS_JP                                     = De 70ste verjaardag van de overwinning van de verzetsoorlog van het Chinese volk tegen de Japanse agressie
+holiday.description.75_ANNIVERSARY_OF_THE_UPRISING                                      = 75e verjaardag van de opstand van 17 juni 1953
 holiday.description.75_ANNIVERSARY_VE_DAY                                               = 75e verjaardag van VE Day
 holiday.description.ABOLITION_OF_SLAVERY                                                = Afschaffing van de slavernij
 holiday.description.ADELAIDE_CUP                                                        = Adelaide Cup

diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_pt.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_pt.properties
@@ -2,6 +2,7 @@ holiday.description.170_ANNIVERSARY_ARRIVAL_BERMUDA
 holiday.description.1949_GREAT_MARCH_AND_RESTORATION                                    = Comemoração da Grande Marcha de 1949 e da Restauração do Conselho Legislativo
 holiday.description.2ND_JANUARY                                                         = 2 de janeiro
 holiday.description.70_ANNIVERSARY_VICTORY_CH_VS_JP                                     = Dia do 70º aniversário da vitória da guerra de resistência do povo chinês contra a agressão japonesa
+holiday.description.75_ANNIVERSARY_OF_THE_UPRISING                                      = 75º aniversário da revolta de 17 de junho de 1953
 holiday.description.75_ANNIVERSARY_VE_DAY                                               = 75º Aniversário do Dia dos Veteranos de Guerra
 holiday.description.ABOLITION_OF_SLAVERY                                                = Abolição da Escravatura
 holiday.description.ADELAIDE_CUP                                                        = Taça Adelaide

diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_sv.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_sv.properties
@@ -2,6 +2,7 @@ holiday.description.170_ANNIVERSARY_ARRIVAL_BERMUDA
 holiday.description.1949_GREAT_MARCH_AND_RESTORATION                                    = Högtidlighållandet av 1949 års stora marsch och återinförandet av det lagstiftande rådet
 holiday.description.2ND_JANUARY                                                         = 2 januari
 holiday.description.70_ANNIVERSARY_VICTORY_CH_VS_JP                                     = 70-årsdagen av det kinesiska folkets seger i motståndskriget mot den japanska aggressionen
+holiday.description.75_ANNIVERSARY_OF_THE_UPRISING                                      = 75-årsjubileum av upproret den 17 juni 1953
 holiday.description.75_ANNIVERSARY_VE_DAY                                               = 75-årsdagen av VE-dagen
 holiday.description.ABOLITION_OF_SLAVERY                                                = Avskaffande av slaveriet
 holiday.description.ADELAIDE_CUP                                                        = Adelaide Cup

diff --git a/jollyday-core/src/main/resources/holidays/Holidays_de.xml b/jollyday-core/src/main/resources/holidays/Holidays_de.xml
@@ -40,6 +40,7 @@
       <Fixed month="MARCH" day="8" descriptionPropertiesKey="INTERNATIONAL_WOMAN" validFrom="2019"/>
       <Fixed month="MAY" day="8" descriptionPropertiesKey="LIBERATION" validFrom="2020" validTo="2020"/>
       <Fixed month="MAY" day="8" descriptionPropertiesKey="LIBERATION" validFrom="2025" validTo="2025"/>
+      <Fixed month="JUNE" day="17" descriptionPropertiesKey="75_ANNIVERSARY_OF_THE_UPRISING" validFrom="2028" validTo="2028"/>
       <RelativeToFixed validFrom="1945" validTo="1989" descriptionPropertiesKey="REPENTANCE_PRAYER">
         <Weekday>WEDNESDAY</Weekday>
         <When>BEFORE</When>

diff --git a/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayDETest.java b/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayDETest.java
@@ -26,7 +26,6 @@ class HolidayDETest extends AbstractCountryTestBase {
 
   private static final String ISO_CODE = "de";
 
-
   @ParameterizedTest
   @ValueSource(strings = {"2010", "2022", "2023"})
   void testManagerDEStructure(final Year year) {