holidays 0.25__py3-none-any.whl → 0.27__py3-none-any.whl

holidays/countries/indonesia.py

@@ -9,16 +9,25 @@
 #  Website: https://github.com/dr-prodigy/python-holidays
 #  License: MIT (see LICENSE file)
 
-from holidays.calendars import _CustomCalendar, _IslamicLunar
-from holidays.constants import JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP
-from holidays.constants import OCT, NOV, DEC
+from holidays.calendars import (
+    _CustomBuddhistCalendar,
+    _CustomChineseCalendar,
+    _CustomIslamicCalendar,
+)
+from holidays.constants import JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP, OCT, NOV, DEC
 from holidays.holiday_base import HolidayBase
-from holidays.holiday_groups import ChineseCalendarHolidays, ChristianHolidays
-from holidays.holiday_groups import InternationalHolidays, IslamicHolidays
+from holidays.holiday_groups import (
+    BuddhistCalendarHolidays,
+    ChineseCalendarHolidays,
+    ChristianHolidays,
+    InternationalHolidays,
+    IslamicHolidays,
+)
 
 
 class Indonesia(
     HolidayBase,
+    BuddhistCalendarHolidays,
     ChineseCalendarHolidays,
     ChristianHolidays,
     InternationalHolidays,
@@ -34,13 +43,18 @@ class Indonesia(
     country = "ID"
     special_holidays = {
         # Election Day.
-        2018: ((JUN, 27, "Hari Pemilihan"),),
-        2019: ((APR, 17, "Hari Pemilihan"),),
-        2020: ((DEC, 9, "Hari Pemilihan"),),
+        2018: (JUN, 27, "Hari Pemilihan"),
+        2019: (APR, 17, "Hari Pemilihan"),
+        2020: (DEC, 9, "Hari Pemilihan"),
     }
 
     def __init__(self, *args, **kwargs):
-        ChineseCalendarHolidays.__init__(self)
+        BuddhistCalendarHolidays.__init__(
+            self, calendar=IndonesiaBuddhistCalendar(), show_estimated=True
+        )
+        ChineseCalendarHolidays.__init__(
+            self, calendar=IndonesiaChineseCalendar(), show_estimated=True
+        )
         ChristianHolidays.__init__(self)
         InternationalHolidays.__init__(self)
         IslamicHolidays.__init__(self, calendar=IndonesiaIslamicCalendar())
@@ -101,35 +115,9 @@ class Indonesia(
         # Good Friday.
         self._add_good_friday("Wafat Yesus Kristus")
 
-        # Buddha's Birthday.
         if year >= 1983:
-            date_obs = {
-                2007: (JUN, 1),
-                2008: (MAY, 20),
-                2009: (MAY, 9),
-                2010: (MAY, 28),
-                2011: (MAY, 17),
-                2012: (MAY, 6),
-                2013: (MAY, 25),
-                2014: (MAY, 15),
-                2015: (JUN, 2),
-                2016: (MAY, 22),
-                2017: (MAY, 11),
-                2018: (MAY, 29),
-                2019: (MAY, 19),
-                2020: (MAY, 7),
-                2021: (MAY, 26),
-                2022: (MAY, 16),
-                2023: (JUN, 4),
-            }
-            if year in date_obs:
-                # Buddha's Birthday.
-                self._add_holiday("Hari Raya Waisak", *date_obs[year])
-            else:
-                # Buddha's Birthday.
-                self._add_chinese_calendar_holiday(
-                    "Hari Raya Waisak* (*estimated)", 4, 15
-                )
+            # Buddha's Birthday.
+            self._add_vesak("Hari Raya Waisak")
 
         if 1953 <= year <= 1968 or year >= 2014:
             # Labor Day.
@@ -157,125 +145,173 @@ class IDN(Indonesia):
     pass
 
 
-class IndonesiaIslamicCalendar(_CustomCalendar, _IslamicLunar):
+class IndonesiaBuddhistCalendar(_CustomBuddhistCalendar):
+    VESAK_DATES = {
+        2007: (JUN, 1),
+        2008: (MAY, 20),
+        2009: (MAY, 9),
+        2010: (MAY, 28),
+        2011: (MAY, 17),
+        2012: (MAY, 6),
+        2013: (MAY, 25),
+        2014: (MAY, 15),
+        2015: (JUN, 2),
+        2016: (MAY, 22),
+        2017: (MAY, 11),
+        2018: (MAY, 29),
+        2019: (MAY, 19),
+        2020: (MAY, 7),
+        2021: (MAY, 26),
+        2022: (MAY, 16),
+        2023: (JUN, 4),
+    }
+
+
+class IndonesiaChineseCalendar(_CustomChineseCalendar):
+    LUNAR_NEW_YEAR_DATES = {
+        2003: (FEB, 1),
+        2004: (JAN, 22),
+        2005: (FEB, 9),
+        2006: (JAN, 30),
+        2007: (FEB, 19),
+        2008: (FEB, 7),
+        2009: (JAN, 26),
+        2010: (FEB, 15),
+        2011: (FEB, 3),
+        2012: (JAN, 23),
+        2013: (FEB, 11),
+        2014: (JAN, 31),
+        2015: (FEB, 19),
+        2016: (FEB, 8),
+        2017: (JAN, 28),
+        2018: (FEB, 16),
+        2019: (FEB, 5),
+        2020: (JAN, 25),
+        2021: (FEB, 12),
+        2022: (FEB, 1),
+        2023: (JAN, 22),
+    }
+
+
+class IndonesiaIslamicCalendar(_CustomIslamicCalendar):
     EID_AL_ADHA_DATES = {
-        2001: ((MAR, 6),),
-        2002: ((FEB, 23),),
-        2003: ((FEB, 12),),
-        2004: ((FEB, 2),),
-        2005: ((JAN, 21),),
+        2001: (MAR, 6),
+        2002: (FEB, 23),
+        2003: (FEB, 12),
+        2004: (FEB, 2),
+        2005: (JAN, 21),
         2006: ((JAN, 10), (DEC, 31)),
-        2007: ((DEC, 20),),
-        2008: ((DEC, 8),),
-        2009: ((NOV, 27),),
-        2010: ((NOV, 17),),
-        2011: ((NOV, 6),),
-        2012: ((OCT, 26),),
-        2013: ((OCT, 15),),
-        2014: ((OCT, 5),),
-        2015: ((SEP, 24),),
-        2016: ((SEP, 12),),
-        2017: ((SEP, 1),),
-        2018: ((AUG, 22),),
-        2019: ((AUG, 11),),
-        2020: ((JUL, 31),),
-        2021: ((JUL, 20),),
-        2022: ((JUL, 10),),
-        2023: ((JUN, 29),),
+        2007: (DEC, 20),
+        2008: (DEC, 8),
+        2009: (NOV, 27),
+        2010: (NOV, 17),
+        2011: (NOV, 6),
+        2012: (OCT, 26),
+        2013: (OCT, 15),
+        2014: (OCT, 5),
+        2015: (SEP, 24),
+        2016: (SEP, 12),
+        2017: (SEP, 1),
+        2018: (AUG, 22),
+        2019: (AUG, 11),
+        2020: (JUL, 31),
+        2021: (JUL, 20),
+        2022: (JUL, 10),
+        2023: (JUN, 29),
     }
 
     EID_AL_FITR_DATES = {
-        2001: ((DEC, 16),),
-        2002: ((DEC, 6),),
-        2003: ((NOV, 25),),
-        2004: ((NOV, 14),),
-        2005: ((NOV, 3),),
-        2006: ((OCT, 24),),
-        2007: ((OCT, 13),),
-        2008: ((OCT, 1),),
-        2009: ((SEP, 20),),
-        2010: ((SEP, 10),),
-        2011: ((AUG, 30),),
-        2012: ((AUG, 19),),
-        2013: ((AUG, 8),),
-        2014: ((JUL, 28),),
-        2015: ((JUL, 17),),
-        2016: ((JUL, 6),),
-        2017: ((JUN, 25),),
-        2018: ((JUN, 15),),
-        2019: ((JUN, 5),),
-        2020: ((MAY, 24),),
-        2021: ((MAY, 13),),
-        2022: ((MAY, 2),),
-        2023: ((APR, 22),),
+        2001: (DEC, 16),
+        2002: (DEC, 6),
+        2003: (NOV, 25),
+        2004: (NOV, 14),
+        2005: (NOV, 3),
+        2006: (OCT, 24),
+        2007: (OCT, 13),
+        2008: (OCT, 1),
+        2009: (SEP, 20),
+        2010: (SEP, 10),
+        2011: (AUG, 30),
+        2012: (AUG, 19),
+        2013: (AUG, 8),
+        2014: (JUL, 28),
+        2015: (JUL, 17),
+        2016: (JUL, 6),
+        2017: (JUN, 25),
+        2018: (JUN, 15),
+        2019: (JUN, 5),
+        2020: (MAY, 24),
+        2021: (MAY, 13),
+        2022: (MAY, 2),
+        2023: (APR, 22),
     }
 
     HIJRI_NEW_YEAR_DATES = {
-        2001: ((MAR, 26),),
-        2002: ((MAR, 15),),
-        2003: ((MAR, 5),),
-        2004: ((FEB, 22),),
-        2005: ((FEB, 10),),
-        2006: ((JAN, 31),),
-        2007: ((JAN, 20),),
+        2001: (MAR, 26),
+        2002: (MAR, 15),
+        2003: (MAR, 5),
+        2004: (FEB, 22),
+        2005: (FEB, 10),
+        2006: (JAN, 31),
+        2007: (JAN, 20),
         2008: ((JAN, 10), (DEC, 29)),
-        2009: ((DEC, 18),),
-        2010: ((DEC, 7),),
-        2011: ((NOV, 27),),
-        2012: ((NOV, 15),),
-        2013: ((NOV, 5),),
-        2014: ((OCT, 25),),
-        2015: ((OCT, 14),),
-        2016: ((OCT, 2),),
-        2017: ((SEP, 21),),
-        2018: ((SEP, 11),),
-        2019: ((SEP, 1),),
-        2020: ((AUG, 20),),
-        2021: ((AUG, 11),),
-        2022: ((JUL, 30),),
+        2009: (DEC, 18),
+        2010: (DEC, 7),
+        2011: (NOV, 27),
+        2012: (NOV, 15),
+        2013: (NOV, 5),
+        2014: (OCT, 25),
+        2015: (OCT, 14),
+        2016: (OCT, 2),
+        2017: (SEP, 21),
+        2018: (SEP, 11),
+        2019: (SEP, 1),
+        2020: (AUG, 20),
+        2021: (AUG, 11),
+        2022: (JUL, 30),
     }
 
     ISRA_AND_MIRAJ_DATES = {
-        2001: ((OCT, 15),),
-        2002: ((OCT, 4),),
-        2003: ((SEP, 24),),
-        2004: ((SEP, 12),),
-        2005: ((SEP, 1),),
-        2006: ((AUG, 22),),
-        2007: ((AUG, 11),),
-        2008: ((JUL, 31),),
-        2009: ((JUL, 20),),
-        2010: ((JUL, 9),),
-        2011: ((JUN, 29),),
-        2012: ((JUN, 17),),
-        2013: ((JUN, 6),),
-        2014: ((MAY, 27),),
-        2015: ((MAY, 16),),
-        2016: ((MAY, 6),),
-        2017: ((APR, 24),),
-        2018: ((APR, 14),),
-        2019: ((APR, 3),),
-        2020: ((MAR, 22),),
-        2021: ((MAR, 11),),
-        2022: ((FEB, 28),),
+        2001: (OCT, 15),
+        2002: (OCT, 4),
+        2003: (SEP, 24),
+        2004: (SEP, 12),
+        2005: (SEP, 1),
+        2006: (AUG, 22),
+        2007: (AUG, 11),
+        2008: (JUL, 31),
+        2009: (JUL, 20),
+        2010: (JUL, 9),
+        2011: (JUN, 29),
+        2012: (JUN, 17),
+        2013: (JUN, 6),
+        2014: (MAY, 27),
+        2015: (MAY, 16),
+        2016: (MAY, 6),
+        2017: (APR, 24),
+        2018: (APR, 14),
+        2019: (APR, 3),
+        2020: (MAR, 22),
+        2021: (MAR, 11),
+        2022: (FEB, 28),
     }
 
     MAWLID_DATES = {
-        2006: ((APR, 10),),
-        2007: ((MAR, 31),),
-        2008: ((MAR, 20),),
-        2009: ((MAR, 9),),
-        2010: ((FEB, 26),),
-        2011: ((FEB, 15),),
-        2012: ((FEB, 5),),
-        2013: ((JAN, 24),),
-        2014: ((JAN, 14),),
+        2006: (APR, 10),
+        2007: (MAR, 31),
+        2008: (MAR, 20),
+        2009: (MAR, 9),
+        2010: (FEB, 26),
+        2011: (FEB, 15),
+        2012: (FEB, 5),
+        2013: (JAN, 24),
+        2014: (JAN, 14),
         2015: ((JAN, 3), (DEC, 24)),
-        2016: ((DEC, 12),),
-        2017: ((DEC, 1),),
-        2018: ((NOV, 20),),
-        2019: ((NOV, 9),),
-        2020: ((OCT, 29),),
-        2021: ((OCT, 19),),
-        2022: ((OCT, 8),),
+        2016: (DEC, 12),
+        2017: (DEC, 1),
+        2018: (NOV, 20),
+        2019: (NOV, 9),
+        2020: (OCT, 29),
+        2021: (OCT, 19),
+        2022: (OCT, 8),
     }

holidays/countries/ireland.py

@@ -27,9 +27,7 @@ class Ireland(HolidayBase):
     """
 
     country = "IE"
-    special_holidays = {
-        2022: ((MAR, 18, "Day of Remembrance and Recognition"),)
-    }
+    special_holidays = {2022: (MAR, 18, "Day of Remembrance and Recognition")}
 
     def _populate(self, year):
         super()._populate(year)
@@ -40,9 +38,7 @@ class Ireland(HolidayBase):
         if year >= 2023:
             dt = date(year, FEB, 1)
             self[
-                dt
-                if self._is_friday(dt)
-                else _get_nth_weekday_from(1, MON, dt)
+                dt if self._is_friday(dt) else _get_nth_weekday_from(1, MON, dt)
             ] = "St. Brigid's Day"
 
         # St. Patrick's Day
@@ -65,19 +61,13 @@ class Ireland(HolidayBase):
             self[dt] = name
 
         # June bank holiday (first Monday in June)
-        self[
-            _get_nth_weekday_of_month(1, MON, JUN, year)
-        ] = "June Bank Holiday"
+        self[_get_nth_weekday_of_month(1, MON, JUN, year)] = "June Bank Holiday"
 
         # Summer bank holiday (first Monday in August)
-        self[
-            _get_nth_weekday_of_month(1, MON, AUG, year)
-        ] = "August Bank Holiday"
+        self[_get_nth_weekday_of_month(1, MON, AUG, year)] = "August Bank Holiday"
 
         # October Bank Holiday (last Monday in October)
-        self[
-            _get_nth_weekday_of_month(-1, MON, OCT, year)
-        ] = "October Bank Holiday"
+        self[_get_nth_weekday_of_month(-1, MON, OCT, year)] = "October Bank Holiday"
 
         # Christmas Day
         name = "Christmas Day"

holidays/countries/isle_of_man.py

@@ -10,10 +10,12 @@
 #  License: MIT (see LICENSE file)
 
 from datetime import date
+from datetime import timedelta as td
 
 from holidays.calendars import _get_nth_weekday_of_month
-from holidays.constants import JUN, JUL, FRI
+from holidays.constants import JUN, JUL, AUG, MON, FRI
 from holidays.holiday_base import HolidayBase
+from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
 
 from .united_kingdom import UnitedKingdom
 
@@ -24,18 +26,34 @@ class IsleOfMan(UnitedKingdom):
     country = "IM"
     subdivisions = ()  # Override UnitedKingdom subdivisions.
 
-    def __init__(self, **kwargs):  # Override UnitedKingdom __init__().
-        HolidayBase.__init__(self, **kwargs)
+    def __init__(self, *args, **kwargs):  # Override UnitedKingdom __init__().
+        ChristianHolidays.__init__(self)
+        InternationalHolidays.__init__(self)
+        HolidayBase.__init__(self, *args, **kwargs)
 
     def _populate(self, year: int) -> None:
         super()._populate(year)
 
+        # Easter Monday
+        self._add_easter_monday("Easter Monday")
+
+        # Late Summer bank holiday (last Monday in August)
+        if year >= 1971:
+            self._add_holiday(
+                "Late Summer Bank Holiday",
+                _get_nth_weekday_of_month(-1, MON, AUG, year),
+            )
+
         # Isle of Man exclusive holidays
         # TT bank holiday (first Friday in June)
-        self[_get_nth_weekday_of_month(1, FRI, JUN, year)] = "TT Bank Holiday"
+        self._add_holiday("TT Bank Holiday", _get_nth_weekday_of_month(1, FRI, JUN, year))
 
         # Tynwald Day
-        self[date(year, JUL, 5)] = "Tynwald Day"
+        # Move to the next Monday if falls on a weekend.
+        dt = date(year, JUL, 5)
+        if self._is_weekend(dt) and year >= 1992:
+            dt += td(days=+2 if self._is_saturday(dt) else +1)
+        self._add_holiday("Tynwald Day", dt)
 
 
 class IM(IsleOfMan):

holidays/countries/israel.py

@@ -12,7 +12,7 @@
 from datetime import date
 from datetime import timedelta as td
 
-from holidays.calendars import _HebrewLuniSolar
+from holidays.calendars import _HebrewLunisolar
 from holidays.holiday_base import HolidayBase
 
 
@@ -33,18 +33,14 @@ class Israel(HolidayBase):
         super()._populate(year)
 
         # Passover
-        passover_dt = _HebrewLuniSolar.hebrew_holiday_date(year, "PASSOVER")
+        passover_dt = _HebrewLunisolar.hebrew_holiday_date(year, "PASSOVER")
         self._add_with_eve("Passover I", passover_dt)
         for offset in range(1, 5):
-            self._add_holiday(
-                "Passover - Chol HaMoed", passover_dt + td(days=offset)
-            )
+            self._add_holiday("Passover - Chol HaMoed", passover_dt + td(days=offset))
         self._add_with_eve("Passover VII", passover_dt + td(days=+6))
 
         # Memorial Day
-        memorial_day_dt = _HebrewLuniSolar.hebrew_holiday_date(
-            year, "MEMORIAL_DAY"
-        )
+        memorial_day_dt = _HebrewLunisolar.hebrew_holiday_date(year, "MEMORIAL_DAY")
         observed_delta = 0
         if self.observed:
             if self._is_thursday(memorial_day_dt):
@@ -74,47 +70,39 @@ class Israel(HolidayBase):
             self._add_holiday(name, memorial_day_dt + td(days=+1))
 
         # Lag Baomer
-        lag_baomer_dt = _HebrewLuniSolar.hebrew_holiday_date(
-            year, "LAG_BAOMER"
-        )
+        lag_baomer_dt = _HebrewLunisolar.hebrew_holiday_date(year, "LAG_BAOMER")
         self._add_holiday("Lag B'Omer", lag_baomer_dt)
 
         # Shavuot
-        shavuot_dt = _HebrewLuniSolar.hebrew_holiday_date(year, "SHAVUOT")
+        shavuot_dt = _HebrewLunisolar.hebrew_holiday_date(year, "SHAVUOT")
         self._add_with_eve("Shavuot", shavuot_dt)
 
         # Rosh Hashana
-        rosh_hashanah_dt = _HebrewLuniSolar.hebrew_holiday_date(
-            year, "ROSH_HASHANAH"
-        )
+        rosh_hashanah_dt = _HebrewLunisolar.hebrew_holiday_date(year, "ROSH_HASHANAH")
         name = "Rosh Hashanah"
         self._add_with_eve(name, rosh_hashanah_dt)
         self._add_holiday(name, rosh_hashanah_dt + td(days=+1))
 
         # Yom Kippur
-        yom_kippur_dt = _HebrewLuniSolar.hebrew_holiday_date(
-            year, "YOM_KIPPUR"
-        )
+        yom_kippur_dt = _HebrewLunisolar.hebrew_holiday_date(year, "YOM_KIPPUR")
         self._add_with_eve("Yom Kippur", yom_kippur_dt)
 
         # Sukkot
-        sukkot_dt = _HebrewLuniSolar.hebrew_holiday_date(year, "SUKKOT")
+        sukkot_dt = _HebrewLunisolar.hebrew_holiday_date(year, "SUKKOT")
         self._add_with_eve("Sukkot I", sukkot_dt)
         for offset in range(1, 6):
-            self._add_holiday(
-                "Sukkot - Chol HaMoed", sukkot_dt + td(days=offset)
-            )
+            self._add_holiday("Sukkot - Chol HaMoed", sukkot_dt + td(days=offset))
         self._add_with_eve("Sukkot VII", sukkot_dt + td(days=+7))
 
         # Hanukkah
         # Some o prior's year Hannukah may fall in current year.
         for yr in (year - 1, year):
-            hanukkah_dt = _HebrewLuniSolar.hebrew_holiday_date(yr, "HANUKKAH")
+            hanukkah_dt = _HebrewLunisolar.hebrew_holiday_date(yr, "HANUKKAH")
             for offset in range(8):
                 self._add_holiday("Hanukkah", hanukkah_dt + td(days=offset))
 
         # Purim
-        purim_dt = _HebrewLuniSolar.hebrew_holiday_date(year, "PURIM")
+        purim_dt = _HebrewLunisolar.hebrew_holiday_date(year, "PURIM")
         self._add_with_eve("Purim", purim_dt)
         self._add_holiday("Shushan Purim", purim_dt + td(days=+1))
 

holidays/countries/italy.py

@@ -13,8 +13,7 @@
 from datetime import timedelta as td
 
 from holidays.calendars import _get_nth_weekday_of_month
-from holidays.constants import JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP
-from holidays.constants import OCT, NOV, DEC, TUE, SUN
+from holidays.constants import JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP, OCT, NOV, DEC, TUE, SUN
 from holidays.holiday_base import HolidayBase
 from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
 
@@ -275,7 +274,7 @@ class Italy(HolidayBase, ChristianHolidays, InternationalHolidays):
         self._add_holiday("San Saturnino di Cagliari", OCT, 30)
 
     def _add_subdiv_cb_holidays(self):
-        self._add_holiday("San Giorgio", APR, 23)
+        self._add_saint_georges_day("San Giorgio")
 
     def _add_subdiv_ce_holidays(self):
         self._add_holiday("San Sebastiano", JAN, 20)
@@ -312,7 +311,7 @@ class Italy(HolidayBase, ChristianHolidays, InternationalHolidays):
         self._add_saint_johns_day("San Giovanni Battista")
 
     def _add_subdiv_fe_holidays(self):
-        self._add_holiday("San Giorgio", APR, 23)
+        self._add_saint_georges_day("San Giorgio")
 
     def _add_subdiv_fg_holidays(self):
         self._add_holiday("Madonna dei Sette Veli", MAR, 22)
@@ -428,7 +427,7 @@ class Italy(HolidayBase, ChristianHolidays, InternationalHolidays):
         self._add_holiday("Sant'Ilario di Poitiers", JAN, 13)
 
     def _add_subdiv_pt_holidays(self):
-        self._add_holiday("San Jacopo", JUL, 25)
+        self._add_saint_james_day("San Jacopo")
 
     def _add_subdiv_pu_holidays(self):
         self._add_holiday("San Crescentino", JUN, 1)
@@ -444,13 +443,13 @@ class Italy(HolidayBase, ChristianHolidays, InternationalHolidays):
         self._add_holiday("Sant'Apollinare", JUL, 23)
 
     def _add_subdiv_rc_holidays(self):
-        self._add_holiday("San Giorgio", APR, 23)
+        self._add_saint_georges_day("San Giorgio")
 
     def _add_subdiv_re_holidays(self):
         self._add_holiday("San Prospero Vescovo", NOV, 24)
 
     def _add_subdiv_rg_holidays(self):
-        self._add_holiday("San Giorgio", APR, 23)
+        self._add_saint_georges_day("San Giorgio")
 
     def _add_subdiv_ri_holidays(self):
         self._add_holiday("Santa Barbara", DEC, 4)

holidays/countries/jamaica.py

@@ -12,7 +12,7 @@
 from datetime import date
 from datetime import timedelta as td
 
-from holidays.calendars import _get_nth_weekday_from, _get_nth_weekday_of_month
+from holidays.calendars import _get_nth_weekday_of_month
 from holidays.constants import MAY, AUG, OCT, MON
 from holidays.holiday_base import HolidayBase
 from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
@@ -31,16 +31,14 @@ class Jamaica(HolidayBase, ChristianHolidays, InternationalHolidays):
         InternationalHolidays.__init__(self)
         super().__init__(*args, **kwargs)
 
-    def _add_observed(self, hol_date: date, include_sat: bool = False) -> None:
+    def _add_observed(self, dt: date, include_sat: bool = False, days: int = +1) -> None:
         if not self.observed:
             return None
-        if self._is_sunday(hol_date) or (
-            self._is_saturday(hol_date) and include_sat
-        ):
-            obs_date = _get_nth_weekday_from(1, MON, hol_date)
-            if obs_date in self:
-                obs_date += td(days=+1)
-            self._add_holiday("%s (Observed)" % self[hol_date], obs_date)
+        if self._is_sunday(dt) or (include_sat and self._is_saturday(dt)):
+            self._add_holiday(
+                "%s (Observed)" % self[dt],
+                dt + td(days=+2 if self._is_saturday(dt) else days),
+            )
 
     def _populate(self, year):
         super()._populate(year)
@@ -58,9 +56,7 @@ class Jamaica(HolidayBase, ChristianHolidays, InternationalHolidays):
         self._add_easter_monday("Easter Monday")
 
         # National Labour Day
-        self._add_observed(
-            self._add_holiday("National Labour Day", MAY, 23), include_sat=True
-        )
+        self._add_observed(self._add_holiday("National Labour Day", MAY, 23), include_sat=True)
 
         # Emancipation Day
         if year >= 1998:
@@ -70,18 +66,14 @@ class Jamaica(HolidayBase, ChristianHolidays, InternationalHolidays):
         self._add_observed(self._add_holiday("Independence Day", AUG, 6))
 
         # National Heroes Day
-        self._add_holiday(
-            "National Heroes Day", _get_nth_weekday_of_month(3, MON, OCT, year)
-        )
+        self._add_holiday("National Heroes Day", _get_nth_weekday_of_month(3, MON, OCT, year))
 
         # Christmas Day
-        dt = self._add_christmas_day("Christmas Day")
+        self._add_observed(self._add_christmas_day("Christmas Day"), days=+2)
 
         # Boxing Day
         self._add_observed(self._add_christmas_day_two("Boxing Day"))
 
-        self._add_observed(dt)
-
 
 class JM(Jamaica):
     pass