Repository: focus-shift/jollyday
Pull request #360 (2023-10-10 20:45:10)

Improve india and moldova  for ISO3166-2
 🐞 closes  #269
 🐞 fixes part of #267

However, it is missing translations at the moment, as I did not know how to translate them.

<!--

Thanks for contributing.
Please review the following notes before submitting you pull request.

Please look for other issues or pull requests which already work on this topic. Is somebody already on it? Do you need to synchronize?

# Security Vulnerabilities

🛑 STOP! 🛑 If your contribution fixes a security vulnerability, please do not submit it.
Instead, please write an E-Mail to to one of the maintainer with all the information
to recreate the security vulnerability.

# Describing Your Changes

If, having reviewed the notes above, you're ready to submit your pull request, please
provide a brief description of the proposed changes.

If they:
 🐞 fix a bug, please describe the broken behaviour and how the changes fix it.
    Please label with 'type: bug' and 'status: new'
    
 🎁 make an enhancement, please describe the new functionality and why you believe it's useful.
    Please label with 'type: enhancement' and 'status: new'
 
If your pull request relates to any existing issues,
please reference them by using the issue number prefixed with #.

-->


derTobsch: Good Morning,
please do not delete the German cities. I need to think about this again. We need this information at the urlaubsverwaltung. I will comment in the other ticket, how we could/should handle this. My first thoughts are: if it is a deterministic public holiday, based on fixed calculations, like the others we have atm, then we could keep them.

Patch:
diff --git a/jollyday-core/src/main/resources/descriptions/country_descriptions.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions.properties
index 3481cd77..61a37ed0 100644
--- a/jollyday-core/src/main/resources/descriptions/country_descriptions.properties
+++ b/jollyday-core/src/main/resources/descriptions/country_descriptions.properties
@@ -215,38 +215,39 @@ country.description.im        = Isle of Man
 country.description.in        = India
 country.description.in.an     = Andaman and Nicobar Islands
 country.description.in.ap     = Andhra Pradesh
-country.description.in.ar     = Arunachal Pradesh
+country.description.in.ar     = Arunāchal Pradesh
 country.description.in.as     = Assam
-country.description.in.br     = Bihar
-country.description.in.ch     = Chandigarh
-country.description.in.ct     = Chhattisgarh
-country.description.in.dd     = Daman and Diu
+country.description.in.br     = Bihār
+country.description.in.ch     = Chandīgarh
+country.description.in.ct     = Chhattīsgarh
+country.description.in.dh     = Dādra and Nagar Haveli and Damān and Diu
 country.description.in.dl     = Delhi
-country.description.in.dn     = Dadra and Nagar Haveli
 country.description.in.ga     = Goa
-country.description.in.gj     = Gujarat
-country.description.in.hp     = Himachal Pradesh
-country.description.in.hr     = Haryana
-country.description.in.jh     = Jharkhand
-country.description.in.jk     = Jammu and Kashmir
-country.description.in.ka     = Karnataka
+country.description.in.gj     = Gujarāt
+country.description.in.hp     = Himāchal Pradesh
+country.description.in.hr     = Haryāna
+country.description.in.jh     = Jhārkhand
+country.description.in.jk     = Jammu and Kashmīr
+country.description.in.ka     = Karnātaka
 country.description.in.kl     = Kerala
+country.description.in.la     = Ladākh
 country.description.in.ld     = Lakshadweep
-country.description.in.mh     = Maharashtra
-country.description.in.ml     = Meghalaya
+country.description.in.mh     = Mahārāshtra
+country.description.in.ml     = Meghālaya
 country.description.in.mn     = Manipur
 country.description.in.mp     = Madhya Pradesh
 country.description.in.mz     = Mizoram
-country.description.in.nl     = Nagaland
-country.description.in.or     = Orissa
+country.description.in.nl     = Nāgāland
+country.description.in.or     = Odisha
 country.description.in.pb     = Punjab
 country.description.in.py     = Puducherry
-country.description.in.rj     = Rajasthan
+country.description.in.rj     = Rājasthān
 country.description.in.sk     = Sikkim
-country.description.in.tn     = Tamil Nadu
+country.description.in.tg     = Telangāna
+country.description.in.tn     = Tamil Nādu
 country.description.in.tr     = Tripura
-country.description.in.ul     = Uttarakhand
 country.description.in.up     = Uttar Pradesh
