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

holidays/countries/curacao.py

@@ -11,81 +11,135 @@
 
 from datetime import date
 from datetime import timedelta as td
+from gettext import gettext as tr
 
-from dateutil.easter import easter
-
-from holidays.constants import JAN, APR, MAY, JUL, AUG, OCT, DEC
+from holidays.constants import APR, MAY, JUL, OCT
 from holidays.holiday_base import HolidayBase
+from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
 
 
-class Curacao(HolidayBase):
+class Curacao(HolidayBase, ChristianHolidays, InternationalHolidays):
     """
-    https://loketdigital.gobiernu.cw/Loket/product/571960bbe1e5fe8712b10a1323630e70
+    https://loketdigital.gobiernu.cw/Loket/product/571960bbe1e5fe8712b10a1323630e70  # noqa: E501
+    https://en.wikipedia.org/wiki/Public_holidays_in_Cura%C3%A7ao
+
+    New Year's Eve (Vispu di Aña Nobo) is a half-day public holiday, though
+    this isn't supported by Python Holidays so it won't be implemented.
     """
 
     country = "CW"
+    default_language = "pap"
+    supported_languages = ("en_US", "nl", "pap", "uk")
+
+    def __init__(self, *args, **kwargs):
+        ChristianHolidays.__init__(self)
+        InternationalHolidays.__init__(self)
+        super().__init__(*args, **kwargs)
 
     def _populate(self, year):
+        # 1954: Creation of the Netherlands Antilles.
+        if year <= 1953:
+            return None
+
         super()._populate(year)
 
+        # Aña Nobo.
+        # Status: In-Use.
+
         # New Year's Day
-        self[date(year, JAN, 1)] = "Nieuwjaarsdag [New Year's Day]"
+        self._add_new_years_day(tr("Aña Nobo"))
+
+        # Dialuna despues di Carnaval Grandi.
+        # Status: In-Use.
+        # Started in 1947.
+
+        # Carnival Monday
+        self._add_ash_monday(tr("Dialuna despues di Carnaval Grandi"))
 
-        easter_date = easter(year)
-        # Carnaval Monday
-        self[
-            easter_date + td(days=-48)
-        ] = "Maandag na de Grote Karnaval [Carnaval Monday]"
+        # Bièrnèsantu.
+        # Status: In-Use.
 
         # Good Friday
-        self[easter_date + td(days=-2)] = "Goede Vrijdag [Good Friday]"
+        self._add_good_friday(tr("Bièrnèsantu"))
 
-        # Easter Monday
-        self[
-            easter_date + td(days=+1)
-        ] = "Di Dos Dia di Pasku di Resureccion [Easter Monday]"
+        # Pasku di Resurekshon.
+        # Status: In-Use
 
-        # King's Day
-        if year >= 2014:
-            kings_day = date(year, APR, 27)
-            if self._is_sunday(kings_day):
-                kings_day += td(days=-1)
+        # Easter Sunday
+        self._add_easter_sunday(tr("Pasku di Resurekshon"))
 
-            self[kings_day] = "Koningsdag [King's Day]"
+        # Di dos dia di Pasku di Resurekshon.
+        # Status: In-Use.
 
-        # Queen's Day
-        if 1891 <= year <= 2013:
-            queens_day = date(year, APR, 30)
-            if year <= 1948:
-                queens_day = date(year, AUG, 31)
+        # Easter Monday
+        self._add_easter_monday(tr("Di dos dia di Pasku di Resurekshon"))
+
+        # Dia di la Reina/Dia di Rey.
+        # Status: In-Use.
+        # Started under Queen Wilhelmina in 1891.
+        # Queen Beatrix kept Queen Juliana's Birthday after her coronation.
+        # Switched to Aña di Rey in 2014 for King Willem-Alexander.
+        # Have its name changed again to Dia di Rey from 2021 onwards.
+
+        # King's / Queen's Day
+        name = (
+            # King's Day.
+            tr("Dia di Rey")
+            if year >= 2014
+            # Queen's Day.
+            else tr("Dia di la Reina")
+        )
+        if year >= 2014:
+            dt = date(year, APR, 27)
+        else:
+            dt = date(year, APR, 30)
+        if self._is_sunday(dt):
+            dt += td(days=-1) if year >= 1980 else td(days=+1)
+        self._add_holiday(name, dt)
+
+        # Dia di Obrero.
+        # Status: In-Use.
+        # If fall on Sunday, then this will be move to next working day.
+
+        dt = date(year, MAY, 1)
+        if self._is_sunday(dt) or (self._is_monday(dt) and year <= 1979):
+            dt += td(days=+1)
+        # Labor Day
+        self._add_holiday(tr("Dia di Obrero"), dt)
+
+        # Dia di Asenshon.
+        # Status: In-Use.
 
