Fix Moldova

Signed-off-by: XSpielinbox <[email protected]>
XSpielinbox · Nov 27, 2023 · caed6cb · caed6cb
1 parent e6ca154
commit caed6cb
Show file tree

Hide file tree

Showing 9 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
@@ -283,9 +283,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
@@ -284,8 +284,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
@@ -284,8 +284,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
@@ -284,8 +284,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
@@ -284,8 +284,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
@@ -284,8 +284,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
@@ -284,8 +284,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_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/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 @@ void ensuresThatChristmasIsConfigured(@ForAll @YearRange Year year) {
   @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));