+country.description.in.ut     = Uttarākhand
 country.description.in.wb     = West Bengal
 country.description.io        = British Indian Ocean Territory
 country.description.iq        = Iraq
@@ -283,9 +284,10 @@ country.description.lv        = Latvia
 country.description.ly        = Libyan Arab Jamahiriya
 country.description.ma        = Morocco
 country.description.mc        = Monaco
-country.description.md        = Moldova, Republic Of
-country.description.md.bti    = Balti
-country.description.md.ch     = Chisinau
+country.description.md        = Moldova, Republic of
+country.description.md.ba     = Bălți
+country.description.md.bd     = Bender [Tighina]
+country.description.md.cu     = Chișinău
 country.description.me        = Montenegro
 country.description.mg        = Madagascar
 country.description.mh        = Marshall Islands
diff --git a/jollyday-core/src/main/resources/descriptions/country_descriptions_de.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions_de.properties
index 52771850..e2d0d2b9 100644
--- a/jollyday-core/src/main/resources/descriptions/country_descriptions_de.properties
+++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_de.properties
@@ -220,9 +220,8 @@ country.description.in.as     = Assam
 country.description.in.br     = Bihar
 country.description.in.ch     = Chandigarh
 country.description.in.ct     = Chhattisgarh
-country.description.in.dd     = Daman und Diu
+country.description.in.dh     = Dadra und Nagar Haveli und Daman und Diu
 country.description.in.dl     = Delhi
-country.description.in.dn     = Dadra und Nagar Haveli
 country.description.in.ga     = Goa
 country.description.in.gj     = Gujarat
 country.description.in.hp     = Himachal Pradesh
@@ -245,8 +244,8 @@ country.description.in.rj     = Rajasthan
 country.description.in.sk     = Sikkim
 country.description.in.tn     = Tamil Nadu
 country.description.in.tr     = Tripura
-country.description.in.ul     = Uttarakhand
 country.description.in.up     = Uttar Pradesh
+country.description.in.ut     = Uttarakhand
 country.description.in.wb     = West Bengal
 country.description.io        = Britische Territorien im Indischen Ozean
 country.description.iq        = Irak
@@ -284,8 +283,8 @@ country.description.ly        = Libysch-Arabische Dschamahirija
 country.description.ma        = Marokko
 country.description.mc        = Monaco
 country.description.md        = Moldau, Rep.
-country.description.md.bti    = Balti
-country.description.md.ch     = Chisinau
+country.description.md.ba     = Balti
+country.description.md.cu     = Chisinau
 country.description.me        = Montenegro
 country.description.mg        = Madagaskar
 country.description.mh        = Marshallinseln
diff --git a/jollyday-core/src/main/resources/descriptions/country_descriptions_el.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions_el.properties
index 541a3695..7b4702bf 100644
--- a/jollyday-core/src/main/resources/descriptions/country_descriptions_el.properties
+++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_el.properties
@@ -220,9 +220,8 @@ country.description.in.as     = Ασάμ
 country.description.in.br     = Μπιχάρ
 country.description.in.ch     = Chandigarh
 country.description.in.ct     = Τσατισγκάρ
-country.description.in.dd     = Δαμαν και Ντίου
+country.description.in.dh     = Dadra και Nagar Haveli και Δαμαν και Ντίου
 country.description.in.dl     = Δελχί
-country.description.in.dn     = Dadra και Nagar Haveli
 country.description.in.ga     = Γκόα
 country.description.in.gj     = Gujarat
 country.description.in.hp     = Arunachal Pradesh
@@ -245,8 +244,8 @@ country.description.in.rj     = Rajasthan
 country.description.in.sk     = Sikkim
 country.description.in.tn     = Tamil Nadu
 country.description.in.tr     = Tripura
-country.description.in.ul     = Uttarakhand
 country.description.in.up     = Uttar Pradesh
+country.description.in.ut     = Uttarakhand
 country.description.in.wb     = Δυτική Βεγγάλη
 country.description.io        = Βρετανικό Έδαφος του Ινδικού Ωκεανού
 country.description.iq        = Ιράκ
@@ -284,8 +283,8 @@ country.description.ly        = Λιβυκή Αραβική Τζαμαχιρία
 country.description.ma        = Μαρόκο
 country.description.mc        = Μονακό
 country.description.md        = Δημοκρατία της Μολδαβίας