-            if self._is_sunday(queens_day):
-                queens_day += td(days=1) if year < 1980 else td(days=-1)
+        # Ascension Day
+        self._add_ascension_thursday(tr("Dia di Asenshon"))
 
-            self[queens_day] = "Anja di La Reina [Queen's Day]"
+        # Dia di Himno i Bandera.
+        # Status: In-Use.
+        # Starts in 1984.
 
-        # Labour Day
-        labour_day = date(year, MAY, 1)
-        if self._is_sunday(labour_day):
-            labour_day += td(days=+1)
-        self[labour_day] = "Dia di Obrero [Labour Day]"
+        if year >= 1984:
+            # National Anthem and Flag Day
+            self._add_holiday(tr("Dia di Himno i Bandera"), JUL, 2)
 
-        # Ascension Day
-        self[easter_date + td(days=+39)] = "Hemelvaartsdag [Ascension Day]"
+        # Dia di Pais Kòrsou / Dia di autonomia.
+        # Status: In-Use.
+        # Starts in 2010.
 
-        # Dia di Himno y Bandera
-        self[
-            date(year, JUL, 2)
-        ] = "Dia di Himno y Bandera [National Anthem & Flag Day]"
+        if year >= 2010:
+            # Curaçao Day
+            self._add_holiday(tr("Dia di Pais Kòrsou"), OCT, 10)
 
-        # Dia di Pais Kòrsou
-        self[date(year, OCT, 10)] = "Dia di Pais Kòrsou [Curaçao Day]"
+        # Pasku di Nasementu.
+        # Status: In-Use.
 
         # Christmas Day
-        self[date(year, DEC, 25)] = "Kerstdag [Christmas]"
+        self._add_christmas_day(tr("Pasku di Nasementu"))
+
+        # Di dos dia di Pasku di Nasementu.
+        # Status: In-Use.
 
-        # Second Christmas
-        self[date(year, DEC, 26)] = "2de Kerstdag [Second Christmas]"
+        # Second Day of Christmas
+        self._add_christmas_day_two(tr("Di dos dia di Pasku di Nasementu"))
 
 
 class CW(Curacao):

holidays/countries/cyprus.py

@@ -28,6 +28,7 @@ class Cyprus(HolidayBase, ChristianHolidays, InternationalHolidays):
 
     country = "CY"
     default_language = "el"
+    supported_languages = ("el", "en_US")
 
     def __init__(self, *args, **kwargs):
         ChristianHolidays.__init__(self, JULIAN_CALENDAR)
@@ -77,17 +78,13 @@ class Cyprus(HolidayBase, ChristianHolidays, InternationalHolidays):
         self._add_holiday(tr("Ημέρα του Όχι"), OCT, 28)
 
         # Christmas Eve.
-        self._add_christmas_eve(
-            tr("Παραμονή Χριστουγέννων"), GREGORIAN_CALENDAR
-        )
+        self._add_christmas_eve(tr("Παραμονή Χριστουγέννων"), GREGORIAN_CALENDAR)
 
         # Christmas Day.
         self._add_christmas_day(tr("Χριστούγεννα"), GREGORIAN_CALENDAR)
 
         # Day After Christmas.
-        self._add_christmas_day_two(
-            tr("Δεύτερη μέρα Χριστουγέννων"), GREGORIAN_CALENDAR
-        )
+        self._add_christmas_day_two(tr("Δεύτερη μέρα Χριστουγέννων"), GREGORIAN_CALENDAR)
 
 
 class CY(Cyprus):

holidays/countries/czechia.py

@@ -29,9 +29,7 @@ class Czechia(HolidayBase):
         super()._populate(year)
 
         self[date(year, JAN, 1)] = (
-            "Den obnovy samostatného českého" " státu"
-            if year >= 2000
-            else "Nový rok"
+            "Den obnovy samostatného českého státu" if year >= 2000 else "Nový rok"
         )
 
         easter_date = easter(year)
@@ -44,20 +42,14 @@ class Czechia(HolidayBase):
         if year >= 1992:
             self[date(year, MAY, 8)] = "Den vítězství"
         elif year >= 1947:
