Merge pull request #380 from XSpielinbox/fix_ch

Fix Swizerland
focus-shift · Nov 27, 2023 · f3127b6 · f3127b6
2 parents 46a88a4 + 3b14b33
commit f3127b6
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 17 deletions.
diff --git a/jollyday-core/src/main/resources/descriptions/country_descriptions.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions.properties
@@ -109,7 +109,7 @@ country.description.ch.lu     = Lucerne
 country.description.ch.ne     = Neuchȃtel
 country.description.ch.nw     = Nidwalden
 country.description.ch.ow     = Obwalden
-country.description.ch.sg     = St.Gallen
+country.description.ch.sg     = St. Gallen
 country.description.ch.sh     = Schaffhausen
 country.description.ch.so     = Solothurn
 country.description.ch.sz     = Schwyz

diff --git a/jollyday-core/src/main/resources/holidays/Holidays_ch.xml b/jollyday-core/src/main/resources/holidays/Holidays_ch.xml
@@ -12,18 +12,22 @@
     <ChristianHoliday type="EASTER" descriptionPropertiesKey="christian.EASTER"/>
   </Holidays>
 
+  <Sources>
+    <Source of="ISO 3166">https://www.iso.org/obp/ui/#iso:code:3166:CH</Source>
+    <Source of="ISO 3166-2">https://en.wikipedia.org/wiki/ISO_3166-2:CH</Source>
+  </Sources>
+
   <SubConfigurations hierarchy="ag" description="Aargau">
     <Holidays>
-      <Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
       <Fixed month="JANUARY" day="2" descriptionPropertiesKey="ST_BERCHTHOLD"/>
+      <Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
       <Fixed month="DECEMBER" day="26" descriptionPropertiesKey="STEPHENS"/>
       <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
     </Holidays>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="ai" description="Appenzell Innerrhoden">
     <Holidays>
-      <Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
       <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>
       <Fixed month="NOVEMBER" day="1" descriptionPropertiesKey="ALL_SAINTS"/>
       <Fixed month="DECEMBER" day="8" descriptionPropertiesKey="IMMACULATE_CONCEPTION"/>
@@ -38,6 +42,7 @@
   <SubConfigurations hierarchy="ar" description="Appenzell Ausserrhoden">
     <Holidays>
       <Fixed month="DECEMBER" day="26" descriptionPropertiesKey="STEPHENS"/>
+      <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
       <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
       <ChristianHoliday type="WHIT_MONDAY" descriptionPropertiesKey="christian.WHIT_MONDAY"/>
     </Holidays>
@@ -83,7 +88,7 @@
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="ge" description="Genf">
+  <SubConfigurations hierarchy="ge" description="Genève">
     <Holidays>
       <RelativeToWeekdayInMonth weekday="THURSDAY" when="AFTER" descriptionPropertiesKey="GENEVAN_FAST">
         <FixedWeekday which="FIRST" weekday="SUNDAY" month="SEPTEMBER"/>
@@ -141,11 +146,11 @@
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="ne" description="Neuenburg">
+  <SubConfigurations hierarchy="ne" description="Neuchâtel">
     <Holidays>
       <Fixed month="JANUARY" day="2" descriptionPropertiesKey="ST_BERCHTHOLD"/>
-      <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>
       <Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
+      <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>
       <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
       <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
       <ChristianHoliday type="WHIT_MONDAY" descriptionPropertiesKey="christian.WHIT_MONDAY"/>
@@ -180,8 +185,9 @@
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="sg" description="St.Gallen">
+  <SubConfigurations hierarchy="sg" description="Sankt Gallen">
     <Holidays>
+      <Fixed month="NOVEMBER" day="1" descriptionPropertiesKey="ALL_SAINTS"/>
       <Fixed month="DECEMBER" day="26" descriptionPropertiesKey="STEPHENS"/>
       <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
       <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