-country.description.md.bti    = Μπαλτί
-country.description.md.ch     = Κισινάου
+country.description.md.ba     = Μπαλτί
+country.description.md.cu     = Κισινάου
 country.description.me        = Μαυροβούνιο
 country.description.mg        = Μαδαγασκάρη
 country.description.mh        = Νησιά Μάρσαλ
diff --git a/jollyday-core/src/main/resources/descriptions/country_descriptions_fr.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions_fr.properties
index a3b287ef..03489377 100644
--- a/jollyday-core/src/main/resources/descriptions/country_descriptions_fr.properties
+++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_fr.properties
@@ -220,9 +220,8 @@ country.description.in.as     = Assam
 country.description.in.br     = Bihar
 country.description.in.ch     = Chandigarh
 country.description.in.ct     = Chhattisgarh
-country.description.in.dd     = Daman et Diu
+country.description.in.dh     = Dadra et Nagar Haveli et Daman et Diu
 country.description.in.dl     = Delhi
-country.description.in.dn     = Dadra et Nagar Haveli
 country.description.in.ga     = Goa
 country.description.in.gj     = Gujarat
 country.description.in.hp     = Himachal Pradesh
@@ -245,8 +244,8 @@ country.description.in.rj     = Rajasthan
 country.description.in.sk     = Sikkim
 country.description.in.tn     = Tamil Nadu
 country.description.in.tr     = Tripura
-country.description.in.ul     = Uttaranchal
 country.description.in.up     = Uttar Pradesh
+country.description.in.ut     = Uttaranchal
 country.description.in.wb     = Bengale occidental
 country.description.io        = Océan Indien, Territoire Britannique de L'
 country.description.iq        = Iraq
@@ -284,8 +283,8 @@ country.description.ly        = Libye
 country.description.ma        = Maroc
 country.description.mc        = Monaco
 country.description.md        = Moldova, République de
-country.description.md.bti    = Balti
-country.description.md.ch     = Chisinau
+country.description.md.ba     = Balti
+country.description.md.cu     = Chisinau
 country.description.me        = Monténégro
 country.description.mg        = Madagascar
 country.description.mh        = Marshall, Îles
diff --git a/jollyday-core/src/main/resources/descriptions/country_descriptions_nl.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions_nl.properties
index 7f9cbf86..8651b9e7 100644
--- a/jollyday-core/src/main/resources/descriptions/country_descriptions_nl.properties
+++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_nl.properties
@@ -220,9 +220,8 @@ country.description.in.as     = Assam
 country.description.in.br     = Bihar
 country.description.in.ch     = Chandigarh
 country.description.in.ct     = Chhattisgarh
-country.description.in.dd     = Daman and Diu
+country.description.in.dh     = Dadra and Nagar Haveli and Daman and Diu
 country.description.in.dl     = Delhi
-country.description.in.dn     = Dadra and Nagar Haveli
 country.description.in.ga     = Goa
 country.description.in.gj     = Gujarat
 country.description.in.hp     = Himachal Pradesh
@@ -245,8 +244,8 @@ country.description.in.rj     = Rajasthan
 country.description.in.sk     = Sikkim
 country.description.in.tn     = Tamil Nadu
 country.description.in.tr     = Tripura
-country.description.in.ul     = Uttarakhand
 country.description.in.up     = Uttar Pradesh
+country.description.in.ut     = Uttarakhand
 country.description.in.wb     = West Bengal
 country.description.io        = British Indian Ocean Territory
 country.description.iq        = Iraq
@@ -284,8 +283,8 @@ country.description.ly        = Libyan Arab Jamahiriya
 country.description.ma        = Morocco
 country.description.mc        = Monaco
 country.description.md        = Moldova, Republic Of
-country.description.md.bti    = Balti
-country.description.md.ch     = Chisinau
+country.description.md.ba     = Balti
+country.description.md.cu     = Chisinau
 country.description.me        = Montenegro
 country.description.mg        = Madagascar
 country.description.mh        = Marshall Islands
diff --git a/jollyday-core/src/main/resources/descriptions/country_descriptions_pt.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions_pt.properties
index f22b8043..67ec9aa6 100644
--- a/jollyday-core/src/main/resources/descriptions/country_descriptions_pt.properties
+++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_pt.properties
@@ -220,9 +220,8 @@ country.description.in.as     = Assam
 country.description.in.br     = Bihar
 country.description.in.ch     = Chandigarh
 country.description.in.ct     = Chhattisgarh