-            self[date(year, MAY, 9)] = (
-                "Den vítězství nad hitlerovským" " fašismem"
-            )
+            self[date(year, MAY, 9)] = "Den vítězství nad hitlerovským fašismem"
         if year >= 1951:
-            self[date(year, JUL, 5)] = (
-                "Den slovanských věrozvěstů " "Cyrila a Metoděje"
-            )
+            self[date(year, JUL, 5)] = "Den slovanských věrozvěstů Cyrila a Metoděje"
             self[date(year, JUL, 6)] = "Den upálení mistra Jana Husa"
         if year >= 2000:
             self[date(year, SEP, 28)] = "Den české státnosti"
         if year >= 1951:
-            self[date(year, OCT, 28)] = (
-                "Den vzniku samostatného " "československého státu"
-            )
+            self[date(year, OCT, 28)] = "Den vzniku samostatného československého státu"
         if year >= 1990:
             self[date(year, NOV, 17)] = "Den boje za svobodu a demokracii"
 

holidays/countries/denmark.py

@@ -27,6 +27,7 @@ class Denmark(HolidayBase, ChristianHolidays, InternationalHolidays):
 
     country = "DK"
     default_language = "da"
+    supported_languages = ("da", "en_US", "uk")
 
     def __init__(self, *args, **kwargs):
         ChristianHolidays.__init__(self)
@@ -54,9 +55,7 @@ class Denmark(HolidayBase, ChristianHolidays, InternationalHolidays):
         # See https://www.ft.dk/samling/20222/lovforslag/l13/index.htm
         if year <= 2023:
             # Great Day of Prayers.
-            self._add_holiday(
-                tr("Store bededag"), self._easter_sunday + td(days=+26)
-            )
+            self._add_holiday(tr("Store bededag"), self._easter_sunday + td(days=+26))
 
         # Ascension Day.
         self._add_ascension_thursday(tr("Kristi himmelfartsdag"))

holidays/countries/dominican_republic.py

@@ -26,10 +26,9 @@ class DominicanRepublic(HolidayBase, ChristianHolidays, InternationalHolidays):
 
     country = "DO"
     default_language = "es"
+    supported_languages = ("en_US", "es", "uk")
 
-    def _add_movable_holiday(
-        self, name: str, dt: date, include_sun: bool = False
-    ) -> None:
+    def _add_movable_holiday(self, name: str, dt: date, include_sun: bool = False) -> None:
         # Law No. 139-97 - Holidays Dominican Republic - Jun 27, 1997
         if dt >= date(1997, JUN, 27):
             if self._is_tuesday(dt) or self._is_wednesday(dt):

holidays/countries/ecuador.py

@@ -27,19 +27,56 @@ class Ecuador(HolidayBase, ChristianHolidays, InternationalHolidays):
 
     country = "EC"
     default_language = "es"
+    supported_languages = ("en_US", "es", "uk")
 
     def __init__(self, *args, **kwargs):
         ChristianHolidays.__init__(self)
         InternationalHolidays.__init__(self)
         super().__init__(*args, **kwargs)
 
+    def _add_observed(
+        self,
+        dt: date,
+        weekend_only: bool = False,
+        before: bool = True,
+        after: bool = True,
+    ) -> None:
+        if self.observed and self._year >= 2017:
+            obs_date = None
+            # Art. 1 of Law #0 from 20.12.2016
+            # When holidays falls on Tuesday, the rest shall be transferred to
+            # preceding Monday, and if they falls on Wednesday or Thursday,
+            # the rest shall be transferred to Friday of the same week.
+            # Exceptions to this provision are January 1, December 25 and
+            # Shrove Tuesday.
+            if not weekend_only:
+                if self._is_tuesday(dt) and before:
+                    obs_date = dt + td(days=-1)
+                elif self._is_wednesday(dt):
+                    obs_date = dt + td(days=+2)
+                elif self._is_thursday(dt) and after:
+                    obs_date = dt + td(days=+1)
+            # When holidays falls on Saturday or Sunday, the rest shall be
+            # transferred, respectively, to the preceding Friday or the
+            # following Monday.
+            if self._is_saturday(dt) and before:
+                obs_date = dt + td(days=-1)
+            elif self._is_sunday(dt) and after:
+                obs_date = dt + td(days=+1)
+            if obs_date:
+                self._add_holiday(self.tr("%s (Observado)") % self[dt], obs_date)
+
     def _populate(self, year):
         super()._populate(year)
