Add Bahamas public holidays

Signed-off-by: XSpielinbox <[email protected]>
focus-shift · Aug 24, 2023 · 2372ae6 · 2372ae6
1 parent df5c622
commit 2372ae6
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 7 deletions.
diff --git a/jollyday-core/src/main/java/de/focus_shift/HolidayCalendar.java b/jollyday-core/src/main/java/de/focus_shift/HolidayCalendar.java
@@ -10,25 +10,25 @@
  */
 public enum HolidayCalendar {
 
-  ALBANIA("AL"), ARGENTINA("AR"), AUSTRIA("AT"), AUSTRALIA("AU"),
-  BOSNIA_HERZIGOWINA("BA"), BELGIUM("BE"), BERMUDA("BM"), BULGARIA("BG"), BOLIVIA("BO"), BRAZIL("BR"), BELARUS("BY"), BRITISH_VIRGIN_ISLANDS("VG"),
+  ALBANIA("AL"), ARGENTINA("AR"),  AUSTRALIA("AU"), AUSTRIA("AT"),
+  BAHAMAS("BS"), BELARUS("BY"), BELGIUM("BE"), BERMUDA("BM"), BOLIVIA("BO"), BOSNIA_HERZIGOWINA("BA"), BRAZIL("BR"), BRITISH_VIRGIN_ISLANDS("VG"), BULGARIA("BG"),
   CANADA(Locale.CANADA.getCountry()), CAYMAN_ISLANDS("KY"), CHILE("CL"), COLOMBIA("CO"), COSTA_RICA("CR"), CROATIA("HR"), CZECH_REPUBLIC("CZ"),
-  DOW_JONES_STOXX("DJ_STOXX"), DENMARK("DK"),
+  DENMARK("DK"), DOW_JONES_STOXX("DJ_STOXX"),
   ECUADOR("EC"), EGYPT("EG"), ESTONIA("EE"), ETHIOPIA("ET"),
   FINLAND("FI"), FRANCE(Locale.FRANCE.getCountry()),
   GERMANY(Locale.GERMANY.getCountry()), GREECE("GR"),
   HUNGARY("HU"),
   ICELAND("IS"), IRELAND("IE"), ITALY(Locale.ITALY.getCountry()),
   JAPAN("JP"),
   KAZAKHSTAN("KZ"), KOSOVO("XK"),
-  LATVIA("LV"), LIECHTENSTEIN("LI"), LITHUANIA("LT"), LUXEMBOURG("LU"), LONDON_METAL_EXCHANGE("LME"),
+  LATVIA("LV"), LIECHTENSTEIN("LI"), LITHUANIA("LT"), LONDON_METAL_EXCHANGE("LME"), LUXEMBOURG("LU"),
   MACEDONIA("MK"), MALTA("MT"), MEXICO("MX"), MOLDOVA("MD"), MONTENEGRO("ME"),
   NETHERLANDS("NL"), NEW_ZEALAND("NZ"), NICARAGUA("NI"), NIGERIA("NG"), NORWAY("NO"), NYSE("NYSE"),
   PANAMA("PA"), PARAGUAY("PY"), PERU("PE"), POLAND("PL"), PORTUGAL("PT"),
   ROMANIA("RO"), RUSSIA("RU"),
   SAUDI_ARABIA("SA"), SERBIA("RS"), SLOWAKIA("SK"), SLOWENIA("SI"), SOUTH_AFRICA("ZA"), SPAIN("ES"), SWEDEN("SE"), SWITZERLAND("CH"),
   TARGET("TARGET"), TURKEY("TR"),
-  UKRAINE("UA"), UNITED_ARAB_EMIRATES("AE"), UNITED_STATES(Locale.US.getCountry()), UNITED_KINGDOM("GB"), URUGUAY("UY"),
+  UKRAINE("UA"), UNITED_ARAB_EMIRATES("AE"), UNITED_KINGDOM("GB"), UNITED_STATES(Locale.US.getCountry()), URUGUAY("UY"),
   VENEZUELA("VE");
 
   private final String id;

diff --git a/jollyday-core/src/main/resources/descriptions/country_descriptions.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions.properties
@@ -68,8 +68,8 @@ country.description.br.rn     = Rio Grande do Norte
 country.description.br.rn.na  = Natal
 country.description.br.rs     = Rio Grande do Sul
 country.description.br.rs.sm  = Santa Maria
-country.description.br.sp=Sao Paulo
-country.description.br.sp.csp=City of Sao Paulo
+country.description.br.sp     = Sao Paulo
+country.description.br.sp.csp = City of Sao Paulo
 country.description.bs        = Bahamas
 country.description.bt        = Bhutan
 country.description.bv        = Bouvet Island

diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions.properties
@@ -160,6 +160,7 @@ holiday.description.LEE_JACKSON                     = Lee-Jackson Day
 holiday.description.LEOPOLD                         = Leopold III. day
 holiday.description.LIBERATION                      = Liberation Day
 holiday.description.LINCOLN                         = Lincoln's Birthday
+holiday.description.MAJORITY_RULE_DAY               = Majority Rule Day
 holiday.description.MALVINAS                        = Malvinas Day
 holiday.description.MARLBOROUGH_ANNIVERSARY         = Marlborough Anniversary
 holiday.description.MARTINS_DAY                     = Martin of Tours Day

diff --git a/jollyday-core/src/main/resources/holidays/Holidays_bs.xml b/jollyday-core/src/main/resources/holidays/Holidays_bs.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:Configuration hierarchy="bs" description="Bahamas" xmlns:tns="http://www.example.org/Holiday"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.example.org/Holiday /Holiday.xsd">
+  <tns:Holidays>
+    <tns:Fixed month="JANUARY" day="1" descriptionPropertiesKey="NEW_YEAR">
+      <!-- below assumed based on general information about moving holidays from 2020 -->
+      <tns:MovingCondition substitute="SATURDAY" with="NEXT" weekday="MONDAY"/>
+      <tns:MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
+      <tns:MovingCondition substitute="TUESDAY" with="PREVIOUS" weekday="MONDAY"/>
+      <tns:MovingCondition substitute="WEDNESDAY" with="NEXT" weekday="FRIDAY"/>
+      <tns:MovingCondition substitute="THURSDAY" with="NEXT" weekday="FRIDAY"/>
+    </tns:Fixed>
+
+    <tns:Fixed month="JANUARY" day="10" validFrom="2014" descriptionPropertiesKey="MAJORITY_RULE_DAY">
+      <!-- below assumed based on general information about moving holidays from 2020 -->
+      <tns:MovingCondition substitute="SATURDAY" with="NEXT" weekday="MONDAY"/>
+      <tns:MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
+      <tns:MovingCondition substitute="TUESDAY" with="PREVIOUS" weekday="MONDAY"/>
+      <tns:MovingCondition substitute="WEDNESDAY" with="NEXT" weekday="FRIDAY"/>
+      <tns:MovingCondition substitute="THURSDAY" with="NEXT" weekday="FRIDAY"/>
+    </tns:Fixed>
+
+    <!-- the start year may be wrong, it is currently set to the earliest possible year -->
+    <tns:Fixed month="JULY" day="10" validFrom="1973" descriptionPropertiesKey="INDEPENDENCE_DAY">
+      <!-- below assumed based on general information about moving holidays from 2020 -->
+      <tns:MovingCondition substitute="SATURDAY" with="NEXT" weekday="MONDAY"/>
+      <tns:MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
+      <tns:MovingCondition substitute="TUESDAY" with="PREVIOUS" weekday="MONDAY"/>
+    </tns:Fixed>
+
+    <tns:Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS">
+      <!-- below assumed based on general information about moving holidays from 2020 -->
+      <tns:MovingCondition substitute="SATURDAY" with="NEXT" weekday="MONDAY"/>
+      <tns:MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
+    </tns:Fixed>
+    <tns:Fixed month="DECEMBER" day="26" descriptionPropertiesKey="BOXING_DAY">
+      <!-- below assumed based on general information about moving holidays from 2020 -->
+      <tns:MovingCondition substitute="SUNDAY" with="NEXT" weekday="TUESDAY"/>
+      <tns:MovingCondition substitute="MONDAY" with="NEXT" weekday="TUESDAY"/>
+      <tns:MovingCondition substitute="SATURDAY" with="NEXT" weekday="MONDAY"/>
+    </tns:Fixed>
+
+    <tns:FixedWeekday which="FIRST" weekday="FRIDAY" month="JUNE" descriptionPropertiesKey="LABOUR_DAY"/>
+
+    <tns:FixedWeekday which="FIRST" weekday="MONDAY" month="AUGUST" descriptionPropertiesKey="EMANCIPATION_DAY"/>
+
+    <tns:FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="2013" descriptionPropertiesKey="NATIONAL_HEROES_DAY"/>
+
+    <tns:ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+    <tns:ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
+
+    <tns:ChristianHoliday type="WHIT_MONDAY" descriptionPropertiesKey="christian.WHIT_MONDAY"/>
+  </tns:Holidays>
+</tns:Configuration>