-country.description.in.dd     = Daman and Diu
+country.description.in.dh     = Dadra and Nagar Haveli and Daman and Diu
 country.description.in.dl     = Déli
-country.description.in.dn     = Dadra and Nagar Haveli
 country.description.in.ga     = Goa
 country.description.in.gj     = Gujarat
 country.description.in.hp     = Himachal Pradesh
@@ -245,8 +244,8 @@ country.description.in.rj     = Rajasthan
 country.description.in.sk     = Sikkim
 country.description.in.tn     = Tamil Nadu
 country.description.in.tr     = Tripura
-country.description.in.ul     = Uttarakhand
 country.description.in.up     = Uttar Pradesh
+country.description.in.ut     = Uttarakhand
 country.description.in.wb     = West Bengal
 country.description.io        = Território Britânico do Oceano Índico
 country.description.iq        = Iraque
@@ -284,8 +283,8 @@ country.description.ly        = Líbia
 country.description.ma        = Marrocos
 country.description.mc        = Mónaco
 country.description.md        = Moldávia
-country.description.md.bti    = Balti
-country.description.md.ch     = Quichinau
+country.description.md.ba     = Balti
+country.description.md.cu     = Quichinau
 country.description.me        = Montenegro
 country.description.mg        = Madagáscar
 country.description.mh        = Ilhas Marshall
diff --git a/jollyday-core/src/main/resources/descriptions/country_descriptions_sv.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions_sv.properties
index ae4a69e3..b1f2f398 100644
--- a/jollyday-core/src/main/resources/descriptions/country_descriptions_sv.properties
+++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_sv.properties
@@ -220,9 +220,8 @@ country.description.in.as     = Assam
 country.description.in.br     = Bihar
 country.description.in.ch     = Chandigarh
 country.description.in.ct     = Chhattisgarh
-country.description.in.dd     = Daman and Diu
+country.description.in.dh     = Dadra and Nagar Haveli and Daman and Diu
 country.description.in.dl     = Delhi
-country.description.in.dn     = Dadra and Nagar Haveli
 country.description.in.ga     = Goa
 country.description.in.gj     = Gujarat
 country.description.in.hp     = Himachal Pradesh
@@ -245,8 +244,8 @@ country.description.in.rj     = Rajasthan
 country.description.in.sk     = Sikkim
 country.description.in.tn     = Tamil Nadu
 country.description.in.tr     = Tripura
-country.description.in.ul     = Uttarakhand
 country.description.in.up     = Uttar Pradesh
+country.description.in.ut     = Uttarakhand
 country.description.in.wb     = West Bengal
 country.description.io        = British Indian Ocean Territory
 country.description.iq        = Iraq
@@ -284,8 +283,8 @@ country.description.ly        = Libyan Arab Jamahiriya
 country.description.ma        = Morocco
 country.description.mc        = Monaco
 country.description.md        = Moldova, Republic Of
-country.description.md.bti    = Balti
-country.description.md.ch     = Chisinau
+country.description.md.ba     = Balti
+country.description.md.cu     = Chisinau
 country.description.me        = Montenegro
 country.description.mg        = Madagascar
 country.description.mh        = Marshall Islands
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_in.xml b/jollyday-core/src/main/resources/holidays/Holidays_in.xml
index b0280e68..22afcd34 100644
--- a/jollyday-core/src/main/resources/holidays/Holidays_in.xml
+++ b/jollyday-core/src/main/resources/holidays/Holidays_in.xml
@@ -9,6 +9,12 @@
     <Fixed month="AUGUST" day="15" descriptionPropertiesKey="INDEPENDENCE_DAY"/>
     <Fixed month="OCTOBER" day="2" descriptionPropertiesKey="GHANDIS_BIRTHDAY"/>
   </Holidays>
+
+  <Sources>
+    <Source of="ISO 3166">https://www.iso.org/obp/ui/#iso:code:3166:IN</Source>
+    <Source of="ISO 3166-2">https://en.wikipedia.org/wiki/ISO_3166-2:IN</Source>
+  </Sources>
+
   <SubConfigurations hierarchy="ap" description="Andhra Pradesh">
     <Holidays>
       <Fixed month="APRIL" day="14"/>
@@ -20,7 +26,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="ar" description="Arunachal Pradesh">
+  <SubConfigurations hierarchy="ar" description="Arunāchal Pradesh">
     <Holidays>
       <Fixed month="JANUARY" day="1" descriptionPropertiesKey="NEW_YEAR"/>
       <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
