From 2372ae6fdeb9b5355e753fd770e18e56a3e2c1d2 Mon Sep 17 00:00:00 2001 From: XSpielinbox <55600187+xspielinbox@users.noreply.github.com> Date: Wed, 23 Aug 2023 00:00:48 +0200 Subject: [PATCH] Add Bahamas public holidays Signed-off-by: XSpielinbox <55600187+xspielinbox@users.noreply.github.com> --- .../java/de/focus_shift/HolidayCalendar.java | 10 ++-- .../country_descriptions.properties | 4 +- .../holiday_descriptions.properties | 1 + .../main/resources/holidays/Holidays_bs.xml | 55 +++++++++++++++++++ 4 files changed, 63 insertions(+), 7 deletions(-) create mode 100644 jollyday-core/src/main/resources/holidays/Holidays_bs.xml diff --git a/jollyday-core/src/main/java/de/focus_shift/HolidayCalendar.java b/jollyday-core/src/main/java/de/focus_shift/HolidayCalendar.java index 9e77bec52..9e67f9338 100644 --- a/jollyday-core/src/main/java/de/focus_shift/HolidayCalendar.java +++ b/jollyday-core/src/main/java/de/focus_shift/HolidayCalendar.java @@ -10,10 +10,10 @@ */ 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"), @@ -21,14 +21,14 @@ public enum HolidayCalendar { 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 index df2262671..457d3a935 100644 --- 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 index 776ae281a..e9f1af2ad 100644 --- 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 new file mode 100644 index 000000000..17332a57b --- /dev/null +++ b/jollyday-core/src/main/resources/holidays/Holidays_bs.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +