holidays 0.63__py3-none-any.whl → 0.64__py3-none-any.whl

holidays/calendars/hebrew.py

@@ -1598,7 +1598,36 @@ class _HebrewLunisolar:
         2100: (OCT, 13),
     }
 
-    @staticmethod
-    def _get_holiday(holiday: str, year: int) -> Optional[date]:
-        dt = getattr(_HebrewLunisolar, f"{holiday}_DATES", {}).get(year, ())
+    def _get_holiday(self, holiday: str, year: int) -> Optional[date]:
+        dt = getattr(self, f"{holiday}_DATES", {}).get(year, ())
         return date(year, *dt) if dt else None
+
+    def hanukkah_date(self, year: int) -> set[Optional[date]]:
+        return {self._get_holiday(HANUKKAH, y) for y in (year - 1, year)}
+
+    def israel_independence_date(self, year: int) -> Optional[date]:
+        return self._get_holiday(INDEPENDENCE_DAY, year)
+
+    def lag_baomer_date(self, year: int) -> Optional[date]:
+        return self._get_holiday(LAG_BAOMER, year)
+
+    def passover_date(self, year: int) -> Optional[date]:
+        return self._get_holiday(PASSOVER, year)
+
+    def purim_date(self, year: int) -> Optional[date]:
+        return self._get_holiday(PURIM, year)
+
+    def rosh_hashanah_date(self, year: int) -> Optional[date]:
+        return self._get_holiday(ROSH_HASHANAH, year)
+
+    def shavuot_date(self, year: int) -> Optional[date]:
+        return self._get_holiday(SHAVUOT, year)
+
+    def sukkot_date(self, year: int) -> Optional[date]:
+        return self._get_holiday(SUKKOT, year)
+
+    def tisha_bav_date(self, year: int) -> Optional[date]:
+        return self._get_holiday(TISHA_BAV, year)
+
+    def yom_kippur_date(self, year: int) -> Optional[date]:
+        return self._get_holiday(YOM_KIPPUR, year)

holidays/constants.py

@@ -54,6 +54,7 @@ CHRISTIAN = "christian"
 HEBREW = "hebrew"
 HINDU = "hindu"
 ISLAMIC = "islamic"
+ORTHODOX = "orthodox"
 
 DEFAULT_START_YEAR = 1901
 DEFAULT_END_YEAR = 2100

holidays/countries/__init__.py

@@ -12,6 +12,7 @@
 
 # flake8: noqa: F401
 
+from .afghanistan import Afghanistan, AF, AFG
 from .albania import Albania, AL, ALB
 from .algeria import Algeria, DZ, DZA
 from .american_samoa import AmericanSamoa, AS, ASM, HolidaysAS

holidays/countries/afghanistan.py