@@ -40,7 +46,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="br" description="Bihar">
+  <SubConfigurations hierarchy="br" description="Bihār">
     <Holidays>
       <Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
       <Fixed month="APRIL" day="14"/>
@@ -52,7 +58,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="ct" description="Chhattisgarh">
+  <SubConfigurations hierarchy="ct" description="Chhattīsgarh">
     <Holidays>
       <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
       <IslamicHoliday type="ASCHURA" descriptionPropertiesKey="islamic.ASCHURA"/>
@@ -70,7 +76,7 @@
       <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="gj" description="Gujarat">
+  <SubConfigurations hierarchy="gj" description="Gujarāt">
     <Holidays>
       <Fixed month="APRIL" day="14"/>
       <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
@@ -78,37 +84,28 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="hr" description="Haryana">
+  <SubConfigurations hierarchy="hr" description="Haryāna">
     <Holidays>
       <Fixed month="APRIL" day="14"/>
       <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
       <IslamicHoliday type="ID_AL_FITR" descriptionPropertiesKey="islamic.ID_AL_FITR"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="hp" description="Himachal Pradesh">
+  <SubConfigurations hierarchy="hp" description="Himāchal Pradesh">
     <Holidays>
       <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
       <IslamicHoliday type="ID_AL_FITR" descriptionPropertiesKey="islamic.ID_AL_FITR"/>
       <IslamicHoliday type="ASCHURA" descriptionPropertiesKey="islamic.ASCHURA"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="jk" description="Jammu and Kashmir">
-    <Holidays>
-      <Fixed month="APRIL" day="14"/>
-      <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
-      <IslamicHoliday type="ASCHURA" descriptionPropertiesKey="islamic.ASCHURA"/>
-      <IslamicHoliday type="ID_AL_FITR" descriptionPropertiesKey="islamic.ID_AL_FITR"/>
-      <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="jh" description="Jharkhand">
+  <SubConfigurations hierarchy="jh" description="Jhārkhand">
     <Holidays>
       <ChristianHoliday type="EASTER" descriptionPropertiesKey="christian.EASTER"/>
       <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="ka" description="Karnataka">
+  <SubConfigurations hierarchy="ka" description="Karnātaka">
     <Holidays>
       <Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
       <Fixed month="APRIL" day="14"/>
@@ -143,7 +140,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="mh" description="Maharashtra">
+  <SubConfigurations hierarchy="mh" description="Mahārāshtra">
     <Holidays>
       <Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
       <Fixed month="APRIL" day="14"/>
@@ -166,7 +163,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="ml" description="Meghalaya">
+  <SubConfigurations hierarchy="ml" description="Meghālaya">
     <Holidays>
       <Fixed month="JANUARY" day="1" descriptionPropertiesKey="NEW_YEAR"/>
       <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
@@ -186,7 +183,7 @@
       <IslamicHoliday type="ID_AL_FITR" descriptionPropertiesKey="islamic.ID_AL_FITR"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="nl" description="Nagaland">
+  <SubConfigurations hierarchy="nl" description="Nāgāland">
     <Holidays>
       <Fixed month="JANUARY" day="1" descriptionPropertiesKey="NEW_YEAR"/>
       <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
@@ -196,7 +193,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="or" description="Orissa">
+  <SubConfigurations hierarchy="or" description="Odisha">
     <Holidays>
       <Fixed month="APRIL" day="14"/>
       <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
@@ -211,7 +208,7 @@
       <IslamicHoliday type="ID_AL_FITR" descriptionPropertiesKey="islamic.ID_AL_FITR"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="rj" description="Rajasthan">
+  <SubConfigurations hierarchy="rj" description="Rājasthān">
     <Holidays>
       <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
       <IslamicHoliday type="ASCHURA" descriptionPropertiesKey="islamic.ASCHURA"/>
@@ -229,7 +226,7 @@
       <IslamicHoliday type="ID_AL_FITR" descriptionPropertiesKey="islamic.ID_AL_FITR"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="tn" description="Tamil Nadu">
+  <SubConfigurations hierarchy="tn" description="Tamil Nādu">
     <Holidays>
       <Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
       <Fixed month="APRIL" day="14"/>
@@ -264,7 +261,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="ul" description="Uttarakhand">
+  <SubConfigurations hierarchy="ut" description="Uttarākhand">
     <Holidays>
       <Fixed month="APRIL" day="14"/>
       <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
