holidays 0.41__py3-none-any.whl → 0.43__py3-none-any.whl

holidays/__init__.py

@@ -16,7 +16,7 @@ from holidays.holiday_base import *
 from holidays.registry import EntityLoader
 from holidays.utils import *
 
-__version__ = "0.41"
+__version__ = "0.43"
 
 
 EntityLoader.load("countries", globals())

holidays/countries/__init__.py

@@ -64,6 +64,7 @@ from .france import France, FR, FRA
 from .gabon import Gabon, GA, GAB
 from .georgia import Georgia, GE, GEO
 from .germany import Germany, DE, DEU
+from .ghana import Ghana, GH, GHA
 from .greece import Greece, GR, GRC
 from .guam import Guam, GU, GUM, HolidaysGU
 from .guatemala import Guatemala, GT, GUA
@@ -80,6 +81,7 @@ from .israel import Israel, IL, ISR
 from .italy import Italy, IT, ITA
 from .jamaica import Jamaica, JM, JAM
 from .japan import Japan, JP, JPN
+from .jersey import Jersey, JE, JEY
 from .kazakhstan import Kazakhstan, KZ, KAZ
 from .kenya import Kenya, KE, KEN
 from .kyrgyzstan import Kyrgyzstan, KG, KGZ

holidays/countries/algeria.py

@@ -19,11 +19,15 @@ class Algeria(HolidayBase, InternationalHolidays, IslamicHolidays):
     """
     References:
       - https://en.wikipedia.org/wiki/Public_holidays_in_Algeria
+
+        As of April 30, 2023. Algeria has 3 days of Eid holidays
+        (https://www.horizons.dz/english/archives/amp/12021)
+
     """
 
     country = "DZ"
     default_language = "ar"
-    # Estimated label.
+    # %s (estimated).
     estimated_label = tr("(تقدير) %s")
     supported_languages = ("ar", "en_US", "fr")
 
@@ -38,7 +42,7 @@ class Algeria(HolidayBase, InternationalHolidays, IslamicHolidays):
 
         # In January 2018, Algeria declared Yennayer a national holiday.
         if self._year >= 2018:
-            # Amazigh New Year / Yennayer.
+            # Amazigh New Year.
             self._add_holiday_jan_12(tr("رأس السنة الأمازيغية"))
 
         # Labor Day.
@@ -58,20 +62,17 @@ class Algeria(HolidayBase, InternationalHolidays, IslamicHolidays):
         # Ashura.
         self._add_ashura_day(tr("عاشورة"))
 
-        # Mawlid / Prophet's Birthday.
+        # Prophet's Birthday.
         self._add_mawlid_day(tr("عيد المولد النبوي"))
 
-        # As of April 30, 2023. Algeria has 3 days of Eid holidays
-        # (https://www.horizons.dz/english/archives/amp/12021)
-
-        # Eid al-Fitr - Feast Festive.
+        # Eid al-Fitr.
         self._add_eid_al_fitr_day(tr("عيد الفطر"))
         # Eid al-Fitr Holiday.
         self._add_eid_al_fitr_day_two(tr("عطلة عيد الفطر"))
         if self._year >= 2024:
             self._add_eid_al_fitr_day_three(tr("عطلة عيد الفطر"))
 
-        # Eid al-Adha - Scarfice Festive.
+        # Eid al-Adha.
         self._add_eid_al_adha_day(tr("عيد الأضحى"))
         # Eid al-Adha Holiday.
         self._add_eid_al_adha_day_two(tr("عطلة عيد الأضحى"))

holidays/countries/angola.py

@@ -165,11 +165,9 @@ class Angola(ObservedHolidayBase, ChristianHolidays, InternationalHolidays, Stat
             tr("Dia de Natal e da Família")
             if self._year >= 2011
             else (
-                # Christmas Day.
-                tr("Dia do Natal")
+                tr("Dia do Natal")  # Christmas Day.
                 if self._year >= 1996
-                # Family Day.
-                else tr("Dia da Família")
+                else tr("Dia da Família")  # Family Day.
             )
         )
         dt = self._add_christmas_day(name)

holidays/countries/argentina.py

