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

focus-shift · Nov 28, 2023 · 36c615a · 36c615a
1 parent 0b6a495
commit 36c615a
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 53 deletions.
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_es.xml b/jollyday-core/src/main/resources/holidays/Holidays_es.xml
@@ -136,7 +136,7 @@
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="m" description="Madrid">
+  <SubConfigurations hierarchy="md" description="Madrid">
     <Holidays>
       <Fixed month="MARCH" day="19" descriptionPropertiesKey="ST_JOSEPH"/>
       <Fixed month="MAY" day="2" descriptionPropertiesKey="REGIONAL"/>
@@ -152,7 +152,7 @@
 
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="mu" description="Murcia">
+  <SubConfigurations hierarchy="mc" description="Murcia">
     <Holidays>
       <Fixed month="MARCH" day="19" descriptionPropertiesKey="ST_JOSEPH"/>
       <Fixed month="JUNE" day="9" descriptionPropertiesKey="REGIONAL"/>
@@ -161,7 +161,7 @@
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="na" description="Navarre">
+  <SubConfigurations hierarchy="nc" description="Navarra">
     <Holidays>
       <Fixed month="MARCH" day="19" descriptionPropertiesKey="ST_JOSEPH"/>
       <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>
@@ -170,7 +170,7 @@
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="o" description="Asturias">
+  <SubConfigurations hierarchy="as" description="Asturias">
     <Holidays>
       <Fixed month="SEPTEMBER" day="8" descriptionPropertiesKey="REGIONAL"/>
       <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY">
@@ -191,7 +191,7 @@
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="s" description="Cantabria">
+  <SubConfigurations hierarchy="cb" description="Cantabria">
     <Holidays>
       <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>
       <Fixed month="SEPTEMBER" day="15" descriptionPropertiesKey="APARECIDA"/>

diff --git a/jollyday-core/src/main/resources/holidays/Holidays_fr.xml b/jollyday-core/src/main/resources/holidays/Holidays_fr.xml
@@ -19,47 +19,51 @@
     <ChristianHoliday type="WHIT_MONDAY" validFrom="2008" descriptionPropertiesKey="christian.WHIT_MONDAY"/>
   </Holidays>
 
-  <SubConfigurations hierarchy="ma" description="Martinique">
-    <Holidays>
-      <Fixed month="MAY" day="22"/>
-    </Holidays>
-  </SubConfigurations>
+  <SubConfigurations hierarchy="GES" description="Grand Est">
+    <Holidays/>
 
-  <SubConfigurations hierarchy="gu" description="Guadeloupe">
-    <Holidays>
-      <Fixed month="MAY" day="27"/>
-    </Holidays>
-  </SubConfigurations>
+    <SubConfigurations hierarchy="57" description="Moselle">
+      <Holidays>
+        <Fixed month="DECEMBER" day="26"/>
+      </Holidays>
+    </SubConfigurations>
 
-  <SubConfigurations hierarchy="gy" description="Guyane">
-    <Holidays>
-      <Fixed month="JUNE" day="10"/>
-    </Holidays>
+    <SubConfigurations hierarchy="67" description="Bas-Rhin">
+      <Holidays>
+        <Fixed month="DECEMBER" day="26"/>
+        <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="68" description="Haut-Rhin">
+      <Holidays>
+        <Fixed month="DECEMBER" day="26"/>
+        <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+      </Holidays>
+    </SubConfigurations>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="lr" description="La Reunion">
+  <SubConfigurations hierarchy="971" description="Guadeloupe">
     <Holidays>
-      <Fixed month="DECEMBER" day="20"/>
+      <Fixed month="MAY" day="27"/>
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="br" description="Bas-Rhin">
+  <SubConfigurations hierarchy="972" description="Martinique">
     <Holidays>
-      <Fixed month="DECEMBER" day="26"/>
-      <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+      <Fixed month="MAY" day="22"/>
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="hr" description="Haut-Rhin">
+  <SubConfigurations hierarchy="973" description="Guyane">
     <Holidays>
-      <Fixed month="DECEMBER" day="26"/>
-      <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+      <Fixed month="JUNE" day="10"/>
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="mo" description="Moselle">
+  <SubConfigurations hierarchy="974" description="La Reunion">
     <Holidays>
-      <Fixed month="DECEMBER" day="26"/>
+      <Fixed month="DECEMBER" day="20"/>
     </Holidays>
   </SubConfigurations>
 </Configuration>
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_ni.xml b/jollyday-core/src/main/resources/holidays/Holidays_ni.xml
@@ -20,46 +20,62 @@
     <ChristianHoliday type="MAUNDY_THURSDAY" descriptionPropertiesKey="christian.MAUNDY_THURSDAY"/>
   </Holidays>
 
-  <SubConfigurations hierarchy="bo" description="Boaco">
+  <SubConfigurations hierarchy="BO" description="Boaco">
     <Holidays>
       <Fixed month="JULY" day="25" descriptionPropertiesKey="SANTIAGO"/>
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="so" description="Somoto">
-    <Holidays>
-      <Fixed month="JULY" day="25" descriptionPropertiesKey="SANTIAGO"/>
-    </Holidays>
+  <SubConfigurations hierarchy="GR" description="Granada">
+    <Holidays/>
+
+    <SubConfigurations hierarchy="na" description="Nandaime">
+      <Holidays>
+        <Fixed month="JULY" day="26" descriptionPropertiesKey="SANTA_ANA"/>
+      </Holidays>
+    </SubConfigurations>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="mn" description="Managua">
+  <SubConfigurations hierarchy="MD" description="Madriz">
+    <Holidays/>
+
+    <SubConfigurations hierarchy="so" description="Somoto">
+      <Holidays>
+        <Fixed month="JULY" day="25" descriptionPropertiesKey="SANTIAGO"/>
+      </Holidays>
+    </SubConfigurations>
+  </SubConfigurations>
+
+  <SubConfigurations hierarchy="MN" description="Managua">
     <Holidays>
       <Fixed month="JULY" day="25" descriptionPropertiesKey="SANTIAGO"/>
       <Fixed month="AUGUST" day="1" descriptionPropertiesKey="SANTO_DOMINGO"/>
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="na" description="Nandaime">
-    <Holidays>
-      <Fixed month="JULY" day="26" descriptionPropertiesKey="SANTA_ANA"/>
-    </Holidays>
-  </SubConfigurations>
+  <SubConfigurations hierarchy="MS" description="Masaya">
+    <Holidays/>
 
-  <SubConfigurations hierarchy="ni" description="Niquinohomo">
-    <Holidays>
-      <Fixed month="JULY" day="26" descriptionPropertiesKey="SANTA_ANA"/>
-    </Holidays>
+    <SubConfigurations hierarchy="ni" description="Niquinohomo">
+      <Holidays>
+        <Fixed month="JULY" day="26" descriptionPropertiesKey="SANTA_ANA"/>
+      </Holidays>
+    </SubConfigurations>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="mo" description="Moyogalpa">
-    <Holidays>
-      <Fixed month="JULY" day="26" descriptionPropertiesKey="SANTA_ANA"/>
-    </Holidays>
-  </SubConfigurations>
+  <SubConfigurations hierarchy="RI" description="Rivas">
+    <Holidays/>
 
-  <SubConfigurations hierarchy="om" description="Ometepe">
-    <Holidays>
-      <Fixed month="JULY" day="26" descriptionPropertiesKey="SANTA_ANA"/>
-    </Holidays>
+    <SubConfigurations hierarchy="mo" description="Moyogalpa">
+      <Holidays>
+        <Fixed month="JULY" day="26" descriptionPropertiesKey="SANTA_ANA"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="om" description="Ometepe">
+      <Holidays>
+        <Fixed month="JULY" day="26" descriptionPropertiesKey="SANTA_ANA"/>
+      </Holidays>
+    </SubConfigurations>
   </SubConfigurations>
 </Configuration>