@@ -299,7 +296,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="ch" description="Chandigarh">
+  <SubConfigurations hierarchy="ch" description="Chandīgarh">
     <Holidays>
       <Fixed month="APRIL" day="14"/>
       <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
@@ -310,16 +307,17 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="dn" description="Dadra and Nagar Haveli">
+  <SubConfigurations hierarchy="dl" description="Delhi">
     <Holidays>
       <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
       <ChristianHoliday type="EASTER" descriptionPropertiesKey="christian.EASTER"/>
       <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+      <IslamicHoliday type="ASCHURA" descriptionPropertiesKey="islamic.ASCHURA"/>
       <IslamicHoliday type="ID_AL_FITR" descriptionPropertiesKey="islamic.ID_AL_FITR"/>
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="dd" description="Daman and Diu">
+  <SubConfigurations hierarchy="dh" description="Dādra and Nagar Haveli and Damān and Diu">
     <Holidays>
       <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
       <ChristianHoliday type="EASTER" descriptionPropertiesKey="christian.EASTER"/>
@@ -328,21 +326,20 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="ld" description="Lakshadweep">
+  <SubConfigurations hierarchy="jk" description="Jammu and Kashmīr">
     <Holidays>
+      <Fixed month="APRIL" day="14"/>
       <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
-      <ChristianHoliday type="EASTER" descriptionPropertiesKey="christian.EASTER"/>
-      <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+      <IslamicHoliday type="ASCHURA" descriptionPropertiesKey="islamic.ASCHURA"/>
+      <IslamicHoliday type="ID_AL_FITR" descriptionPropertiesKey="islamic.ID_AL_FITR"/>
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="dl" description="Delhi">
+  <SubConfigurations hierarchy="ld" description="Lakshadweep">
     <Holidays>
       <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
       <ChristianHoliday type="EASTER" descriptionPropertiesKey="christian.EASTER"/>
       <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
-      <IslamicHoliday type="ASCHURA" descriptionPropertiesKey="islamic.ASCHURA"/>
-      <IslamicHoliday type="ID_AL_FITR" descriptionPropertiesKey="islamic.ID_AL_FITR"/>
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_md.xml b/jollyday-core/src/main/resources/holidays/Holidays_md.xml
index 2bb586b8..5ebfaa8a 100644
--- a/jollyday-core/src/main/resources/holidays/Holidays_md.xml
+++ b/jollyday-core/src/main/resources/holidays/Holidays_md.xml
@@ -18,7 +18,13 @@
     <ChristianHoliday type="EASTER" chronology="JULIAN" descriptionPropertiesKey="christian.EASTER"/>
     <ChristianHoliday type="EASTER_MONDAY" chronology="JULIAN" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
   </Holidays>
-  <SubConfigurations hierarchy="bti" description="Balti">
+
+  <Sources>
+    <Source of="ISO 3166">https://www.iso.org/obp/ui/#iso:code:3166:MD</Source>
+    <Source of="ISO 3166-2">https://en.wikipedia.org/wiki/ISO_3166-2:MD</Source>
+  </Sources>
+
+  <SubConfigurations hierarchy="ba" description="Bălți">
     <Holidays>
       <Fixed month="MAY" day="22" descriptionPropertiesKey="REGIONAL"/>
     </Holidays>
diff --git a/pom.xml b/pom.xml
index d0d6b474..d5f46782 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,7 @@
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-classic</artifactId>
-        <version>1.4.12</version>
+        <version>1.4.11</version>
         <scope>test</scope>
       </dependency>
     </dependencies>


Test patch:
diff --git a/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayMDTest.java b/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayMDTest.java
index d88bf4e0..f1f0c6a9 100644
--- a/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayMDTest.java
+++ b/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayMDTest.java
@@ -179,7 +179,7 @@ class HolidayMDTest extends AbstractCountryTestBase {
   @Property
   void ensuresThatBaltiDayIsConfigured(@ForAll @YearRange Year year) {
     final HolidayManager holidayManager = HolidayManager.getInstance(create(MOLDOVA));
-    final Set<Holiday> holidays = holidayManager.getHolidays(year.getValue(), "bti");
+    final Set<Holiday> holidays = holidayManager.getHolidays(year.getValue(), "ba");
     assertThat(holidays)
       .isNotEmpty()
       .contains(new Holiday(LocalDate.of(year.getValue(), MAY, 22), "REGIONAL", OFFICIAL_HOLIDAY));