@@ -93,7 +93,7 @@ class Argentina(ObservedHolidayBase, ChristianHolidays, InternationalHolidays, S
         # Restarted in 2011 via Decreto 1584/2010.
 
         if 1956 <= self._year <= 1975 or self._year >= 2011:
-            # Carnival.
+            # Carnival Day.
             name = tr("Día de Carnaval")
             self._add_carnival_monday(name)
             self._add_carnival_tuesday(name)
@@ -176,7 +176,7 @@ class Argentina(ObservedHolidayBase, ChristianHolidays, InternationalHolidays, S
         # Immaculate Conception.
         self._add_immaculate_conception_day(tr("Inmaculada Concepción de María"))
 
-        # Christmas.
+        # Christmas Day.
         self._add_christmas_day(tr("Navidad"))
 
         # Movable Holidays

holidays/countries/armenia.py

@@ -68,7 +68,7 @@ class Armenia(HolidayBase, ChristianHolidays, InternationalHolidays):
             # Motherhood and Beauty Day.
             self._add_holiday_apr_7(tr("Մայրության և գեղեցկության տոն"))
 
-        # Armenian Genocide Remembrance Day,
+        # Armenian Genocide Remembrance Day.
         self._add_holiday_apr_24(tr("Եղեռնի զոհերի հիշատակի օր"))
 
         if self._year >= 2001:

holidays/countries/aruba.py

@@ -105,11 +105,9 @@ class Aruba(HolidayBase, ChristianHolidays, InternationalHolidays):
             tr("Dia di Rey")
             if self._year >= 2021
             else (
-                # King's Day.
-                tr("Aña di Rey")
+                tr("Aña di Rey")  # King's Day.
                 if self._year >= 2014
-                # Queen's Day.
-                else tr("Aña di La Reina")
+                else tr("Aña di La Reina")  # Queen's Day.
             )
         )
         if self._year >= 2014:

holidays/countries/austria.py

@@ -21,16 +21,48 @@ class Austria(HolidayBase, ChristianHolidays, InternationalHolidays):
     default_language = "de"
     supported_categories = (BANK, PUBLIC)
     supported_languages = ("de", "en_US", "uk")
-    subdivisions = ("1", "2", "3", "4", "5", "6", "7", "8", "9")
+    subdivisions = (
+        "1",  # Burgenland.
+        "2",  # Kärnten.
+        "3",  # Niederösterreich.
+        "4",  # Oberösterreich.
+        "5",  # Salzburg.
+        "6",  # Steiermark.
+        "7",  # Tirol.
+        "8",  # Vorarlberg.
+        "9",  # Wien.
+    )
+    subdivisions_aliases = {
+        "Burgenland": "1",
+        "Bgld": "1",
+        "B": "1",
+        "Kärnten": "2",
+        "Ktn": "2",
+        "K": "2",
+        "Niederösterreich": "3",
+        "NÖ": "3",
+        "N": "3",
+        "Oberösterreich": "4",
+        "OÖ": "4",
+        "O": "4",
+        "Salzburg": "5",
+        "Sbg": "5",
+        "S": "5",
+        "Steiermark": "6",
+        "Stmk": "6",
+        "St": "6",
+        "Tirol": "7",
+        "T": "7",
+        "Vorarlberg": "8",
+        "Vbg": "8",
+        "V": "8",
+        "Wien": "9",
+        "W": "9",
+    }
 
     def __init__(self, *args, **kwargs) -> None:
         ChristianHolidays.__init__(self)
         InternationalHolidays.__init__(self)
-
-        # Set the default subdivision.
-        if not kwargs.get("subdiv", kwargs.get("state")):
-            kwargs["subdiv"] = "9"
-
         super().__init__(*args, **kwargs)
 
     def _populate_public_holidays(self):
@@ -58,11 +90,12 @@ class Austria(HolidayBase, ChristianHolidays, InternationalHolidays):
         # Assumption Day.
         self._add_assumption_of_mary_day(tr("Mariä Himmelfahrt"))
 
+        # National Day.
+        national_day = tr("Nationalfeiertag")
         if 1919 <= self._year <= 1934:
-            # National Day.
-            self._add_holiday_nov_12(tr("Nationalfeiertag"))
+            self._add_holiday_nov_12(national_day)
         if self._year >= 1967:
-            self._add_holiday_oct_26(tr("Nationalfeiertag"))
+            self._add_holiday_oct_26(national_day)
 
         # All Saints' Day.
         self._add_all_saints_day(tr("Allerheiligen"))
@@ -86,6 +119,46 @@ class Austria(HolidayBase, ChristianHolidays, InternationalHolidays):
         # New Year's Eve.
         self._add_new_years_eve(tr("Silvester"))
 
+    def _populate_subdiv_1_bank_holidays(self):
+        # St. Martin's Day.
+        self._add_holiday_nov_11(tr("Hl. Martin"))
+
+    def _populate_subdiv_2_bank_holidays(self):
+        # St. Joseph's Day.
+        self._add_saint_josephs_day(tr("Hl. Josef"))
+
+        # 1920 Carinthian plebiscite.
+        self._add_holiday_oct_10(tr("Tag der Volksabstimmung"))
+
+    def _populate_subdiv_3_bank_holidays(self):
+        # St. Leopold's Day.
+        self._add_holiday_nov_15(tr("Hl. Leopold"))
+
+    def _populate_subdiv_4_bank_holidays(self):
+        if self._year >= 2004:
+            # St. Florian's Day.
+            self._add_holiday_may_4(tr("Hl. Florian"))
+
+    def _populate_subdiv_5_bank_holidays(self):
+        # St. Rupert's Day.
+        self._add_holiday_sep_24(tr("Hl. Rupert"))
+
+    def _populate_subdiv_6_bank_holidays(self):
+        # St. Joseph's Day.
+        self._add_saint_josephs_day(tr("Hl. Josef"))
+
+    def _populate_subdiv_7_bank_holidays(self):
+        # St. Joseph's Day.
+        self._add_saint_josephs_day(tr("Hl. Josef"))
+
+    def _populate_subdiv_8_bank_holidays(self):
+        # St. Joseph's Day.
+        self._add_saint_josephs_day(tr("Hl. Josef"))
+
+    def _populate_subdiv_9_bank_holidays(self):
+        # St. Leopold's Day.
+        self._add_holiday_nov_15(tr("Hl. Leopold"))
+
 
 class AT(Austria):
     pass

holidays/countries/bahrain.py

@@ -28,7 +28,7 @@ class Bahrain(HolidayBase, InternationalHolidays, IslamicHolidays):
 
     country = "BH"
     default_language = "ar"
-    # Estimated label.
+    # %s (estimated).
     estimated_label = tr("(تقدير) %s")
     supported_languages = ("ar", "en_US")
     weekend = {FRI, SAT}
@@ -42,7 +42,7 @@ class Bahrain(HolidayBase, InternationalHolidays, IslamicHolidays):
         # New Year's Day.
         self._add_new_years_day(tr("رأس السنة الميلادية"))
 
-        # Labour day.
+        # Labor Day.
         self._add_labor_day(tr("عيد العمال"))
 
         # Eid Al Fitr.
@@ -53,23 +53,20 @@ class Bahrain(HolidayBase, InternationalHolidays, IslamicHolidays):
         self._add_eid_al_fitr_day_three(tr("عطلة عيد الفطر"))
 
         # Eid Al Adha.
-        eid_al_adha = tr("عيد الأضحى")
-        self._add_eid_al_adha_day(eid_al_adha)
+        self._add_eid_al_adha_day(tr("عيد الأضحى"))
         # Eid Al Adha Holiday.
         self._add_eid_al_adha_day_two(tr("عطلة عيد الأضحى"))
         self._add_eid_al_adha_day_three(tr("عطلة عيد الأضحى"))
 
-        # Al Hijra New Year.
-        hijri_new_year = tr("رأس السنة الهجرية")
-        self._add_islamic_new_year_day(hijri_new_year)
+        # Islamic New Year.
+        self._add_islamic_new_year_day(tr("رأس السنة الهجرية"))
 
-        # Ashura.
-        ashura = tr("عاشورة")
         # Ashura Eve.
         self._add_ashura_eve(tr("ليلة عاشورة"))
-        self._add_ashura_day(ashura)
+        # Ashura.
+        self._add_ashura_day(tr("عاشورة"))
 
-        # Prophets Birthday.
+        # Prophet's Birthday.
         self._add_mawlid_day(tr("عيد المولد النبوي"))
 
         # National Day.

holidays/countries/belarus.py

@@ -59,7 +59,7 @@ class Belarus(HolidayBase, ChristianHolidays, InternationalHolidays, StaticHolid
         # Radunitsa (Day of Rejoicing).
         self._add_rejoicing_day(tr("Радаўніца"))
 
-        # Labour Day.
+        # Labor Day.
         self._add_labor_day(tr("Свята працы"))
 
         # Victory Day.

holidays/countries/belgium.py

@@ -39,7 +39,7 @@ class Belgium(HolidayBase, ChristianHolidays, InternationalHolidays):
         # New Year's Day.
         self._add_new_years_day(tr("Nieuwjaar"))
 
-        # Easter.
+        # Easter Sunday.
         self._add_easter_sunday(tr("Pasen"))
 
         # Easter Monday.
@@ -60,7 +60,7 @@ class Belgium(HolidayBase, ChristianHolidays, InternationalHolidays):
         # National Day.
         self._add_holiday_jul_21(tr("Nationale feestdag"))
 
-        # Assumption of Mary.
+        # Assumption Day.
         self._add_assumption_of_mary_day(tr("O. L. V. Hemelvaart"))
 
         # All Saints' Day.

holidays/countries/bosnia_and_herzegovina.py

@@ -104,15 +104,15 @@ class BosniaAndHerzegovina(
             self._add_new_years_day(name)
             self._add_new_years_day_two(name)
 
-            # Orthodox Christmas.
+            # Orthodox Christmas Day.
             self._add_christmas_day(tr("Božić (Pravoslavni)"))
 
-            # Labor Day.
+            # International Labor Day.
             name = tr("Međunarodni praznik rada")
             self._add_labor_day(name)
             self._add_labor_day_two(name)
 
-            # Catholic Christmas.
+            # Catholic Christmas Day.
             self._add_christmas_day(tr("Božić (Katolički)"), GREGORIAN_CALENDAR)
 
         super()._populate_subdiv_holidays()
@@ -126,7 +126,7 @@ class BosniaAndHerzegovina(
         # Orthodox Christmas Eve.
         self._add_christmas_eve(tr("Badnji dan (Pravoslavni)"))
 
-        # Orthodox Christmas.
+        # Orthodox Christmas Day.
         self._add_christmas_day(tr("Božić (Pravoslavni)"))
 
         # Independence Day.
@@ -135,16 +135,16 @@ class BosniaAndHerzegovina(
         # Catholic Good Friday.
         self._add_good_friday(tr("Veliki petak (Katolički)"), GREGORIAN_CALENDAR)
 
-        # Catholic Easter.
+        # Catholic Easter Sunday.
         self._add_easter_sunday(tr("Uskrs (Katolički)"), GREGORIAN_CALENDAR)
 
-        # Orthodox Easter.
+        # Orthodox Easter Sunday.
         self._add_easter_sunday(tr("Vaskrs (Pravoslavni)"))
 
         # Orthodox Easter Monday.
         self._add_easter_monday(tr("Uskrsni ponedjeljak (Pravoslavni)"))
 
-        # Labor Day.
+        # International Labor Day.
         name = tr("Međunarodni praznik rada")
         self._add_observed(self._add_labor_day(name), rule=SUN_TO_NEXT_TUE)
         self._add_labor_day_two(name)
@@ -158,7 +158,7 @@ class BosniaAndHerzegovina(
         # Catholic Christmas Eve.
         self._add_christmas_eve(tr("Badnji dan (Katolički)"), GREGORIAN_CALENDAR)
 
-        # Catholic Christmas.
+        # Catholic Christmas Day.
         self._add_christmas_day(tr("Božić (Katolički)"), GREGORIAN_CALENDAR)
 
         # Eid al-Fitr.
@@ -173,7 +173,7 @@ class BosniaAndHerzegovina(
         self._add_observed(self._add_new_years_day(name), rule=SAT_SUN_TO_NEXT_MON_TUE)
         self._add_new_years_day_two(name)
 
-        # Orthodox Christmas.
+        # Orthodox Christmas Day.
         self._add_observed(self._add_christmas_day(tr("Božić (Pravoslavni)")))
 
         self._add_observed(
@@ -181,13 +181,13 @@ class BosniaAndHerzegovina(
             self._add_holiday_mar_8(tr("Dan uspostavljanja Brčko distrikta"))
         )
 
-        # Labor Day.
+        # International Labor Day.
         name = tr("Međunarodni praznik rada")
         self._add_observed(self._add_labor_day(name), rule=SAT_SUN_TO_NEXT_MON_TUE)
         self._add_labor_day_two(name)
 
         self._add_observed(
-            # Catholic Christmas.
+            # Catholic Christmas Day.
             self._add_christmas_day(tr("Božić (Katolički)"), GREGORIAN_CALENDAR)
         )
 
@@ -200,7 +200,7 @@ class BosniaAndHerzegovina(
         # Orthodox Christmas Eve.
         self._add_christmas_eve(tr("Badnji dan (Pravoslavni)"))
 
-        # Orthodox Christmas.
+        # Orthodox Christmas Day.
         self._add_christmas_day(tr("Božić (Pravoslavni)"))
 
         # Orthodox New Year.
@@ -209,16 +209,16 @@ class BosniaAndHerzegovina(
         # Catholic Good Friday.
         self._add_good_friday(tr("Veliki petak (Katolički)"), GREGORIAN_CALENDAR)
 
-        # Catholic Easter.
+        # Catholic Easter Sunday.
         self._add_easter_sunday(tr("Uskrs (Katolički)"), GREGORIAN_CALENDAR)
 
-        # Orthodox Easter.
+        # Orthodox Easter Sunday.
         self._add_easter_sunday(tr("Vaskrs (Pravoslavni)"))
 
         # Orthodox Easter Monday.
         self._add_easter_monday(tr("Uskrsni ponedjeljak (Pravoslavni)"))
 
-        # Labor Day.
+        # International Labor Day.
         name = tr("Međunarodni praznik rada")
         self._add_observed(self._add_labor_day(name), rule=SAT_TO_NEXT_MON)
         self._add_labor_day_two(name)
@@ -234,7 +234,7 @@ class BosniaAndHerzegovina(
         # Catholic Christmas Eve.
         self._add_christmas_eve(tr("Badnji dan (Katolički)"), GREGORIAN_CALENDAR)
 
-        # Catholic Christmas.
+        # Catholic Christmas Day.
         self._add_christmas_day(tr("Božić (Katolički)"), GREGORIAN_CALENDAR)
 
         # Eid al-Fitr.

holidays/countries/cambodia.py

@@ -147,10 +147,7 @@ class Cambodia(HolidayBase, InternationalHolidays, StaticHolidays, ThaiCalendarH
         if self._year >= 1994:
             self._add_holiday_jun_18(
                 # Birthday of Her Majesty the Queen-Mother NORODOM MONINEATH SIHANOUK of Cambodia
-                tr(
-                    "ព្រះរាជពិធីបុណ្យចម្រើនព្រះជន្ម សម្តេចព្រះមហាក្សត្រី ព្រះវររាជមាតា នរោត្តម "
-                    "មុនិនាថ សីហនុ"
-                ),
+                tr("ព្រះរាជពិធីបុណ្យចម្រើនព្រះជន្ម សម្តេចព្រះមហាក្សត្រី ព្រះវររាជមាតា នរោត្តម មុនិនាថ សីហនុ"),
             )
 
         # ទិវាប្រកាសរដ្ឋធម្មនុញ្ញ

holidays/countries/canada.py

@@ -90,7 +90,7 @@ class Canada(ObservedHolidayBase, ChristianHolidays, InternationalHolidays, Stat
             )
 
         if self._year >= 1894:
-            # Labour Day.
+            # Labor Day.
             self._add_holiday_1st_mon_of_sep(tr("Labour Day"))
 
         # Christmas Day.

holidays/countries/chile.py

@@ -95,7 +95,7 @@ class Chile(ObservedHolidayBase, ChristianHolidays, InternationalHolidays, Stati
         self._add_holy_saturday(tr("Sábado Santo"))
 
         if self._year <= 1967:
-            # Ascension of Jesus.
+            # Ascension Day.
             self._add_ascension_thursday(tr("Ascensión del Señor"))
 
         if self._year <= 1967 or 1987 <= self._year <= 2006:
@@ -106,7 +106,7 @@ class Chile(ObservedHolidayBase, ChristianHolidays, InternationalHolidays, Stati
             )
 
         if self._year >= 1932:
-            # Labour Day.
+            # Labor Day.
             self._add_labor_day(tr("Día Nacional del Trabajo"))
 
         # Naval Glories Day.
@@ -128,7 +128,7 @@ class Chile(ObservedHolidayBase, ChristianHolidays, InternationalHolidays, Stati
             # Day of Virgin of Carmen.
             self._add_holiday_jul_16(tr("Virgen del Carmen"))
 
-        # Assumption of Mary.
+        # Assumption Day.
         self._add_assumption_of_mary_day(tr("Asunción de la Virgen"))
 
         if 1981 <= self._year <= 1998:
@@ -180,7 +180,7 @@ class Chile(ObservedHolidayBase, ChristianHolidays, InternationalHolidays, Stati
                 rule=TUE_TO_PREV_FRI + WED_TO_NEXT_FRI,
             )
 
-        # All Saints Day.
+        # All Saints' Day.
         self._add_all_saints_day(tr("Día de Todos los Santos"))
 
         # Immaculate Conception.
@@ -190,7 +190,7 @@ class Chile(ObservedHolidayBase, ChristianHolidays, InternationalHolidays, Stati
             # Christmas Eve.
             self._add_christmas_eve(tr("Víspera de Navidad"))
 
-        # Christmas.
+        # Christmas Day.
         self._add_christmas_day(tr("Navidad"))
 
     def _populate_subdiv_ap_public_holidays(self):

holidays/countries/china.py

@@ -26,6 +26,7 @@ class China(ObservedHolidayBase, ChineseCalendarHolidays, InternationalHolidays,
         - `2023 <https://www.gov.cn/gongbao/content/2023/content_5736714.htm>`_
         - `2022 <https://www.gov.cn/gongbao/content/2021/content_5651728.htm>`_
         - `2021 <https://www.gov.cn/gongbao/content/2020/content_5567750.htm>`_
+        - `2020 Extensions <https://www.gov.cn/zhengce/zhengceku/2020-01/27/content_5472352.htm>`_
         - `2020 <https://www.gov.cn/gongbao/content/2019/content_5459138.htm>`_
         - `2019 <https://www.gov.cn/gongbao/content/2018/content_5350046.htm>`_
         - `2018 <https://www.gov.cn/gongbao/content/2017/content_5248221.htm>`_
@@ -206,6 +207,12 @@ class ChinaStaticHolidays:
     # Day off (substituted from %s).
     substituted_label = tr("休息日（%s日起取代）")
 
+    # Chinese New Year (Spring Festival).
+    chinese_new_year = tr("春节")
+
+    # Chinese New Year (Spring Festival) Extended Holiday.
+    chinese_new_year_extended = tr("春节延长假期")
+
     # Dragon Boat Festival.
     dragon_boat_festival = tr("端午节")
 
@@ -381,7 +388,10 @@ class ChinaStaticHolidays:
         ),
         2020: (
             (JAN, 24, JAN, 19),  # Spring Festival
-            (JAN, 30, FEB, 1),  # Spring Festival
+            # JAN, 30 in special_public_holidays_observed
+            (JAN, 31, chinese_new_year_extended),  # Spring Festival Extended Holiday
+            (FEB, 1, chinese_new_year_extended),  # Spring Festival Extended Holiday
+            (FEB, 2, chinese_new_year_extended),  # Spring Festival Extended Holiday
             (MAY, 4, APR, 26),  # Labor Day
             (MAY, 5, MAY, 9),  # Labor Day
             (JUN, 26, JUN, 28),  # Dragon Boat Festival
@@ -430,5 +440,8 @@ class ChinaStaticHolidays:
     special_public_holidays_observed = {
         2012: (JUN, 22, dragon_boat_festival),  # observed from Jun 23
         2015: (OCT, 6, mid_autumn_festival),  # observed from Sep 27
-        2020: (OCT, 6, mid_autumn_festival),  # observed from Oct 1, overlap with National Day
+        2020: (
+            (JAN, 30, chinese_new_year),  # Spring Festival (extended due to Covid-19 decree)
+            (OCT, 6, mid_autumn_festival),  # observed from Oct 1, overlap with National Day
+        ),
     }

holidays/countries/colombia.py

@@ -68,7 +68,7 @@ class Colombia(ObservedHolidayBase, ChristianHolidays, InternationalHolidays):
             # Good Friday.
             self._add_good_friday(tr("Viernes Santo"))
 
-            # Ascension of Jesus.
+            # Ascension Day.
             self._move_holiday(self._add_ascension_thursday(tr("Ascensión del señor")))
 
             # Corpus Christi.
@@ -94,7 +94,7 @@ class Colombia(ObservedHolidayBase, ChristianHolidays, InternationalHolidays):
         self._add_holiday_aug_7(tr("Batalla de Boyacá"))
 
         if self._year >= 1951:
-            # Assumption of Mary.
+            # Assumption Day.
             self._move_holiday(self._add_assumption_of_mary_day(tr("La Asunción")))
 
         # Columbus Day.
@@ -113,7 +113,7 @@ class Colombia(ObservedHolidayBase, ChristianHolidays, InternationalHolidays):
             # Immaculate Conception.
             self._add_immaculate_conception_day(tr("La Inmaculada Concepción"))
 
-        # Christmas.
+        # Christmas Day.
         self._add_christmas_day(tr("Navidad"))
 
 

holidays/countries/costa_rica.py

@@ -11,6 +11,7 @@
 
 from gettext import gettext as tr
 
+from holidays.constants import OPTIONAL, PUBLIC
 from holidays.groups import ChristianHolidays, InternationalHolidays
 from holidays.observed_holiday_base import (
     ObservedHolidayBase,
@@ -24,6 +25,7 @@ class CostaRica(ObservedHolidayBase, ChristianHolidays, InternationalHolidays):
     """
     References:
     - https://en.wikipedia.org/wiki/Public_holidays_in_Costa_Rica
+    - http://www.pgrweb.go.cr/scij/avanzada_pgr.aspx
     - Law #8442 from 19.04.2005
     - Law #8604 from 17.09.2007
     - Law #8753 from 25.07.2009
@@ -36,6 +38,7 @@ class CostaRica(ObservedHolidayBase, ChristianHolidays, InternationalHolidays):
     default_language = "es"
     # %s (observed).
     observed_label = tr("%s (observado)")
+    supported_categories = (OPTIONAL, PUBLIC)
     supported_languages = ("en_US", "es", "uk")
 
     def __init__(self, *args, **kwargs):
@@ -73,9 +76,6 @@ class CostaRica(ObservedHolidayBase, ChristianHolidays, InternationalHolidays):
         elif 2020 <= self._year <= 2024:
             self._move_holiday(jul_25)
 
-        # Feast of Our Lady of the Angels.
-        self._add_holiday_aug_2(tr("Fiesta de Nuestra Señora de los Ángeles"))
-
         # Mother's Day.
         dt = self._add_assumption_of_mary_day(tr("Día de la Madre"))
         if 2005 <= self._year <= 2007:
@@ -83,18 +83,9 @@ class CostaRica(ObservedHolidayBase, ChristianHolidays, InternationalHolidays):
         elif self._year in {2020, 2023, 2024}:
             self._move_holiday(dt)
 
-        if self._year >= 2022:
-            aug_31 = self._add_holiday_aug_31(
-                # Day of the Black Person and Afro-Costa Rican Culture.
-                self.tr("Día de la Persona Negra y la Cultura Afrocostarricense")
-            )
-            if self._year in {2022, 2023}:
-                # Move to next Sunday.
-                self._move_holiday(aug_31, rule=ALL_TO_NEXT_SUN)
-
         # Independence Day.
         sep_15 = self._add_holiday_sep_15(tr("Día de la Independencia"))
-        if self._year in {2020, 2021, 2022, 2024}:
+        if self._year in {2020, 2021, 2022}:
             self._move_holiday(sep_15)
 
         if self._year <= 2019:
@@ -104,15 +95,28 @@ class CostaRica(ObservedHolidayBase, ChristianHolidays, InternationalHolidays):
                 rule=WORKDAY_TO_NEXT_MON,
             )
 
+        # Christmas Day.
+        self._add_christmas_day(tr("Navidad"))
+
+    def _populate_optional_holidays(self):
+        # Feast of Our Lady of the Angels.
+        self._add_holiday_aug_2(tr("Fiesta de Nuestra Señora de los Ángeles"))
+
+        if self._year >= 2021:
+            aug_31 = self._add_holiday_aug_31(
+                # Day of the Black Person and Afro-Costa Rican Culture.
+                self.tr("Día de la Persona Negra y la Cultura Afrocostarricense")
+            )
+            if self._year in {2021, 2022, 2023}:
+                # Move to next Sunday.
+                self._move_holiday(aug_31, rule=ALL_TO_NEXT_SUN)
+
         if self._year >= 2020:
             # Army Abolition Day.
             dec_1 = self._add_holiday_dec_1(tr("Día de la Abolición del Ejército"))
             if self._year in {2020, 2021, 2022}:
                 self._move_holiday(dec_1)
 
-        # Christmas Day.
-        self._add_christmas_day(tr("Navidad"))
-
 
 class CR(CostaRica):
     pass