Use ISO 3166-2 to identify the country and the subdivisions

focus-shift · Nov 28, 2023 · da9fa9c · da9fa9c
1 parent e6ca154
commit da9fa9c
Show file tree

Hide file tree

Showing 28 changed files with 2,533 additions and 2,029 deletions.
diff --git a/jollyday-core/src/main/java/de/focus_shift/jollyday/core/HolidayCalendar.java b/jollyday-core/src/main/java/de/focus_shift/jollyday/core/HolidayCalendar.java
@@ -5,7 +5,6 @@
 /**
  * This enum provides a list of all supported holiday calendars.
  *
- * @author Sven Diedrichsen ([email protected])
  * @version $Id$
  */
 public enum HolidayCalendar {
@@ -47,5 +46,4 @@ public enum HolidayCalendar {
   public String getId() {
     return id;
   }
-
 }
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_at.xml b/jollyday-core/src/main/resources/holidays/Holidays_at.xml
@@ -23,56 +23,56 @@
     <ChristianHoliday type="CORPUS_CHRISTI" descriptionPropertiesKey="christian.CORPUS_CHRISTI"/>
   </Holidays>
 
-  <SubConfigurations hierarchy="b" description="Burgenland">
+  <SubConfigurations hierarchy="1" description="Burgenland">
     <Holidays>
       <Fixed month="NOVEMBER" day="11" descriptionPropertiesKey="MARTINS_DAY"/>
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="k" description="Kärnten">
+  <SubConfigurations hierarchy="2" description="Kärnten">
     <Holidays>
       <Fixed month="MARCH" day="19" descriptionPropertiesKey="JOSEFS_DAY"/>
       <Fixed month="OCTOBER" day="10" descriptionPropertiesKey="PLEBISCITE"/>
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="la" description="Niederösterreich">
+  <SubConfigurations hierarchy="3" description="Niederösterreich">
     <Holidays>
       <Fixed month="NOVEMBER" day="15" descriptionPropertiesKey="LEOPOLD"/>
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="ua" description="Oberösterreich">
+  <SubConfigurations hierarchy="4" description="Oberösterreich">
     <Holidays>
       <Fixed month="MAY" day="4" descriptionPropertiesKey="FLORIAN"/>
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="s" description="Salzburg">
+  <SubConfigurations hierarchy="5" description="Salzburg">
     <Holidays>
       <Fixed month="SEPTEMBER" day="24" descriptionPropertiesKey="RUPERT"/>
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="st" description="Steiermark">
+  <SubConfigurations hierarchy="6" description="Steiermark">
     <Holidays>
       <Fixed month="MARCH" day="19" descriptionPropertiesKey="JOSEFS_DAY"/>
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="t" description="Tirol">
+  <SubConfigurations hierarchy="7" description="Tirol">
     <Holidays>
       <Fixed month="MARCH" day="19" descriptionPropertiesKey="JOSEFS_DAY"/>
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="va" description="Vorarlberg">
+  <SubConfigurations hierarchy="8" description="Vorarlberg">
     <Holidays>
       <Fixed month="MARCH" day="19" descriptionPropertiesKey="JOSEFS_DAY"/>
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="w" description="Wien">
+  <SubConfigurations hierarchy="9" description="Wien">
     <Holidays>
       <Fixed month="NOVEMBER" day="15" descriptionPropertiesKey="LEOPOLD"/>
     </Holidays>

diff --git a/jollyday-core/src/main/resources/holidays/Holidays_au.xml b/jollyday-core/src/main/resources/holidays/Holidays_au.xml
@@ -43,6 +43,7 @@
     <ChristianHoliday type="EASTER_SATURDAY" descriptionPropertiesKey="christian.EASTER_SATURDAY"/>
     <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
   </Holidays>
+
   <SubConfigurations hierarchy="act" description="Australian Capital Territory">
     <Holidays>
       <Fixed month="JANUARY" day="1" validFrom="2008" validTo="2019" descriptionPropertiesKey="NEW_YEAR">
@@ -69,13 +70,14 @@
       <FixedWeekday which="SECOND" weekday="MONDAY" month="JUNE" descriptionPropertiesKey="QUEENS_BIRTHDAY"/>
       <FixedWeekday which="FIRST" weekday="MONDAY" month="OCTOBER" descriptionPropertiesKey="LABOUR_DAY"/>
       <FixedWeekday which="FIRST" weekday="TUESDAY" month="NOVEMBER" validTo="2019"
-                        descriptionPropertiesKey="FAMILY_COMMUNITY"/>
+                    descriptionPropertiesKey="FAMILY_COMMUNITY"/>
       <FixedWeekdayRelativeToFixed validFrom="2020" which="FIRST" weekday="MONDAY" when="AFTER"
-                                       descriptionPropertiesKey="RECONCILIATION">
+                                   descriptionPropertiesKey="RECONCILIATION">
         <day month="MAY" day="26"/>
       </FixedWeekdayRelativeToFixed>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="nsw" description="New South Wales">
     <Holidays>
       <Fixed month="JANUARY" day="1" validFrom="2008" validTo="2019" descriptionPropertiesKey="NEW_YEAR">
@@ -95,9 +97,10 @@
       <FixedWeekday which="SECOND" weekday="MONDAY" month="JUNE" descriptionPropertiesKey="QUEENS_BIRTHDAY"/>
       <FixedWeekday which="FIRST" weekday="MONDAY" month="OCTOBER" descriptionPropertiesKey="LABOUR_DAY"/>
       <FixedWeekday which="FIRST" weekday="MONDAY" month="AUGUST" validFrom="2020"
-                        descriptionPropertiesKey="BANK_HOLIDAY"/>
+                    descriptionPropertiesKey="BANK_HOLIDAY"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="nt" description="Nothern Territory">
     <Holidays>
       <Fixed month="JANUARY" day="1" validFrom="2008" validTo="2019" descriptionPropertiesKey="NEW_YEAR">
@@ -123,6 +126,7 @@
       <FixedWeekday which="FIRST" weekday="MONDAY" month="AUGUST" descriptionPropertiesKey="PICNIC"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="qld" description="Queensland">
     <Holidays>
       <Fixed month="JANUARY" day="1" validFrom="2008" validTo="2019" descriptionPropertiesKey="NEW_YEAR">
@@ -142,10 +146,11 @@
       </Fixed>
       <FixedWeekday which="FIRST" weekday="MONDAY" month="MAY" descriptionPropertiesKey="LABOUR_DAY"/>
       <FixedWeekday which="SECOND" weekday="MONDAY" month="JUNE" validTo="2019"
-                        descriptionPropertiesKey="QUEENS_BIRTHDAY"/>
+                    descriptionPropertiesKey="QUEENS_BIRTHDAY"/>
       <FixedWeekday which="FIRST" weekday="MONDAY" month="OCTOBER" validFrom="2020"
-                        descriptionPropertiesKey="QUEENS_BIRTHDAY"/>
+                    descriptionPropertiesKey="QUEENS_BIRTHDAY"/>
     </Holidays>
+
     <SubConfigurations hierarchy="br" description="Brisbane Area">
       <Holidays>
         <FixedWeekdayBetweenFixed weekday="WEDNESDAY" validFrom="2020" descriptionPropertiesKey="EKKA">
@@ -155,6 +160,7 @@
       </Holidays>
     </SubConfigurations>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="sa" description="South Australia">
     <Holidays>
       <Fixed month="JANUARY" day="1" validFrom="2008" validTo="2019" descriptionPropertiesKey="NEW_YEAR">
@@ -186,6 +192,7 @@
       <FixedWeekday which="FIRST" weekday="MONDAY" month="OCTOBER" descriptionPropertiesKey="LABOUR_DAY"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="tas" description="Tasmania">
     <Holidays>
       <Fixed month="APRIL" day="25" validTo="2019" descriptionPropertiesKey="ANZAC"/>
@@ -205,17 +212,21 @@
       <FixedWeekday which="SECOND" weekday="MONDAY" month="JUNE" descriptionPropertiesKey="QUEENS_BIRTHDAY"/>
       <ChristianHoliday type="EASTER_TUESDAY" descriptionPropertiesKey="christian.EASTER_TUESDAY"/>
     </Holidays>
+
     <SubConfigurations hierarchy="ho" description="Hobart Area">
       <Holidays>
         <FixedWeekday which="SECOND" weekday="MONDAY" month="FEBRUARY" descriptionPropertiesKey="HOBART"/>
       </Holidays>
     </SubConfigurations>
+
     <SubConfigurations hierarchy="nh" description="Non-Hobart Area">
       <Holidays>
         <FixedWeekday which="FIRST" weekday="MONDAY" month="NOVEMBER" descriptionPropertiesKey="RECREATION"/>
       </Holidays>
     </SubConfigurations>
+
   </SubConfigurations>
+
   <SubConfigurations hierarchy="vic" description="Victoria">
     <Holidays>
       <Fixed month="APRIL" day="25" validTo="2019" descriptionPropertiesKey="ANZAC"/>
@@ -233,10 +244,10 @@
       <FixedWeekday which="SECOND" weekday="MONDAY" month="MARCH" descriptionPropertiesKey="LABOUR_DAY"/>
       <FixedWeekday which="SECOND" weekday="MONDAY" month="JUNE" descriptionPropertiesKey="QUEENS_BIRTHDAY"/>
       <FixedWeekday which="FIRST" weekday="TUESDAY" month="NOVEMBER" descriptionPropertiesKey="MELBOURNE_CUP"/>
-      <FixedWeekday which="LAST" weekday="FRIDAY" month="SEPTEMBER" validFrom="2020"
-                        descriptionPropertiesKey="AFL"/>
+      <FixedWeekday which="LAST" weekday="FRIDAY" month="SEPTEMBER" validFrom="2020" descriptionPropertiesKey="AFL"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="wa" description="Western Australia">
     <Holidays>
       <Fixed month="JANUARY" day="1" validFrom="2008" validTo="2019" descriptionPropertiesKey="NEW_YEAR">
@@ -260,10 +271,9 @@
         <MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
       </Fixed>
       <FixedWeekday which="FIRST" weekday="MONDAY" month="MARCH" descriptionPropertiesKey="LABOUR_DAY"/>
-      <FixedWeekday which="FIRST" weekday="MONDAY" month="JUNE" validTo="2019"
-                        descriptionPropertiesKey="FOUNDATION"/>
+      <FixedWeekday which="FIRST" weekday="MONDAY" month="JUNE" validTo="2019" descriptionPropertiesKey="FOUNDATION"/>
       <FixedWeekday which="FIRST" weekday="MONDAY" month="JUNE" validFrom="2020"
-                        descriptionPropertiesKey="WESTERN_AUSTRALIA"/>
+                    descriptionPropertiesKey="WESTERN_AUSTRALIA"/>
       <FixedWeekday which="LAST" weekday="MONDAY" month="SEPTEMBER" descriptionPropertiesKey="QUEENS_BIRTHDAY"/>
     </Holidays>
   </SubConfigurations>

diff --git a/jollyday-core/src/main/resources/holidays/Holidays_ba.xml b/jollyday-core/src/main/resources/holidays/Holidays_ba.xml
@@ -25,14 +25,16 @@
     <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     <IslamicHoliday type="MAWLID_AN_NABI" descriptionPropertiesKey="islamic.MAWLID_AN_NABI"/>
   </Holidays>
-  <SubConfigurations hierarchy="rs" description="Republika Srpska">
+
+  <SubConfigurations hierarchy="srp" description="Republika Srpska">
     <Holidays>
       <Fixed month="JANUARY" day="9" descriptionPropertiesKey="REPUBLIC_DAY"/>
       <Fixed month="MAY" day="9" descriptionPropertiesKey="VICTORY"/>
       <Fixed month="NOVEMBER" day="21" descriptionPropertiesKey="DAYTON"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="fbh" description="Federation of Bosnia and Herzegovina">
+
+  <SubConfigurations hierarchy="bih" description="Federation of Bosnia and Herzegovina">
     <Holidays>
       <Fixed month="MARCH" day="1" descriptionPropertiesKey="INDEPENDENCE_DAY"/>
       <Fixed month="NOVEMBER" day="25" descriptionPropertiesKey="NATIONAL_DAY"/>

diff --git a/jollyday-core/src/main/resources/holidays/Holidays_be.xml b/jollyday-core/src/main/resources/holidays/Holidays_be.xml
@@ -16,13 +16,9 @@
     <Fixed month="NOVEMBER" day="15" localizedType="UNOFFICIAL_HOLIDAY" descriptionPropertiesKey="KINGS_FEAST"/>
     <Fixed month="DECEMBER" day="31" descriptionPropertiesKey="NEW_YEARS_EVE" localizedType="UNOFFICIAL_HOLIDAY"/>
     <ChristianHoliday type="EASTER" descriptionPropertiesKey="christian.EASTER" localizedType="OFFICIAL_HOLIDAY"/>
-    <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"
-                      localizedType="OFFICIAL_HOLIDAY"/>
-    <ChristianHoliday type="ASCENSION_DAY" descriptionPropertiesKey="christian.ASCENSION_DAY"
-                      localizedType="OFFICIAL_HOLIDAY"/>
-    <ChristianHoliday type="PENTECOST" descriptionPropertiesKey="christian.PENTECOST"
-                      localizedType="OFFICIAL_HOLIDAY"/>
-    <ChristianHoliday type="PENTECOST_MONDAY" descriptionPropertiesKey="christian.PENTECOST_MONDAY"
-                      localizedType="OFFICIAL_HOLIDAY"/>
+    <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
+    <ChristianHoliday type="ASCENSION_DAY" descriptionPropertiesKey="christian.ASCENSION_DAY"/>
+    <ChristianHoliday type="PENTECOST" descriptionPropertiesKey="christian.PENTECOST"/>
+    <ChristianHoliday type="PENTECOST_MONDAY" descriptionPropertiesKey="christian.PENTECOST_MONDAY"/>
   </Holidays>
 </Configuration>
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_br.xml b/jollyday-core/src/main/resources/holidays/Holidays_br.xml
@@ -19,6 +19,7 @@
     <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
     <ChristianHoliday type="CORPUS_CHRISTI" descriptionPropertiesKey="christian.CORPUS_CHRISTI"/>
   </Holidays>
+
   <SubConfigurations hierarchy="rj" description="Rio de Janeiro">
     <Holidays>
       <Fixed month="APRIL" day="23" validFrom="2007" descriptionPropertiesKey="ST_GEORGE"/>
@@ -31,6 +32,7 @@
       </Holidays>
     </SubConfigurations>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="sp" description="Sao Paulo">
     <Holidays>
       <Fixed month="JULY" day="9" descriptionPropertiesKey="CONST_REVOLUTION"/>
@@ -42,73 +44,86 @@
       </Holidays>
     </SubConfigurations>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="mg" description="Minas Gerais">
-    <Holidays></Holidays>
+    <Holidays/>
     <SubConfigurations hierarchy="bh" description="Belo Horizonte">
       <Holidays>
         <Fixed month="AUGUST" day="15" descriptionPropertiesKey="LADY_GOOD_VOYAGE"/>
         <Fixed month="DECEMBER" day="8" descriptionPropertiesKey="LADY_CONCEICAO"/>
       </Holidays>
     </SubConfigurations>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="ms" description="Mato Grosso do Sul">
     <Holidays>
       <Fixed month="OCTOBER" day="11" descriptionPropertiesKey="FOUNDATION"/>
     </Holidays>
+
     <SubConfigurations hierarchy="cg" description="Campo Grande">
       <Holidays>
         <Fixed month="AUGUST" day="26" descriptionPropertiesKey="FOUNDATION"/>
       </Holidays>
     </SubConfigurations>
+
     <SubConfigurations hierarchy="do" description="Dourados">
       <Holidays>
         <Fixed month="DECEMBER" day="8" descriptionPropertiesKey="LADY_CONCEICAO"/>
       </Holidays>
     </SubConfigurations>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="pr" description="Parana">
-    <Holidays></Holidays>
+    <Holidays/>
     <SubConfigurations hierarchy="cu" description="Curitiba">
       <Holidays>
         <Fixed month="SEPTEMBER" day="8" descriptionPropertiesKey="LADY_LIGHT_PINE"/>
       </Holidays>
     </SubConfigurations>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="rs" description="Rio Grande do Sul">
     <Holidays>
       <Fixed month="SEPTEMBER" day="20" descriptionPropertiesKey="FARROUS_REVOLUTION"/>
     </Holidays>
+
     <SubConfigurations hierarchy="sm" description="Santa Maria">
       <Holidays>
         <Fixed month="DECEMBER" day="8" descriptionPropertiesKey="LADY_CONCEICAO"/>
       </Holidays>
     </SubConfigurations>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="rn" description="Rio Grande do Norte">
     <Holidays>
       <Fixed month="OCTOBER" day="3" descriptionPropertiesKey="MARTYRS_DAY"/>
     </Holidays>
+
     <SubConfigurations hierarchy="na" description="Natal">
       <Holidays>
         <Fixed month="NOVEMBER" day="21" descriptionPropertiesKey="LADY_APRESENTACAO"/>
       </Holidays>
     </SubConfigurations>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="go" description="Goiás">
     <Holidays>
       <Fixed month="OCTOBER" day="24" descriptionPropertiesKey="FOUNDATION"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="pe" description="Pernambuco">
     <Holidays>
       <Fixed month="DECEMBER" day="8" descriptionPropertiesKey="LADY_CONCEICAO"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="pb" description="Paraíba">
     <Holidays>
       <Fixed month="JULY" day="26" descriptionPropertiesKey="JOAO_PESSOA_DAY"/>
       <Fixed month="AUGUST" day="5" descriptionPropertiesKey="FOUNDATION"/>
     </Holidays>
+
     <SubConfigurations hierarchy="jpa" description="João Pessoa">
       <Holidays>
         <Fixed month="JUNE" day="24" descriptionPropertiesKey="ST_JOHN"/>