@@ -234,7 +240,7 @@
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="ti" description="Tessin">
+  <SubConfigurations hierarchy="ti" description="Ticino">
     <Holidays>
       <Fixed month="JANUARY" day="6" descriptionPropertiesKey="EPIPHANY"/>
       <Fixed month="MARCH" day="19" descriptionPropertiesKey="ST_JOSEPH"/>
@@ -264,7 +270,7 @@
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="vd" description="Waadt">
+  <SubConfigurations hierarchy="vd" description="Vaud">
     <Holidays>
       <Fixed month="JANUARY" day="2" descriptionPropertiesKey="ST_BERCHTHOLD"/>
       <RelativeToWeekdayInMonth weekday="MONDAY" when="AFTER"
@@ -277,7 +283,7 @@
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="vs" description="Wallis">
+  <SubConfigurations hierarchy="vs" description="Valais">
     <Holidays>
       <Fixed month="MARCH" day="19" descriptionPropertiesKey="ST_JOSEPH"/>
       <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>

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
@@ -22,7 +22,6 @@
 
   <SubConfigurations hierarchy="ai" description="Appenzell Innerrhoden">
     <Holidays>
-      <Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
       <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>
       <Fixed month="NOVEMBER" day="1" descriptionPropertiesKey="ALL_SAINTS"/>
       <Fixed month="DECEMBER" day="8" descriptionPropertiesKey="IMMACULATE_CONCEPTION"/>
@@ -37,6 +36,7 @@
   <SubConfigurations hierarchy="ar" description="Appenzell Ausserrhoden">
     <Holidays>
       <Fixed month="DECEMBER" day="26" descriptionPropertiesKey="STEPHENS"/>
+      <Fixed month="APRIL" day="15" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
       <Fixed month="APRIL" day="18" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
       <Fixed month="JUNE" day="6" descriptionPropertiesKey="christian.WHIT_MONDAY"/>
     </Holidays>
@@ -82,7 +82,7 @@
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="ge" description="Genf">
+  <SubConfigurations hierarchy="ge" description="Genève">
     <Holidays>
       <Fixed month="SEPTEMBER" day="8" descriptionPropertiesKey="GENEVAN_FAST"/>
       <Fixed month="APRIL" day="15" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
@@ -138,7 +138,7 @@
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="ne" description="Neuenburg">
+  <SubConfigurations hierarchy="ne" description="Neuchâtel">
     <Holidays>
       <Fixed month="JANUARY" day="2" descriptionPropertiesKey="ST_BERCHTHOLD"/>
       <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>
@@ -177,8 +177,9 @@
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="sg" description="St.Gallen">
+  <SubConfigurations hierarchy="sg" description="Sankt Gallen">
     <Holidays>
+      <Fixed month="NOVEMBER" day="1" descriptionPropertiesKey="ALL_SAINTS"/>
       <Fixed month="DECEMBER" day="26" descriptionPropertiesKey="STEPHENS"/>
       <Fixed month="APRIL" day="15" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
       <Fixed month="APRIL" day="18" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
@@ -231,7 +232,7 @@
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="ti" description="Tessin">
+  <SubConfigurations hierarchy="ti" description="Ticino">
     <Holidays>
       <Fixed month="JANUARY" day="6" descriptionPropertiesKey="EPIPHANY"/>
       <Fixed month="MARCH" day="19" descriptionPropertiesKey="ST_JOSEPH"/>
@@ -261,7 +262,7 @@
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="vd" description="Waadt">
+  <SubConfigurations hierarchy="vd" description="Vaud">
     <Holidays>
       <Fixed month="JANUARY" day="2" descriptionPropertiesKey="ST_BERCHTHOLD"/>
       <Fixed month="APRIL" day="15" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
@@ -271,7 +272,7 @@
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="vs" description="Wallis">
+  <SubConfigurations hierarchy="vs" description="Valais">
     <Holidays>
       <Fixed month="MARCH" day="19" descriptionPropertiesKey="ST_JOSEPH"/>
       <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>