holidays 0.81__py3-none-any.whl → 0.83__py3-none-any.whl

holidays/countries/paraguay.py

@@ -12,7 +12,7 @@
 
 from gettext import gettext as tr
 
-from holidays.calendars.gregorian import JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP, OCT, DEC
+from holidays.calendars.gregorian import JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP, OCT, DEC, SUN
 from holidays.constants import GOVERNMENT, PUBLIC
 from holidays.groups import ChristianHolidays, InternationalHolidays, StaticHolidays
 from holidays.holiday_base import HolidayBase
@@ -28,7 +28,9 @@ class Paraguay(HolidayBase, ChristianHolidays, InternationalHolidays, StaticHoli
         * [Ley 1.723/2001](https://web.archive.org/web/20250427173914/https://www.bacn.gov.py/leyes-paraguayas/634/ley-n-1723--autoriza-al-poder-ejecutivo-a-trasladar-los-feriados-nacionales-al-dia-lunes)
         * [Ley 4.531/2011](https://web.archive.org/web/20250420210317/https://www.bacn.gov.py/leyes-paraguayas/3831/ley-n-4531-restablece-el-dia-14-de-mayo-de-cada-ano-como-feriado-nacional)
         * <https://es.wikipedia.org/wiki/Anexo:Días_festivos_en_Paraguay>
-        * <https://web.archive.org/web/20250427131220/https://www.calendarioparaguay.com/>
+        * <https://web.archive.org/web/20131212214628/https://www.abc.com.py/nacionales/feriados-de-2013-se-trasladaran-al-dia-lunes-494705.html>
+        * <https://web.archive.org/web/20241207131557/https://www.ultimahora.com/establecen-traslados-feriados-el-2017-n1042098>
+        * <https://web.archive.org/web/20250913135012/https://foco.lanacion.com.py/2025/01/01/feriados-2025-paraguay-tendra-6-fines-de-semana-largos/>
     """
 
     country = "PY"
@@ -37,6 +39,7 @@ class Paraguay(HolidayBase, ChristianHolidays, InternationalHolidays, StaticHoli
     supported_languages = ("en_US", "es", "uk")
     # Ley 8/1990.
     start_year = 1991
+    weekend = {SUN}
 
     def __init__(self, *args, **kwargs):
         ChristianHolidays.__init__(self)
@@ -51,10 +54,12 @@ class Paraguay(HolidayBase, ChristianHolidays, InternationalHolidays, StaticHoli
         dates_obs = {
             2013: (MAR, 4),
             2016: (FEB, 29),
+            2017: (FEB, 27),
             2018: (FEB, 26),
             2019: (MAR, 4),
             2022: (FEB, 28),
             2023: (FEB, 27),
+            2025: (MAR, 3),
         }
         self._add_holiday(
             # Patriots Day.
@@ -82,16 +87,23 @@ class Paraguay(HolidayBase, ChristianHolidays, InternationalHolidays, StaticHoli
         self._add_holiday_may_15(tr("Día de la Independencia Nacional"))
 
         dates_obs = {
+            2013: (JUN, 10),
             2014: (JUN, 16),
             2018: (JUN, 11),
             2019: (JUN, 17),
             2024: (JUN, 10),
+            2025: (JUN, 16),
         }
         # Chaco Armistice Day.
         self._add_holiday(tr("Día de la Paz del Chaco"), dates_obs.get(self._year, (JUN, 12)))
 
         # Asuncion Foundation's Day.
-        self._add_holiday_aug_15(tr("Día de la Fundación de Asunción"))
+        name = tr("Día de la Fundación de Asunción")
+        # Decreto N° 6292.
+        if self._year == 2017:
+            self._add_holiday_aug_14(name)
+        else:
+            self._add_holiday_aug_15(name)
 
         # Ley 715/1995, 1.601/2000.
         if self._year >= 1995:
@@ -125,31 +137,43 @@ class PRY(Paraguay):
 
 
 class ParaguayStaticHolidays:
+    """Paraguay special holidays.
+
+    References:
+        * <https://web.archive.org/web/20250917075450/https://www.pgr.gov.py/wp-content/uploads/2013/12/DECRETO-991-ASUETO-EL-24-Y-EL-31-DE-DICIEMBRE.pdf>
+        * <https://web.archive.org/web/20250917074759/https://www.ultimahora.com/ejecutivo-declara-asueto-el-23-y-30-diciembre-sector-publico-n3040041>
+        * <https://web.archive.org/web/20231003173505/https://www.lanacion.com.py/politica/2023/03/24/decretan-asueto-de-funcionarios-publicos-el-miercoles-5-de-abril-por-semana-santa/>
+        * <https://web.archive.org/web/20250917042124/https://informacionpublica.paraguay.gov.py/public/1046579-RESPUESTAAIPN79397pdf-RESPUESTAAIPN79397.pdf>
+        * <https://web.archive.org/web/20250416092842/https://www.radionacional.gov.py/2024/03/22/ejecutivo-declara-asueto-el-miercoles-27-de-marzo-para-funcionarios-publicos/>
+        * <https://web.archive.org/web/20241225185947/https://www.abc.com.py/politica/2024/12/20/declaran-asueto-para-funcionarios-publicos-el-24-y-31-de-diciembre/>
+        * <https://web.archive.org/web/20250917075032/https://portal.ips.gov.py/sistemas/ipsportal/archivos/archivos/1744391513.pdf>
+    """
+
     # Public holiday.
-    public_holiday = tr("Asueto adicionale")
+    public_holiday = tr("Asueto adicional")
     # Public sector holiday.
     public_sector_holiday = tr("Asueto de la Administración Pública")
 
     special_public_holidays = {
-        # public holiday for business purposes, in view of the recently increased risk
+        # Public holiday for business purposes, in view of the recently increased risk
         # of Dengue fever.
         2007: (JAN, 29, public_holiday),
-        # public sector holiday to celebrate Paraguay's football team's qualification
+        # Public sector holiday to celebrate Paraguay's football team's qualification
         # for the 2010 World Cup.
         2009: (SEP, 10, public_holiday),
-        # public holiday to coincide with the Paraguay-Italy game of the current World Cup.
+        # Public holiday to coincide with the Paraguay-Italy game of the current World Cup.
         2010: (JUN, 14, public_holiday),
         2011: (
-            # public holiday to coincide with the current anti-Dengue drive.
+            # Public holiday to coincide with the current anti-Dengue drive.
             (APR, 19, public_holiday),
-            # public holidays to commemorate the Bicentennial of Paraguay's independence.
+            # Public holidays to commemorate the Bicentennial of Paraguay's independence.
             (MAY, 14, public_holiday),
             (MAY, 16, public_holiday),
         ),
-        # date of the inauguration of President-elect Horacio Cartes.
+        # Date of the inauguration of President-elect Horacio Cartes.
         2013: (AUG, 14, public_holiday),
         2015: (
-            # public holidays in Paraguay on account of the upcoming visit of Pope Francis
+            # Public holidays in Paraguay on account of the upcoming visit of Pope Francis
             # in Paraguay.
             (JUL, 10, public_holiday),
             (JUL, 11, public_holiday),
@@ -163,38 +187,43 @@ class ParaguayStaticHolidays:
             (DEC, 31, public_sector_holiday),
         ),
         2011: (
-            # public sector holiday to let civil servants begin their Holy Week earlier.
+            # Public sector holiday to let civil servants begin their Holy Week earlier.
             (APR, 20, public_sector_holiday),
             # 2 year-end public sector holidays.
             (DEC, 23, public_sector_holiday),
             (DEC, 30, public_sector_holiday),
         ),
         2012: (
-            # public sector holiday to let civil servants begin their Holy Week earlier.
+            # Public sector holiday to let civil servants begin their Holy Week earlier.
             (APR, 4, public_sector_holiday),
             # 2 year-end public sector holidays.
             (DEC, 24, public_sector_holiday),
             (DEC, 31, public_sector_holiday),
         ),
-        # public sector holiday to let civil servants begin their Holy Week earlier.
-        2013: (MAR, 27, public_sector_holiday),
+        2013: (
+            # Public sector holiday to let civil servants begin their Holy Week earlier.
+            (MAR, 27, public_sector_holiday),
+            # 2 year-end public sector holidays.
+            (DEC, 24, public_sector_holiday),
+            (DEC, 31, public_sector_holiday),
+        ),
         2014: (
-            # public sector holiday to let civil servants begin their Holy Week earlier.
+            # Public sector holiday to let civil servants begin their Holy Week earlier.
             (APR, 16, public_sector_holiday),
             # 2 year-end public sector holidays.
             (DEC, 24, public_sector_holiday),
             (DEC, 31, public_sector_holiday),
         ),
         2015: (
-            # public sector holiday to let civil servants begin their Holy Week earlier.
+            # Public sector holiday to let civil servants begin their Holy Week earlier.
             (APR, 1, public_sector_holiday),
             # 2 year-end public sector holidays.
             (DEC, 24, public_sector_holiday),
             (DEC, 31, public_sector_holiday),
         ),
-        # public sector holiday to let civil servants begin their Holy Week earlier.
+        # Public sector holiday to let civil servants begin their Holy Week earlier.
         2016: (MAR, 23, public_sector_holiday),
-        # public sector holiday to let civil servants begin their Holy Week earlier.
+        # Public sector holiday to let civil servants begin their Holy Week earlier.
         2017: (MAR, 28, public_sector_holiday),
         2018: (
             # 2 year-end public sector holidays.
@@ -202,13 +231,13 @@ class ParaguayStaticHolidays:
             (DEC, 31, public_sector_holiday),
         ),
         2019: (
-            # public sector holiday to let civil servants begin their Holy Week earlier.
+            # Public sector holiday to let civil servants begin their Holy Week earlier.
             (APR, 17, public_sector_holiday),
             # 2 year-end public sector holidays.
             (DEC, 24, public_sector_holiday),
             (DEC, 31, public_sector_holiday),
         ),
-        # public sector holiday to let civil servants begin their Holy Week earlier.
+        # Public sector holiday to let civil servants begin their Holy Week earlier.
         2020: (APR, 8, public_sector_holiday),
         2021: (
             # 2 year-end public sector holidays.
@@ -216,9 +245,27 @@ class ParaguayStaticHolidays:
             (DEC, 31, public_sector_holiday),
         ),
         2022: (
-            # public sector holiday to let civil servants begin their Holy Week earlier.
+            # Public sector holiday to let civil servants begin their Holy Week earlier.
             (APR, 13, public_sector_holiday),
-            # public sector holiday due to the annual May 1st public holiday falling on a Sunday.
+            # Public sector holiday due to the annual May 1st public holiday falling on a Sunday.
             (MAY, 2, public_sector_holiday),
+            # 2 year-end public sector holidays.
+            (DEC, 23, public_sector_holiday),
+            (DEC, 30, public_sector_holiday),
+        ),
+        2023: (
+            # Public sector holiday to let civil servants begin their Holy Week earlier.
+            (APR, 5, public_sector_holiday),
+            # Public sector holiday from resolution no. 1045.
+            (DEC, 7, public_sector_holiday),
+        ),
+        2024: (
+            # Public sector holiday to let civil servants begin their Holy Week earlier.
+            (MAR, 27, public_sector_holiday),
+            # 2 year-end public sector holidays.
+            (DEC, 24, public_sector_holiday),
+            (DEC, 31, public_sector_holiday),
         ),
+        # Public sector holiday to let civil servants begin their Holy Week earlier.
+        2025: (APR, 16, public_sector_holiday),
     }

holidays/countries/portugal.py

@@ -129,15 +129,14 @@ class Portugal(HolidayBase, ChristianHolidays, InternationalHolidays):
         if self._year >= 1911:
             if 1933 <= self._year <= 1973:
                 # Day of Camões, Portugal, and the Portuguese Race.
-                self._add_holiday_jun_10(tr("Dia de Camões, de Portugal e da Raça"))
+                name = tr("Dia de Camões, de Portugal e da Raça")
             elif self._year >= 1978:
-                self._add_holiday_jun_10(
-                    # Day of Portugal, Camões, and the Portuguese Communities.
-                    tr("Dia de Portugal, de Camões e das Comunidades Portuguesas")
-                )
+                # Day of Portugal, Camões, and the Portuguese Communities.
+                name = tr("Dia de Portugal, de Camões e das Comunidades Portuguesas")
             else:
                 # Portugal Day.
-                self._add_holiday_jun_10(tr("Dia de Portugal"))
+                name = tr("Dia de Portugal")
+            self._add_holiday_jun_10(name)
 
         # Assumption Day.
         self._add_assumption_of_mary_day(tr("Assunção de Nossa Senhora"))

holidays/countries/qatar.py

@@ -10,6 +10,7 @@
 #  Website: https://github.com/vacanza/holidays
 #  License: MIT (see LICENSE file)
 
+from datetime import date
 from gettext import gettext as tr
 
 from holidays.calendars import _CustomIslamicHolidays
@@ -36,6 +37,7 @@ class Qatar(HolidayBase, InternationalHolidays, IslamicHolidays, StaticHolidays)
     start_year = 1971
     supported_categories = (BANK, PUBLIC)
     supported_languages = ("ar_QA", "en_US")
+    weekend = {FRI, SAT}
 
     def __init__(self, *args, islamic_show_estimated: bool = True, **kwargs):
         """
@@ -51,10 +53,11 @@ class Qatar(HolidayBase, InternationalHolidays, IslamicHolidays, StaticHolidays)
         StaticHolidays.__init__(self, QatarStaticHolidays)
         super().__init__(*args, **kwargs)
 
-    def _populate_public_holidays(self):
+    def _get_weekend(self, dt: date) -> set[int]:
         # Qatar switches from THU-FRI to FRI-SAT on Aug 1, 2003.
-        self.weekend = {THU, FRI} if self._year <= 2003 else {FRI, SAT}
+        return {FRI, SAT} if dt >= date(2003, AUG, 1) else {THU, FRI}
 
+    def _populate_public_holidays(self):
         if self._year >= 2012:
             # National Sports Day.
             self._add_holiday_2nd_tue_of_feb(tr("اليوم الوطني للرياضة"))

holidays/countries/rwanda.py

@@ -10,8 +10,10 @@
 #  Website: https://github.com/vacanza/holidays
 #  License: MIT (see LICENSE file)
 
-from datetime import date
+from __future__ import annotations
+
 from gettext import gettext as tr
+from typing import TYPE_CHECKING
 
 from holidays.calendars import _CustomIslamicHolidays
 from holidays.calendars.gregorian import MAR, JUN, JUL, AUG
@@ -22,6 +24,9 @@ from holidays.observed_holiday_base import (
     SAT_SUN_TO_NEXT_WORKDAY,
 )
 
+if TYPE_CHECKING:
+    from datetime import date
+
 
 class Rwanda(ObservedHolidayBase, ChristianHolidays, InternationalHolidays, IslamicHolidays):
     """Rwanda holidays.
@@ -55,7 +60,7 @@ class Rwanda(ObservedHolidayBase, ChristianHolidays, InternationalHolidays, Isla
         kwargs.setdefault("observed_since", 2017)
         super().__init__(*args, **kwargs)
 
-    def _populate_observed(self, dts: set[date], multiple: bool = False) -> None:
+    def _populate_observed(self, dts: set[date], *, multiple: bool = False) -> None:
         """
         Applies `SAT_TO_NEXT_WORKDAY` instead of `SAT_SUN_TO_NEXT_WORKDAY`
         observed_rule for Day after New Year's Day and Boxing Day.
@@ -71,7 +76,7 @@ class Rwanda(ObservedHolidayBase, ChristianHolidays, InternationalHolidays, Isla
                 self._add_observed(
                     dt,
                     name,
-                    SAT_TO_NEXT_WORKDAY if name in special_cases else SAT_SUN_TO_NEXT_WORKDAY,
+                    rule=SAT_TO_NEXT_WORKDAY if name in special_cases else SAT_SUN_TO_NEXT_WORKDAY,
                 )
 
     def _populate_public_holidays(self):

holidays/countries/saudi_arabia.py

@@ -14,7 +14,7 @@ from datetime import date
 from gettext import gettext as tr
 
 from holidays.calendars import _CustomIslamicHolidays
-from holidays.calendars.gregorian import SEP, NOV, THU, FRI, SAT, _timedelta
+from holidays.calendars.gregorian import JUN, SEP, NOV, THU, FRI, SAT, _timedelta
 from holidays.groups import IslamicHolidays, StaticHolidays
 from holidays.observed_holiday_base import (
     ObservedHolidayBase,
@@ -46,6 +46,7 @@ class SaudiArabia(ObservedHolidayBase, IslamicHolidays, StaticHolidays):
     # %s (observed, estimated).
     observed_estimated_label = tr("%s (المقدرة، ملاحظة)")
     supported_languages = ("ar", "en_US")
+    weekend = {FRI, SAT}
 
     def __init__(self, *args, islamic_show_estimated: bool = False, **kwargs):
         """Saudi Arabia has traditionally used the Umm al-Qura calendar
@@ -71,16 +72,16 @@ class SaudiArabia(ObservedHolidayBase, IslamicHolidays, StaticHolidays):
         for i in range(4):
             self._add_observed(_timedelta(dt, -i), name=self[dt], rule=observed_rule)
 
-    def _populate_public_holidays(self):
+    def _get_weekend(self, dt: date) -> set[int]:
         # Weekend used to be THU, FRI before June 28th, 2013.
-        # On that year both Eids were after that date, and Founding day
-        # holiday started at 2022; so what below works.
+        return {FRI, SAT} if dt >= date(2013, JUN, 28) else {THU, FRI}
+
+    def _populate_public_holidays(self):
         self._observed_rule = (
             THU_TO_PREV_WED + FRI_TO_NEXT_SAT
             if self._year <= 2012
             else FRI_TO_PREV_THU + SAT_TO_NEXT_SUN
         )
-        self.weekend = {THU, FRI} if self._year <= 2012 else {FRI, SAT}
 
         # Eid al-Fitr Holiday.
         eid_al_fitr_name = tr("عطلة عيد الفطر")

holidays/countries/serbia.py

@@ -28,6 +28,8 @@ class Serbia(ObservedHolidayBase, ChristianHolidays, InternationalHolidays):
     default_language = "sr"
     # %s (observed).
     observed_label = tr("%s (слободан дан)")
+    # Independence Restored on June 5th, 2006.
+    start_year = 2007
     supported_languages = ("en_US", "sr")
 
     def __init__(self, *args, **kwargs):
@@ -64,10 +66,13 @@ class Serbia(ObservedHolidayBase, ChristianHolidays, InternationalHolidays):
 
         # Good Friday.
         self._add_good_friday(tr("Велики петак"))
+
         # Holy Saturday.
         self._add_holy_saturday(tr("Велика субота"))
+
         # Easter Sunday.
         self._add_easter_sunday(tr("Васкрс"))
+
         # Easter Monday.
         self._add_easter_monday(tr("Други дан Васкрса"))
 

holidays/countries/slovakia.py

@@ -25,6 +25,9 @@ class Slovakia(HolidayBase, ChristianHolidays, InternationalHolidays, StaticHoli
         * <https://en.wikipedia.org/wiki/Public_holidays_in_Slovakia>
         * <https://sk.wikipedia.org/wiki/Zoznam_sviatkov_na_Slovensku>
         * <https://web.archive.org/web/20250413192257/https://www.slov-lex.sk/pravne-predpisy/SK/ZZ/1993/241/>
+        * [Law 326/2020](https://web.archive.org/web/20250713005858/https://static.slov-lex.sk/static/SK/ZZ/2020/326/20210101.html)
+        * [Law 530/2023](https://web.archive.org/web/20250424165411/https://static.slov-lex.sk/static/SK/ZZ/2023/530/20240101.html)
+        * [Law 261/2025](https://web.archive.org/web/20251014224441/https://static.slov-lex.sk/static/SK/ZZ/2025/261/20251101.html)
     """
 
     country = "SK"
@@ -58,7 +61,7 @@ class Slovakia(HolidayBase, ChristianHolidays, InternationalHolidays, StaticHoli
         # Labor Day.
         self._add_labor_day(tr("Sviatok práce"))
 
-        if self._year >= 1997:
+        if self._year >= 1997 and self._year != 2026:
             # Day of Victory over Fascism.
             self._add_world_war_two_victory_day(tr("Deň víťazstva nad fašizmom"))
 
@@ -72,13 +75,14 @@ class Slovakia(HolidayBase, ChristianHolidays, InternationalHolidays, StaticHoli
             # Constitution Day.
             self._add_holiday_sep_1(tr("Deň Ústavy Slovenskej republiky"))
 
-        # Day of Our Lady of the Seven Sorrows.
-        self._add_holiday_sep_15(tr("Sedembolestná Panna Mária"))
+        if self._year != 2026:
+            # Day of Our Lady of the Seven Sorrows.
+            self._add_holiday_sep_15(tr("Sedembolestná Panna Mária"))
 
         # All Saints' Day.
         self._add_all_saints_day(tr("Sviatok Všetkých svätých"))
 
-        if self._year >= 2001:
+        if 2001 <= self._year <= 2024:
             # Struggle for Freedom and Democracy Day.
             self._add_holiday_nov_17(tr("Deň boja za slobodu a demokraciu"))
 
@@ -94,14 +98,29 @@ class Slovakia(HolidayBase, ChristianHolidays, InternationalHolidays, StaticHoli
     def _populate_workday_holidays(self):
         # According to Law 241/1993, these state holidays are not non-working days.
 
+        # Law 261/2025.
+        if self._year == 2026:
+            # Day of Victory over Fascism.
+            self._add_world_war_two_victory_day(tr("Deň víťazstva nad fašizmom"))
+
+            # Day of Our Lady of the Seven Sorrows.
+            self._add_holiday_sep_15(tr("Sedembolestná Panna Mária"))
+
+        # Law 530/2023.
         if self._year >= 2024:
             # Constitution Day.
             self._add_holiday_sep_1(tr("Deň Ústavy Slovenskej republiky"))
 
+        # Law 326/2020.
         if self._year >= 2021:
             # Day of the Establishment of the Independent Czech-Slovak State.
             self._add_holiday_oct_28(tr("Deň vzniku samostatného česko-slovenského štátu"))
 
+        # Law 261/2025.
+        if self._year >= 2025:
+            # Struggle for Freedom and Democracy Day.
+            self._add_holiday_nov_17(tr("Deň boja za slobodu a demokraciu"))
+
 
 class SK(Slovakia):
     pass

holidays/countries/south_africa.py

@@ -20,15 +20,18 @@ class SouthAfrica(ObservedHolidayBase, ChristianHolidays, InternationalHolidays,
 
     References:
         * <https://web.archive.org/web/20250424073852/https://www.gov.za/about-sa/public-holidays>
+        * [Act No. 36, 1994](https://web.archive.org/web/20250914045710/https://www.gov.za/sites/default/files/gcis_document/201409/act36of1994.pdf)
+        * <https://web.archive.org/web/20250914050022/https://www.ancestors.co.za/origins-of-public-holidays-in-south-africa/>
         * <https://en.wikipedia.org/wiki/Public_holidays_in_South_Africa>
         * <https://web.archive.org/web/20240715110800/https://www.gov.za/speeches/president-cyril-ramaphosa-progress-economic-recovery-30-oct-2023-0000>
         * <https://web.archive.org/web/20250427184315/https://www.gov.za/documents/notices/public-holidays-act-declaration-29-may-2024-public-holiday-23-feb-2024>
     """
 
     country = "ZA"
+    # %s (observed).
     observed_label = "%s (observed)"
-    # Observed since 1910, with a few name changes
-    start_year = 1910
+    # Public Holidays Act (No. 3 of 1910) came in effect on January 1st, 1911.
+    start_year = 1911
 
     def __init__(self, *args, **kwargs):
         ChristianHolidays.__init__(self)
@@ -39,75 +42,113 @@ class SouthAfrica(ObservedHolidayBase, ChristianHolidays, InternationalHolidays,
         super().__init__(*args, **kwargs)
 
     def _populate_public_holidays(self):
+        # New Year's Day.
         self._add_observed(self._add_new_years_day("New Year's Day"))
 
+        if 1980 <= self._year <= 1994:
+            # Founder's Day.
+            self._add_holiday_apr_6("Founder's Day")
+        elif 1952 <= self._year <= 1973:
+            # Van Riebeeck's Day.
+            self._add_holiday_apr_6("Van Riebeeck's Day")
+
+        # Good Friday.
         self._add_good_friday("Good Friday")
 
-        self._add_easter_monday("Family Day" if self._year >= 1980 else "Easter Monday")
+        if self._year <= 1979:
+            # Easter Monday.
+            self._add_easter_monday("Easter Monday")
 
-        if self._year <= 1951:
-            name = "Dingaan's Day"
-        elif self._year <= 1979:
-            name = "Day of the Covenant"
-        elif self._year <= 1994:
-            name = "Day of the Vow"
-        else:
-            name = "Day of Reconciliation"
-        self._add_observed(self._add_holiday_dec_16(name))
+        # Family Day.
+        name = "Family Day"
+        if self._year >= 1980:
+            self._add_easter_monday(name)
+        elif 1961 <= self._year <= 1973:
+            self._add_holiday_jul_10(name)
 
-        self._add_christmas_day("Christmas Day")
-
-        self._add_observed(
-            self._add_christmas_day_two("Day of Goodwill" if self._year >= 1980 else "Boxing Day")
-        )
+        # Workers' Day.
+        name = "Workers' Day"
+        if self._year >= 1995:
+            self._add_observed(self._add_labor_day(name))
+        elif 1987 <= self._year <= 1989:
+            self._add_holiday_1st_fri_of_may(name)
 
         if self._year >= 1995:
+            # Human Rights Day.
             self._add_observed(self._add_holiday_mar_21("Human Rights Day"))
 
+            # Freedom Day.
             self._add_observed(self._add_holiday_apr_27("Freedom Day"))
 
-            self._add_observed(self._add_labor_day("Workers' Day"))
-
+            # Youth Day.
             self._add_observed(self._add_holiday_jun_16("Youth Day"))
 
+            # National Women's Day.
             self._add_observed(self._add_holiday_aug_9("National Women's Day"))
 
+            # Heritage Day.
             self._add_observed(self._add_holiday_sep_24("Heritage Day"))
-
-        # Historic public holidays no longer observed
-        if 1952 <= self._year <= 1973:
-            self._add_holiday_apr_6("Van Riebeeck's Day")
-        elif 1980 <= self._year <= 1994:
-            self._add_holiday_apr_6("Founder's Day")
-
-        if 1987 <= self._year <= 1989:
-            self._add_holiday_1st_fri_of_may("Workers' Day")
-
-        if self._year <= 1993:
+        elif self._year <= 1993:
+            self._add_holiday_may_31(
+                # Republic Day.
+                "Republic Day"
+                if self._year >= 1961
+                # Union Day.
+                else "Union Day"
+            )
+
+            # Ascension Day.
             self._add_ascension_thursday("Ascension Day")
 
-        if self._year <= 1951:
-            self._add_holiday_may_24("Empire Day")
+            if self._year >= 1952:
+                # Kruger Day.
+                self._add_holiday_oct_10("Kruger Day")
 
-        if self._year <= 1960:
-            self._add_holiday_may_31("Union Day")
-        elif self._year <= 1993:
-            self._add_holiday_may_31("Republic Day")
+        if self._year >= 1952:
+            if self._year <= 1960:
+                # Queen's Birthday.
+                self._add_holiday_2nd_mon_of_jul("Queen's Birthday")
 
-        if 1952 <= self._year <= 1960:
-            self._add_holiday_2nd_mon_of_jul("Queen's Birthday")
+            if self._year <= 1979:
+                # Settlers' Day.
+                self._add_holiday_1st_mon_of_sep("Settlers' Day")
+        else:
+            # According to our sources, Act No. 3 of 1910 supposedly uses the term "Victoria Day"
+            # but as we can't find the original document and that Empire Day was supposed
+            # instituted empire-wide circa 1904 - we'll stick with its latter name for now.
 
-        if 1961 <= self._year <= 1973:
-            self._add_holiday_jul_10("Family Day")
+            # Empire Day.
+            self._add_holiday_may_24("Empire Day")
 
-        if self._year <= 1951:
+            # King's Birthday.
             self._add_holiday_1st_mon_of_aug("King's Birthday")
 
-        if 1952 <= self._year <= 1979:
-            self._add_holiday_1st_mon_of_sep("Settlers' Day")
+        if self._year >= 1995:
+            # Day of Reconciliation.
+            name = "Day of Reconciliation"
+        elif self._year >= 1980:
+            # Day of the Vow.
+            name = "Day of the Vow"
+        elif self._year >= 1952:
+            # Day of the Covenant.
+            name = "Day of the Covenant"
+        else:
+            # Dingaan's Day.
+            name = "Dingaan's Day"
+        self._add_observed(self._add_holiday_dec_16(name))
+
+        # Christmas Day.
+        self._add_christmas_day("Christmas Day")
 
-        if 1952 <= self._year <= 1993:
-            self._add_holiday_oct_10("Kruger Day")
+        self._add_observed(
+            self._add_christmas_day_two(
+                # Day of Goodwill.
+                "Day of Goodwill"
+                if self._year >= 1980
+                # Boxing Day.
+                else "Boxing Day"
+            )
+        )
 
 
 class ZA(SouthAfrica):
@@ -119,11 +160,14 @@ class ZAF(SouthAfrica):
 
 
 class SouthAfricaStaticHolidays:
-    local_elections = "Local government elections"
-    municipal_elections = "Municipal elections"
-    national_and_provincial_elections = "National and provincial government elections"
-    presidential_decree_holiday = "Public holiday by presidential decree"
-    y2k_changeover = "Y2K changeover"
+    # Local Government Elections.
+    local_elections = "Local Government Elections"
+    # National and Provincial Government Elections.
+    national_and_provincial_elections = "National and Provincial Government Elections"
+    # Public Holiday by Presidential Decree.
+    presidential_decree_holiday = "Public Holiday by Presidential Decree"
+    # Y2K Changeover.
+    y2k_changeover = "Y2K Changeover"
     special_public_holidays = {
         1999: (
             (JUN, 2, national_and_provincial_elections),
@@ -144,13 +188,12 @@ class SouthAfricaStaticHolidays:
             (DEC, 27, presidential_decree_holiday),
         ),
         2019: (MAY, 8, national_and_provincial_elections),
-        2021: (NOV, 1, municipal_elections),
+        # Municipal elections.
+        2021: (NOV, 1, "Municipal elections"),
         2022: (DEC, 27, presidential_decree_holiday),
-        # Winning the 2023 Rugby World Cup
         2023: (DEC, 15, presidential_decree_holiday),
         2024: (MAY, 29, national_and_provincial_elections),
     }
-
     special_public_holidays_observed = {
         # https://web.archive.org/web/20120328122217/http://www.info.gov.za/speeches/1999/991028409p1002.htm
         2000: (JAN, 3, y2k_changeover),