Merge pull request #407 from focus-shift/373-ch-gl

Add naefels trip ch gl
focus-shift · Dec 20, 2023 · f5503e0 · f5503e0
2 parents 82c3937 + b37db85
commit f5503e0
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 0 deletions.
diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions.properties
@@ -210,6 +210,7 @@ holiday.description.MIDSUMMER_EVE                    = Midsummer Eve
 holiday.description.MOTHERS_DAY                      = Mothers Day
 holiday.description.MOTHER_TERESA                    = Beatification of Mother Teresa
 holiday.description.MOUNTAIN_DAY                     = Mountain day
+holiday.description.NAEFELS_TRIP                     = Näfels trip
 holiday.description.NATIONAL_DAY                     = National Day
 holiday.description.NATIONAL_HEROES_DAY              = National Heroes Day
 holiday.description.NATIONAL_UPRISING                = National Uprising

diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_de.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_de.properties
@@ -257,6 +257,7 @@ holiday.description.REST_INDEP                       = Tag der Wiederherstellung
 holiday.description.REVOLUTION                       = Revolutionstag
 holiday.description.RIEBEECK                         = Van Riebeeck's Tag
 holiday.description.ROMA_DAY                         = Tag der Roma
+holiday.description.NAEFELS_TRIP                     = Näfelser Fahrt
 holiday.description.ROYAL_WEDDING                    = Königliche Hochzeit
 holiday.description.RUPERT                           = Rupert von Salzburg Tag
 holiday.description.SAINT_CLEMENT                    = St. Clement von Ohrid 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
@@ -210,6 +210,7 @@ holiday.description.MIDSUMMER_EVE                    = Παραμονή Καλο
 holiday.description.MOTHERS_DAY                      = Ημέρα της Μητέρας
 holiday.description.MOTHER_TERESA                    = Μακαριοποίηση της Μητέρας Τερέζας
 holiday.description.MOUNTAIN_DAY                     = Ημέρα του βουνού
+holiday.description.NAEFELS_TRIP                     = Ταξίδι στο Näfels
 holiday.description.NATIONAL_DAY                     = Εθνική Ημέρα
 holiday.description.NATIONAL_HEROES_DAY              = Ημέρα Εθνικών Ηρώων
 holiday.description.NATIONAL_UPRISING                = Εθνική εξέγερση

diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_fr.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_fr.properties
@@ -210,6 +210,7 @@ holiday.description.MIDSUMMER_EVE                    = Midsummer Eve
 holiday.description.MOTHERS_DAY                      = Mothers Day
 holiday.description.MOTHER_TERESA                    = Beatification of Mother Teresa
 holiday.description.MOUNTAIN_DAY                     = Journée de la Montagne
+holiday.description.NAEFELS_TRIP                     = Voyage à Näfels
 holiday.description.NATIONAL_DAY                     = Fête Nationale
 holiday.description.NATIONAL_HEROES_DAY              = Journée des héros nationaux
 holiday.description.NATIONAL_UPRISING                = National Uprising

diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_nl.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_nl.properties
@@ -210,6 +210,7 @@ holiday.description.MIDSUMMER_EVE                    = Midzomeravond
 holiday.description.MOTHERS_DAY                      = Moederdag
 holiday.description.MOTHER_TERESA                    = Zaligverklaring van moeder Teresa
 holiday.description.MOUNTAIN_DAY                     = Mountain dag
+holiday.description.NAEFELS_TRIP                     = Näfels reis
 holiday.description.NATIONAL_DAY                     = Nationale dag
 holiday.description.NATIONAL_HEROES_DAY              = Nationale Heldendag
 holiday.description.NATIONAL_UPRISING                = Nationale opstand

diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_pt.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_pt.properties
@@ -210,6 +210,7 @@ holiday.description.MIDSUMMER_EVE                    = Solestício de Verão
 holiday.description.MOTHERS_DAY                      = Dia da Mãe
 holiday.description.MOTHER_TERESA                    = Beatificação da Madre Teresa
 holiday.description.MOUNTAIN_DAY                     = Dia da montanha
+holiday.description.NAEFELS_TRIP                     = Viagem a Näfels
 holiday.description.NATIONAL_DAY                     = Dia Nacional
 holiday.description.NATIONAL_HEROES_DAY              = Dia dos Heróis Nacionais
 holiday.description.NATIONAL_UPRISING                = National Uprising

diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions_sv.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions_sv.properties
@@ -210,6 +210,7 @@ holiday.description.MIDSUMMER_EVE                    = Midsommarafton
 holiday.description.MOTHERS_DAY                      = Mors dag
 holiday.description.MOTHER_TERESA                    = Beatification of Mother Teresa
 holiday.description.MOUNTAIN_DAY                     = Mountain day
+holiday.description.NAEFELS_TRIP                     = Näfels resa
 holiday.description.NATIONAL_DAY                     = Sveriges nationaldag
 holiday.description.NATIONAL_HEROES_DAY              = Nationella hjältarnas dag
 holiday.description.NATIONAL_UPRISING                = National Uprising

diff --git a/jollyday-core/src/main/resources/holidays/Holidays_ch.xml b/jollyday-core/src/main/resources/holidays/Holidays_ch.xml
@@ -105,6 +105,7 @@
       <Fixed month="JANUARY" day="2" descriptionPropertiesKey="ST_BERCHTHOLD"/>
       <Fixed month="NOVEMBER" day="1" descriptionPropertiesKey="ALL_SAINTS"/>
       <Fixed month="DECEMBER" day="26" descriptionPropertiesKey="STEPHENS"/>
+      <FixedWeekday which="SECOND" weekday="THURSDAY" month="APRIL" descriptionPropertiesKey="NAEFELS_TRIP"/>
       <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
       <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
       <ChristianHoliday type="WHIT_MONDAY" descriptionPropertiesKey="christian.WHIT_MONDAY"/>

diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_ch_2022.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_ch_2022.xml
@@ -95,6 +95,7 @@
   <SubConfigurations hierarchy="gl" description="Glarus">
     <Holidays>
       <Fixed month="JANUARY" day="2" descriptionPropertiesKey="ST_BERCHTHOLD"/>
+      <Fixed month="APRIL" day="14" descriptionPropertiesKey="NAEFELS_TRIP"/>
       <Fixed month="NOVEMBER" day="1" descriptionPropertiesKey="ALL_SAINTS"/>
       <Fixed month="DECEMBER" day="26" descriptionPropertiesKey="STEPHENS"/>
       <Fixed month="APRIL" day="15" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>