@@ -0,0 +1,104 @@
+#  holidays
+#  --------
+#  A fast, efficient Python library for generating country, province and state
+#  specific sets of holidays on the fly. It aims to make determining whether a
+#  specific date is a holiday as fast and flexible as possible.
+#
+#  Authors: Vacanza Team and individual contributors (see AUTHORS file)
+#           dr-prodigy <dr.prodigy.github@gmail.com> (c) 2017-2023
+#           ryanss <ryanssdev@icloud.com> (c) 2014-2017
+#  Website: https://github.com/vacanza/holidays
+#  License: MIT (see LICENSE file)
+
+from gettext import gettext as tr
+
+from holidays.groups import InternationalHolidays, IslamicHolidays
+from holidays.holiday_base import HolidayBase
+
+
+class Afghanistan(HolidayBase, InternationalHolidays, IslamicHolidays):
+    """
+    https://en.wikipedia.org/wiki/Public_holidays_in_Afghanistan
+    https://www.timeanddate.com/holidays/afghanistan/
+    """
+
+    country = "AF"
+    default_language = "fa_AF"
+    # %s (estimated).
+    estimated_label = tr("%s (برآورد شده)")
+    # %s (observed).
+    observed_label = tr("%s (مشاهده شده)")
+    # %s (observed, estimated).
+    observed_estimated_label = tr("%s (مشاهده شده، برآورد شده)")
+    supported_languages = ("en_US", "fa_AF", "ps_AF")
+    # Afghanistan's regaining of full independence from British influence.
+    start_year = 1919
+
+    def __init__(self, *args, **kwargs):
+        InternationalHolidays.__init__(self)
+        IslamicHolidays.__init__(self)
+        super().__init__(*args, **kwargs)
+
+    def _populate_public_holidays(self):
+        if self._year >= 1989:
+            # Liberation Day.
+            self._add_holiday_feb_15(tr("روز آزادی"))
+
+        # Afghanistan Independence Day.
+        self._add_holiday_aug_19(tr("روز استقلال افغانستان"))
+
+        if self._year <= 1996 or 2001 <= self._year <= 2020:
+            # Nowruz.
+            self._add_holiday_mar_21(tr("نوروز"))
+
+        if self._year >= 1992:
+            # Mojahedin's Victory Day.
+            self._add_holiday_apr_28(tr("روز پیروزی مجاهدین"))
+
+        if 1974 <= self._year <= 1996 or 2002 <= self._year <= 2021:
+            # International Workers' Day.
+            self._add_labor_day(tr("روز جهانی کارگر"))
+
+        if 1978 <= self._year <= 1988:
+            # Soviet Victory Day.
+            self._add_holiday_may_9(tr("روز پیروزی شوروی"))
+
+        if self._year >= 2022:
+            # American Withdrawal Day.
+            self._add_holiday_aug_31(tr("روز خروج آمریکایی ها"))
+
+        if self._year >= 2012:
+            # Martyrs' Day.
+            self._add_holiday_sep_9(tr("روز شهیدان"))
+
+        # Eid al-Fitr.
+        name = tr("عید فطر")
+        self._add_eid_al_fitr_day(name)
+        self._add_eid_al_fitr_day_two(name)
+        self._add_eid_al_fitr_day_three(name)
+
+        # Day of Arafah.
+        self._add_arafah_day(tr("روز عرفه"))
+
+        # Eid al-Adha.
+        name = tr("عید قربانی")
+        self._add_eid_al_adha_day(name)
+        self._add_eid_al_adha_day_two(name)
+        self._add_eid_al_adha_day_three(name)
+
+        # Ashura.
+        self._add_ashura_day(tr("عاشورا"))
+
+        # First Day of Ramadan.
+        self._add_ramadan_beginning_day(tr("اول رمضان"))
+
+        # Prophet's Birthday.
+        self._add_mawlid_day(tr("میلاد پیامبر"))
+
+
+class AF(Afghanistan):
+    pass
+
+
+class AFG(Afghanistan):
+    pass

holidays/countries/azerbaijan.py