-        observed_dates = set()
-        observed_weekend_dates = set()
 
         # New Year's Day.
-        observed_weekend_dates.add(self._add_new_years_day(tr("Año Nuevo")))
+        name = tr("Año Nuevo")
+        self._add_observed(self._add_new_years_day(name), weekend_only=True)
+
+        if self.observed and year >= 2017:
+            dec_31 = (DEC, 31)
+            if self._is_friday(*dec_31):
+                self._add_holiday(self.tr("%s (Observado)") % self.tr(name), *dec_31)
 
         # Carnival.
         name = tr("Carnaval")
@@ -50,77 +87,41 @@ class Ecuador(HolidayBase, ChristianHolidays, InternationalHolidays):
         self._add_good_friday(tr("Viernes Santo"))
 
         # Labour Day.
-        observed_dates.add(self._add_labor_day(tr("Día del Trabajo")))
+        self._add_observed(self._add_labor_day(tr("Día del Trabajo")))
 
-        observed_dates.add(
+        self._add_observed(
             # The Battle of Pichincha.
             self._add_holiday(tr("Batalla de Pichincha"), MAY, 24)
         )
 
-        observed_dates.add(
+        self._add_observed(
             # Declaration of Independence of Quito.
             self._add_holiday(tr("Primer Grito de Independencia"), AUG, 10)
         )
 
-        observed_dates.add(
+        self._add_observed(
             # Independence of Guayaquil.
             self._add_holiday(tr("Independencia de Guayaquil"), OCT, 9)
         )
 
-        # All Souls' Day.
-        observed_dates.add(self._add_all_souls_day(tr("Día de los Difuntos")))
+        self._add_observed(
+            # All Souls' Day.
+            self._add_all_souls_day(tr("Día de los Difuntos")),
+            after=False,
+        )
 
-        observed_dates.add(
+        self._add_observed(
             # Independence of Cuenca.
-            self._add_holiday(tr("Independencia de Cuenca"), NOV, 3)
+            self._add_holiday(tr("Independencia de Cuenca"), NOV, 3),
+            before=False,
         )
 
-        observed_weekend_dates.add(
+        self._add_observed(
             # Christmas Day.
-            self._add_christmas_day(tr("Día de Navidad"))
+            self._add_christmas_day(tr("Día de Navidad")),
+            weekend_only=True,
         )
 
-        if self.observed and year >= 2017:
-            # Art. 1 of Law #0 from 20.12.2016
-            # When holidays falls on Tuesday, the rest shall be transferred to
-            # preceding Monday, and if they falls on Wednesday or Thursday,
-            # the rest shall be transferred to Friday of the same week.
-            # Exceptions to this provision are January 1, December 25 and
-            # Shrove Tuesday.
-            for dt in observed_dates:
-                obs_date = None
-                if self._is_tuesday(dt):
-                    obs_date = dt + td(days=-1)
-                elif self._is_wednesday(dt):
-                    obs_date = dt + td(days=+2)
-                elif self._is_thursday(dt):
-                    obs_date = dt + td(days=+1)
-                if obs_date and obs_date not in observed_dates:
-                    self._add_holiday(
-                        self.tr("%s (Observado)") % self[dt], obs_date
-                    )
-
-            # When holidays falls on Saturday or Sunday, the rest shall be
-            # transferred, respectively, to the preceding Friday or the
-            # following Monday.
-            observed_dates = observed_dates.union(observed_weekend_dates)
-            for dt in observed_dates:
-                obs_date = None
-                if self._is_saturday(dt):
-                    obs_date = dt + td(days=-1)
-                elif self._is_sunday(dt):
-                    obs_date = dt + td(days=+1)
-                if obs_date and obs_date not in observed_dates:
-                    self._add_holiday(
-                        self.tr("%s (Observado)") % self[dt], obs_date
-                    )
-
-            dec_31 = date(year, DEC, 31)
-            if self._is_friday(dec_31):
-                self._add_holiday(
-                    self.tr("%s (Observado)") % self.tr("Año Nuevo"), dec_31
-                )
-
 
 class EC(Ecuador):
     pass

holidays/countries/egypt.py

@@ -12,13 +12,10 @@
 from holidays.calendars import JULIAN_CALENDAR
 from holidays.constants import JAN, APR, JUN, JUL, OCT
 from holidays.holiday_base import HolidayBase
-from holidays.holiday_groups import ChristianHolidays, IslamicHolidays
-from holidays.holiday_groups import InternationalHolidays
+from holidays.holiday_groups import ChristianHolidays, IslamicHolidays, InternationalHolidays
 
 
-class Egypt(
-    HolidayBase, ChristianHolidays, IslamicHolidays, InternationalHolidays
-):
+class Egypt(HolidayBase, ChristianHolidays, IslamicHolidays, InternationalHolidays):
     # Holidays here are estimates, it is common for the day to be pushed
     # if falls in a weekend, although not a rule that can be implemented.
     # Holidays after 2020: the following four moving date holidays whose exact

holidays/countries/el_salvador.py

@@ -0,0 +1,101 @@
+#  python-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: dr-prodigy <dr.prodigy.github@gmail.com> (c) 2017-2023
+#           ryanss <ryanssdev@icloud.com> (c) 2014-2017
+#  Website: https://github.com/dr-prodigy/python-holidays
+#  License: MIT (see LICENSE file)
+
+from holidays.constants import MAY, JUN, AUG, SEP
+from holidays.holiday_base import HolidayBase
+from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
+
+
+class ElSalvador(HolidayBase, ChristianHolidays, InternationalHolidays):
+    """
+    References:
+    - https://www.transparencia.gob.sv/institutions/gd-usulutan/documents/192280/download   # noqa: E501
+    - https://www.timeanddate.com/holidays/el-salvador
+    - https://www.officeholidays.com/countries/el-salvador
+    """
+
+    country = "SV"
+    subdivisions = (
+        "AH",  # Ahuachapán
+        "CA",  # Cabañas
+        "CH",  # Chalatenango
+        "CU",  # Cuscatlán
+        "LI",  # La Libertad
+        "MO",  # Morazán
+        "PA",  # La Paz
+        "SA",  # Santa Ana
+        "SM",  # San Miguel
+        "SO",  # Sonsonate
+        "SS",  # San Salvador
+        "SV",  # San Vicente
+        "UN",  # La Unión
+        "US",  # Usulután
+    )
+
+    def __init__(self, *args, **kwargs):
+        ChristianHolidays.__init__(self)
+        InternationalHolidays.__init__(self)
+        super().__init__(*args, **kwargs)
+
+    def _populate(self, year):
+        super()._populate(year)
+
+        # New Year's Day.
+        self._add_new_years_day("New Year's Day")
+
+        # Maundy Thursday.
+        self._add_holy_thursday("Maundy Thursday")
+
+        # Good Friday.
+        self._add_good_friday("Good Friday")
+
+        # Holy Saturday.
+        self._add_holy_saturday("Holy Saturday")
+
+        # Labor Day.
+        self._add_labor_day("Labor Day")
+
+        if year >= 2016:
+            # Legislative Decree #399 from Apr 14, 2016
+            # Mothers' Day.
+            self._add_holiday("Mothers' Day", MAY, 10)
+
+        if year >= 2013:
+            # Legislative Decree #208 from Jun 17, 2012
+            # Fathers' Day.
+            self._add_holiday("Fathers' Day", JUN, 17)
+
+        # Feast of San Salvador.
+        self._add_holiday("Feast of San Salvador", AUG, 6)
+
+        # Independence Day.
+        self._add_holiday("Independence Day", SEP, 15)
+
+        # All Souls' Day.
+        self._add_all_souls_day("All Souls' Day")
+
+        # Christmas Day.
+        self._add_christmas_day("Christmas Day")
+
+    def _add_subdiv_ss_holidays(self):
+        # San Salvador Day 1.
+        self._add_holiday("San Salvador Day 1", AUG, 3)
+
+        # San Salvador Day 2.
+        self._add_holiday("San Salvador Day 2", AUG, 5)
+
+
+class SV(ElSalvador):
+    pass
+
+
+class SLV(ElSalvador):
+    pass

holidays/countries/eswatini.py

@@ -13,13 +13,12 @@ import warnings
 from datetime import date
 from datetime import timedelta as td
 
-from dateutil.easter import easter
-
-from holidays.constants import JAN, APR, MAY, JUL, SEP, DEC
+from holidays.constants import JAN, APR, JUL, SEP, DEC
 from holidays.holiday_base import HolidayBase
+from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
 
 
-class Eswatini(HolidayBase):
+class Eswatini(HolidayBase, ChristianHolidays, InternationalHolidays):
     """
     https://swazilii.org/sz/legislation/act/1938/71
     https://www.officeholidays.com/countries/swaziland
@@ -28,63 +27,54 @@ class Eswatini(HolidayBase):
     country = "SZ"
     special_holidays = {
         # https://mg.co.za/article/1999-12-09-swaziland-declares-bank-holidays/
-        1999: ((DEC, 31, "Y2K changeover"),),
-        2000: ((JAN, 3, "Y2K changeover"),),
+        1999: (DEC, 31, "Y2K changeover"),
+        2000: (JAN, 3, "Y2K changeover"),
     }
 
-    def _populate(self, year):
-        def _add_with_observed(
-            hol_date: date, hol_name: str, days: int = +1
-        ) -> None:
-            # As of 2021/1/1, whenever a public holiday falls on a Sunday
-            # it rolls over to the following Monday
-            self[hol_date] = hol_name
-            if self.observed and self._is_sunday(hol_date) and year >= 2021:
-                self[hol_date + td(days=days)] = f"{hol_name} (Observed)"
+    def __init__(self, *args, **kwargs):
+        ChristianHolidays.__init__(self)
+        InternationalHolidays.__init__(self)
+        super().__init__(*args, **kwargs)
 
+    def _add_observed(self, dt: date, days: int = +1) -> None:
+        # As of 2021/1/1, whenever a public holiday falls on a Sunday
+        # it rolls over to the following Monday
+        if self.observed and self._is_sunday(dt) and self._year >= 2021:
+            self._add_holiday("%s (Observed)" % self[dt], dt + td(days=days))
+
+    def _populate(self, year):
         # Observed since 1939
         if year <= 1938:
             return None
 
         super()._populate(year)
 
-        _add_with_observed(date(year, JAN, 1), "New Year's Day")
+        self._add_observed(self._add_new_years_day("New Year's Day"))
 
-        easter_date = easter(year)
-        self[easter_date + td(days=-2)] = "Good Friday"
-        self[easter_date + td(days=+1)] = "Easter Monday"
-        self[easter_date + td(days=+39)] = "Ascension Day"
+        self._add_good_friday("Good Friday")
+
+        self._add_easter_monday("Easter Monday")
+
+        self._add_ascension_thursday("Ascension Day")
 
         if year >= 1987:
-            # https://www.officeholidays.com/holidays/swaziland/birthday-of-king-mswati-iii
-            # In 2071, 2076, 2082 Apr 20 is Easter Monday,
-            # so observed on Apr 21 (Tue)
-            _add_with_observed(
-                date(year, APR, 19),
-                "King's Birthday",
-                +2 if year in {2071, 2076, 2082} else +1,
-            )
+            apr_19 = self._add_holiday("King's Birthday", APR, 19)
+            self._add_observed(apr_19, days=+2 if apr_19 == self._easter_sunday else +1)
 
         if year >= 1969:
-            # In 2038 Apr 26 is Easter Monday,
-            # so observed on Apr 27 (Tue)
-            _add_with_observed(
-                date(year, APR, 25),
-                "National Flag Day",
-                +2 if year == 2038 else +1,
-            )
+            apr_25 = self._add_holiday("National Flag Day", APR, 25)
+            self._add_observed(apr_25, days=+2 if apr_25 == self._easter_sunday else +1)
 
-        _add_with_observed(date(year, MAY, 1), "Worker's Day")
+        self._add_observed(self._add_labor_day("Worker's Day"))
 
         if year >= 1983:
-            # https://www.officeholidays.com/holidays/swaziland/birthday-of-late-king-sobhuza
-            _add_with_observed(
-                date(year, JUL, 22), "Birthday of Late King Sobhuza"
-            )
-
-        _add_with_observed(date(year, SEP, 6), "Independence Day")
-        _add_with_observed(date(year, DEC, 25), "Christmas Day", days=+2)
-        _add_with_observed(date(year, DEC, 26), "Boxing Day")
+            self._add_observed(self._add_holiday("Birthday of Late King Sobhuza", JUL, 22))
+
+        self._add_observed(self._add_holiday("Independence Day", SEP, 6))
+
+        self._add_observed(self._add_christmas_day("Christmas Day"), days=+2)
+
+        self._add_observed(self._add_christmas_day_two("Boxing Day"))
 
 
 class Swaziland(Eswatini):