@@ -287,10 +287,10 @@ class AzerbaijanStaticHolidays:
         2018: (APR, 11, presidential_elections),
         2019: (DEC, 27, municipal_elections),
         2020: (
-            (MAR, 27, MAR, 29),
-            (MAY, 27, MAY, 30),
             (JAN, 3, DEC, 28, 2019),
             (JAN, 6, DEC, 29, 2019),
+            (MAR, 27, MAR, 29),
+            (MAY, 27, MAY, 30),
         ),
         2021: (
             (MAY, 11, MAY, 8),

holidays/countries/belarus.py

@@ -14,6 +14,7 @@ from gettext import gettext as tr
 
 from holidays.calendars.gregorian import GREGORIAN_CALENDAR, JAN, MAR, APR, MAY, JUN, JUL, NOV, DEC
 from holidays.calendars.julian import JULIAN_CALENDAR
+from holidays.constants import PUBLIC, WORKDAY
 from holidays.groups import ChristianHolidays, InternationalHolidays, StaticHolidays
 from holidays.holiday_base import HolidayBase
 
@@ -23,18 +24,24 @@ class Belarus(HolidayBase, ChristianHolidays, InternationalHolidays, StaticHolid
     Belarus holidays.
 
     References:
-        - http://president.gov.by/en/holidays_en/
+        - https://president.gov.by/en/gosudarstvo/prazdniki
+        - https://president.gov.by/be/gosudarstvo/prazdniki
+        - https://president.gov.by/ru/gosudarstvo/prazdniki
         - http://www.belarus.by/en/about-belarus/national-holidays
         - http://laws.newsby.org/documents/ukazp/pos05/ukaz05806.htm
         - http://president.gov.by/uploads/documents/2019/464uk.pdf
-        - https://ru.wikipedia.org/wiki/%D0%9F%D1%80%D0%B0%D0%B7%D0%B4%D0%BD%D0%B8%D0%BA%D0%B8_%D0%91%D0%B5%D0%BB%D0%BE%D1%80%D1%83%D1%81%D1%81%D0%B8%D0%B8
+        - https://ru.wikipedia.org/wiki/Праздники_Белоруссии
+
+    Cross-checked With:
+        - https://president.gov.by/en/gosudarstvo/prazdniki/calendar-2024
     """
 
     country = "BY"
     default_language = "be"
-    supported_languages = ("be", "en_US")
-    # The current set of holidays actual from 1998.
-    start_year = 1998
+    supported_categories = (PUBLIC, WORKDAY)
+    supported_languages = ("be", "en_US", "ru", "th")
+    # Declaration of State Sovereignty of the BSSR.
+    start_year = 1991
 
     def __init__(self, *args, **kwargs):
         ChristianHolidays.__init__(self, JULIAN_CALENDAR)
@@ -44,10 +51,10 @@ class Belarus(HolidayBase, ChristianHolidays, InternationalHolidays, StaticHolid
 
     def _populate_public_holidays(self):
         # New Year's Day.
-        self._add_new_years_day(tr("Новы год"))
-
+        name = tr("Новы год")
+        self._add_new_years_day(name)
         if self._year >= 2020:
-            self._add_new_years_day_two(tr("Новы год"))
+            self._add_new_years_day_two(name)
 
         # Orthodox Christmas Day.
         self._add_christmas_day(tr("Нараджэнне Хрыстова (праваслаўнае Раство)"))
@@ -55,8 +62,9 @@ class Belarus(HolidayBase, ChristianHolidays, InternationalHolidays, StaticHolid
         # Women's Day.
         self._add_womens_day(tr("Дзень жанчын"))
 
-        # Radunitsa (Day of Rejoicing).
-        self._add_rejoicing_day(tr("Радаўніца"))
+        if 1995 <= self._year <= 1998:
+            # Constitution Day.
+            self._add_holiday_mar_15(tr("Дзень Канстытуцыі"))
 
         # Labor Day.
         self._add_labor_day(tr("Свята працы"))
@@ -64,15 +72,70 @@ class Belarus(HolidayBase, ChristianHolidays, InternationalHolidays, StaticHolid
         # Victory Day.
         self._add_world_war_two_victory_day(tr("Дзень Перамогі"), is_western=False)
 
-        # Independence Day.
-        self._add_holiday_jul_3(tr("Дзень Незалежнасці Рэспублікі Беларусь (Дзень Рэспублікі)"))
+        # Radunitsa (Day of Rejoicing).
+        self._add_rejoicing_day(tr("Радаўніца"))
+
+        # Independence Day of the Republic of Belarus (Day of the Republic).
+        name = tr("Дзень Незалежнасці Рэспублікі Беларусь (Дзень Рэспублікі)")
+        if self._year >= 1997:
+            self._add_holiday_jul_3(name)
+        else:
+            self._add_holiday_jul_27(name)
 
-        # October Revolution Day.
-        self._add_holiday_nov_7(tr("Дзень Кастрычніцкай рэвалюцыі"))
+        if self._year >= 1995:
+            # October Revolution Day.
+            self._add_holiday_nov_7(tr("Дзень Кастрычніцкай рэвалюцыі"))
 
         # Catholic Christmas Day.
         self._add_christmas_day(tr("Нараджэнне Хрыстова (каталіцкае Раство)"), GREGORIAN_CALENDAR)
 
+        if self._year >= 1992:
+            # Catholic Easter.
+            name_catholic = tr("Каталiцкi Вялiкдзень")
+            self._add_easter_sunday(name_catholic, GREGORIAN_CALENDAR)
+
+            # Orthodox Easter.
+            name_orthodox = tr("Праваслаўны Вялiкдзень")
+            self._add_easter_sunday(name_orthodox)
+
+            if self._year <= 1997:
+                self._add_easter_monday(name_catholic, GREGORIAN_CALENDAR)
+                self._add_easter_monday(name_orthodox)
+
+                # Dzyady (All Souls' Day).
+                self._add_all_souls_day(tr("Дзень памяці"))
+
+    def _populate_workday_holidays(self):
+        # Day of the Fatherland's Defenders and the Armed Forces of the Republic of Belarus.
+        self._add_holiday_feb_23(tr("Дзень абаронцаў Айчыны і Узброеных Сіл Рэспублікі Беларусь"))
+
+        if self._year >= 1999:
+            # Constitution Day.
+            self._add_holiday_mar_15(tr("Дзень Канстытуцыі"))
+
+        if self._year >= 1996:
+            # Day of Unity of the Peoples of Belarus and Russia.
+            self._add_holiday_apr_2(tr("Дзень яднання народаў Беларусі і Расіі"))
+
+        if self._year >= 1998:
+            self._add_holiday_2nd_sun_of_may(
+                # Day of the National Coat of Arms of the Republic of Belarus,
+                # the National Flag of the Republic of Belarus
+                # and the National Anthem of the Republic of Belarus.
+                tr(
+                    "Дзень Дзяржаўнага сцяга, Дзяржаўнага герба і Дзяржаўнага "
+                    "гімна Рэспублікі Беларусь"
+                )
+            )
+
+        if self._year >= 2021:
+            # Day of People's Unity.
+            self._add_holiday_sep_17(tr("Дзень народнага адзінства"))
+
+        if self._year >= 1998:
+            # Dzyady (All Souls' Day).
+            self._add_all_souls_day(tr("Дзень памяці"))
+
 
 class BY(Belarus):
     pass
@@ -83,6 +146,12 @@ class BLR(Belarus):
 
 
 class BelarusStaticHolidays:
+    """
+    References
+        - https://belarusbank.by/en/financial-institutions/11151
+        - https://belarusbank.by/en/financial-institutions/11160
+    """
+
     # Date format (see strftime() Format Codes)
     substituted_date_format = tr("%d.%m.%Y")
     # Day off (substituted from %s).
@@ -221,4 +290,14 @@ class BelarusStaticHolidays:
             (MAY, 8, MAY, 13),
             (NOV, 6, NOV, 11),
         ),
+        2024: (
+            (MAY, 13, MAY, 18),
+            (NOV, 8, NOV, 16),
+        ),
+        2025: (
+            (JAN, 6, JAN, 11),
+            (APR, 28, APR, 26),
+            (JUL, 4, JUL, 12),
+            (DEC, 26, DEC, 20),
+        ),
     }

holidays/countries/el_salvador.py

@@ -10,6 +10,8 @@
 #  Website: https://github.com/vacanza/holidays
 #  License: MIT (see LICENSE file)
 
+from gettext import gettext as tr
+
 from holidays.groups import ChristianHolidays, InternationalHolidays
 from holidays.holiday_base import HolidayBase
 
@@ -17,12 +19,14 @@ from holidays.holiday_base import HolidayBase
 class ElSalvador(HolidayBase, ChristianHolidays, InternationalHolidays):
     """
     References:
-    - https://www.transparencia.gob.sv/institutions/gd-usulutan/documents/192280/download
-    - https://www.timeanddate.com/holidays/el-salvador
-    - https://www.officeholidays.com/countries/el-salvador
+        - `Labor Code 1972 <https://www.transparencia.gob.sv/institutions/gd-usulutan/documents/192280/download>`_
+        - https://www.timeanddate.com/holidays/el-salvador
+        - https://www.officeholidays.com/countries/el-salvador
     """
 
     country = "SV"
+    default_language = "es"
+    supported_languages = ("en_US", "es", "uk")
     subdivisions = (
         "AH",  # Ahuachapán
         "CA",  # Cabañas
@@ -39,6 +43,24 @@ class ElSalvador(HolidayBase, ChristianHolidays, InternationalHolidays):
         "UN",  # La Unión
         "US",  # Usulután
     )
+    subdivisions_aliases = {
+        "Ahuachapán": "AH",
+        "Cabañas": "CA",
+        "Chalatenango": "CH",
+        "Cuscatlán": "CU",
+        "La Libertad": "LI",
+        "Morazán": "MO",
+        "La Paz": "PA",
+        "Santa Ana": "SA",
+        "San Miguel": "SM",
+        "Sonsonate": "SO",
+        "San Salvador": "SS",
+        "San Vicente": "SV",
+        "La Unión": "UN",
+        "Usulután": "US",
+    }
+    # Labor Code 1972.
+    start_year = 1973
 
     def __init__(self, *args, **kwargs):
         ChristianHolidays.__init__(self)
@@ -47,48 +69,47 @@ class ElSalvador(HolidayBase, ChristianHolidays, InternationalHolidays):
 
     def _populate_public_holidays(self):
         # New Year's Day.
-        self._add_new_years_day("New Year's Day")
+        self._add_new_years_day(tr("Año Nuevo"))
 
         # Maundy Thursday.
-        self._add_holy_thursday("Maundy Thursday")
+        self._add_holy_thursday(tr("Jueves Santo"))
 
         # Good Friday.
-        self._add_good_friday("Good Friday")
+        self._add_good_friday(tr("Viernes Santo"))
 
         # Holy Saturday.
-        self._add_holy_saturday("Holy Saturday")
+        self._add_holy_saturday(tr("Sábado Santo"))
 
         # Labor Day.
-        self._add_labor_day("Labor Day")
+        self._add_labor_day(tr("Día del Trabajo"))
 
+        # Legislative Decree #399 from Apr 14, 2016.
         if self._year >= 2016:
-            # Legislative Decree #399 from Apr 14, 2016
-            # Mothers' Day.
-            self._add_holiday_may_10("Mothers' Day")
+            # Mother's Day.
+            self._add_holiday_may_10(tr("Día de la Madre"))
 
+        # Legislative Decree #208 from Jun 17, 2012.
         if self._year >= 2013:
-            # Legislative Decree #208 from Jun 17, 2012
-            # Fathers' Day.
-            self._add_holiday_jun_17("Fathers' Day")
+            # Father's Day.
+            self._add_holiday_jun_17(tr("Día del Padre"))
 
-        # Feast of San Salvador.
-        self._add_holiday_aug_6("Feast of San Salvador")
+        # Celebrations of San Salvador.
+        self._add_holiday_aug_6(tr("Celebración del Divino Salvador del Mundo"))
 
         # Independence Day.
-        self._add_holiday_sep_15("Independence Day")
+        self._add_holiday_sep_15(tr("Día de la Independencia"))
 
         # All Souls' Day.
-        self._add_all_souls_day("All Souls' Day")
+        self._add_all_souls_day(tr("Día de los Difuntos"))
 
         # Christmas Day.
-        self._add_christmas_day("Christmas Day")
+        self._add_christmas_day(tr("Navidad"))
 
     def _populate_subdiv_ss_public_holidays(self):
-        # San Salvador Day 1.
-        self._add_holiday_aug_3("San Salvador Day 1")
-
-        # San Salvador Day 2.
-        self._add_holiday_aug_5("San Salvador Day 2")
+        # Feast of San Salvador.
+        name = tr("Fiesta de San Salvador")
+        self._add_holiday_aug_3(name)
+        self._add_holiday_aug_5(name)
 
 
 class SV(ElSalvador):

holidays/countries/israel.py

@@ -12,20 +12,9 @@
 
 from gettext import gettext as tr
 
-from holidays.calendars import _HebrewLunisolar
 from holidays.calendars.gregorian import _timedelta, FRI, SAT
-from holidays.calendars.hebrew import (
-    HANUKKAH,
-    INDEPENDENCE_DAY,
-    LAG_BAOMER,
-    PASSOVER,
-    PURIM,
-    ROSH_HASHANAH,
-    SHAVUOT,
-    SUKKOT,
-    YOM_KIPPUR,
-)
 from holidays.constants import OPTIONAL, PUBLIC, SCHOOL
+from holidays.groups import HebrewCalendarHolidays
 from holidays.observed_holiday_base import (
     ObservedHolidayBase,
     MON_TO_NEXT_TUE,
@@ -38,7 +27,7 @@ from holidays.observed_holiday_base import (
 )
 
 
-class Israel(ObservedHolidayBase):
+class Israel(ObservedHolidayBase, HebrewCalendarHolidays):
     """
     Israel holidays.
 
@@ -57,117 +46,103 @@ class Israel(ObservedHolidayBase):
     start_year = 1948
 
     def __init__(self, *args, **kwargs):
+        HebrewCalendarHolidays.__init__(self)
         kwargs.setdefault("observed_rule", FRI_TO_PREV_THU + SAT_TO_PREV_THU)
         super().__init__(*args, **kwargs)
 
-    def _get_holiday(self, holiday: str):
-        return _HebrewLunisolar._get_holiday(holiday, self._year)
+    def _add_observed(self, dt, name, rule):
+        is_observed, _ = super()._add_observed(dt, name, rule)
+        if not is_observed:
+            self._add_holiday(name, dt)
 
     def _populate_public_holidays(self):
         # Rosh Hashanah (New Year).
-        name = tr("ראש השנה")
-        rosh_hashanah_dt = self._get_holiday(ROSH_HASHANAH)
-        self._add_holiday(name, rosh_hashanah_dt)
-        self._add_holiday(name, _timedelta(rosh_hashanah_dt, +1))
+        self._add_rosh_hashanah(tr("ראש השנה"), range(2))
 
         # Yom Kippur (Day of Atonement).
-        self._add_holiday(tr("יום כיפור"), self._get_holiday(YOM_KIPPUR))
+        self._add_yom_kippur(tr("יום כיפור"))
 
-        sukkot_dt = self._get_holiday(SUKKOT)
         # Sukkot (Feast of Tabernacles).
-        self._add_holiday(tr("סוכות"), sukkot_dt)
+        self._add_sukkot(tr("סוכות"))
         # Simchat Torah / Shemini Atzeret.
-        self._add_holiday(tr("שמחת תורה/שמיני עצרת"), _timedelta(sukkot_dt, +7))
+        self._add_sukkot(tr("שמחת תורה/שמיני עצרת"), +7)
 
-        passover_dt = self._get_holiday(PASSOVER)
         # Pesach (Passover).
-        self._add_holiday(tr("פסח"), passover_dt)
+        self._add_passover(tr("פסח"))
         # Shvi'i shel Pesach (Seventh day of Passover)
-        self._add_holiday(tr("שביעי של פסח"), _timedelta(passover_dt, +6))
+        self._add_passover(tr("שביעי של פסח"), +6)
 
-        # Yom Ha-Atzmaut (Independence Day).
-        name = tr("יום העצמאות")
-        independence_day_dt = self._get_holiday(INDEPENDENCE_DAY)
         rule = FRI_TO_PREV_THU + SAT_TO_PREV_THU
         if self._year >= 2004:
             rule += MON_TO_NEXT_TUE
-        is_observed, _ = self._add_observed(independence_day_dt, name, rule)
-        if not is_observed:
-            self._add_holiday(name, independence_day_dt)
+        self._add_observed(
+            self._hebrew_calendar.israel_independence_date(self._year),
+            # Yom Ha-Atzmaut (Independence Day).
+            tr("יום העצמאות"),
+            rule,
+        )
 
         # Shavuot.
-        self._add_holiday(tr("שבועות"), self._get_holiday(SHAVUOT))
+        self._add_shavuot(tr("שבועות"))
 
     def _populate_optional_holidays(self):
-        sukkot_dt = self._get_holiday(SUKKOT)
-        for offset in range(1, 6):
-            # Chol HaMoed Sukkot (Feast of Tabernacles holiday).
-            self._add_holiday(tr("חול המועד סוכות"), _timedelta(sukkot_dt, offset))
+        # Chol HaMoed Sukkot (Feast of Tabernacles holiday).
+        self._add_sukkot(tr("חול המועד סוכות"), range(1, 6))
 
         if self._year >= 2008:
             # Sigd.
-            self._add_holiday(tr("סיגד"), _timedelta(self._get_holiday(YOM_KIPPUR), +49))
+            self._add_yom_kippur(tr("סיגד"), +49)
 
         # Purim.
-        self._add_holiday(tr("פורים"), self._get_holiday(PURIM))
+        self._add_purim(tr("פורים"))
 
-        passover_dt = self._get_holiday(PASSOVER)
-        for offset in range(1, 6):
-            # Chol HaMoed Pesach (Passover holiday).
-            self._add_holiday(tr("חול המועד פסח"), _timedelta(passover_dt, offset))
+        # Chol HaMoed Pesach (Passover holiday).
+        self._add_passover(tr("חול המועד פסח"), range(1, 6))
 
         if self._year >= 1963:
-            # Yom Hazikaron (Fallen Soldiers and Victims of Terrorism Remembrance Day).
-            name = tr("יום הזיכרון לחללי מערכות ישראל ונפגעי פעולות האיבה")
-            remembrance_day_dt = _timedelta(self._get_holiday(INDEPENDENCE_DAY), -1)
             rule = THU_TO_PREV_WED + FRI_TO_PREV_WED
             if self._year >= 2004:
                 rule += SUN_TO_NEXT_MON
-            is_observed, _ = self._add_observed(remembrance_day_dt, name, rule)
-            if not is_observed:
-                self._add_holiday(name, remembrance_day_dt)
+            self._add_observed(
+                _timedelta(self._hebrew_calendar.israel_independence_date(self._year), -1),
+                # Yom Hazikaron (Fallen Soldiers and Victims of Terrorism Remembrance Day).
+                tr("יום הזיכרון לחללי מערכות ישראל ונפגעי פעולות האיבה"),
+                rule,
+            )
 
         if self._year >= 1998:
             # Yom Yerushalayim (Jerusalem Day).
-            self._add_holiday(tr("יום ירושלים"), _timedelta(self._get_holiday(LAG_BAOMER), +10))
+            self._add_lag_baomer(tr("יום ירושלים"), +10)
 
-        # Tisha B'Av (Tisha B'Av, fast).
-        name = tr("תשעה באב")
-        tisha_bav_dt = self._get_holiday("TISHA_BAV")
-        is_observed, _ = self._add_observed(tisha_bav_dt, name, SAT_TO_NEXT_SUN)
-        if not is_observed:
-            self._add_holiday(name, tisha_bav_dt)
+        self._add_observed(
+            self._hebrew_calendar.tisha_bav_date(self._year),
+            # Tisha B'Av (Tisha B'Av, fast).
+            tr("תשעה באב"),
+            SAT_TO_NEXT_SUN,
+        )
 
     def _populate_school_holidays(self):
-        sukkot_dt = self._get_holiday(SUKKOT)
-        for offset in range(1, 6):
-            # Chol HaMoed Sukkot (Feast of Tabernacles holiday).
-            self._add_holiday(tr("חול המועד סוכות"), _timedelta(sukkot_dt, offset))
-
-        for year in (self._year - 1, self._year):
-            hanukkah_dt = _HebrewLunisolar._get_holiday(HANUKKAH, year)
-            for offset in range(8):
-                # Hanukkah.
-                self._add_holiday(tr("חנוכה"), _timedelta(hanukkah_dt, offset))
-
-        # Ta`anit Ester (Fast of Esther).
-        name = tr("תענית אסתר")
-        purim_dt = self._get_holiday(PURIM)
-        taanit_ester_dt = _timedelta(purim_dt, -1)
-        is_observed, _ = self._add_observed(taanit_ester_dt, name, SAT_TO_PREV_THU)
-        if not is_observed:
-            self._add_holiday(name, taanit_ester_dt)
+        # Chol HaMoed Sukkot (Feast of Tabernacles holiday).
+        self._add_sukkot(tr("חול המועד סוכות"), range(1, 6))
+
+        # Hanukkah.
+        self._add_hanukkah(tr("חנוכה"), range(8))
+
+        self._add_observed(
+            _timedelta(self._hebrew_calendar.purim_date(self._year), -1),
+            # Ta`anit Ester (Fast of Esther).
+            tr("תענית אסתר"),
+            SAT_TO_PREV_THU,
+        )
 
         # Purim.
-        self._add_holiday(tr("פורים"), purim_dt)
+        self._add_purim(tr("פורים"))
 
-        passover_dt = self._get_holiday(PASSOVER)
-        for offset in range(1, 6):
-            # Chol HaMoed Pesach (Passover holiday).
-            self._add_holiday(tr("חול המועד פסח"), _timedelta(passover_dt, offset))
+        # Chol HaMoed Pesach (Passover holiday).
+        self._add_passover(tr("חול המועד פסח"), range(1, 6))
 
         # Lag Ba'omer (Lag BaOmer).
-        self._add_holiday(tr('ל"ג בעומר'), self._get_holiday(LAG_BAOMER))
+        self._add_lag_baomer(tr('ל"ג בעומר'))
 
 
 class IL(Israel):