holidays 0.79__py3-none-any.whl → 0.80__py3-none-any.whl

holidays/countries/macau.py

@@ -13,7 +13,7 @@
 from gettext import gettext as tr
 
 from holidays.calendars.gregorian import FEB, SEP, OCT, DEC
-from holidays.constants import GOVERNMENT, MANDATORY, PUBLIC
+from holidays.constants import GOVERNMENT, OPTIONAL, PUBLIC
 from holidays.groups import (
     ChineseCalendarHolidays,
     ChristianHolidays,
@@ -77,7 +77,7 @@ class Macau(
         "澳門市": "M",
         "澳门市": "M",
     }
-    supported_categories = (GOVERNMENT, MANDATORY, PUBLIC)
+    supported_categories = (GOVERNMENT, OPTIONAL, PUBLIC)
     supported_languages = ("en_MO", "en_US", "pt_MO", "th", "zh_CN", "zh_MO")
 
     def __init__(self, *args, **kwargs):
@@ -91,6 +91,63 @@ class Macau(
         super().__init__(*args, **kwargs)
 
     def _populate_public_holidays(self):
+        """Macau Mandatory (Statutory) Holidays.
+
+        Decreto-Lei n.º 101/84/M - Earliest Available Version Online.
+        Decreto-Lei n.º 24/89/M - Added Ching Ming Festival.
+        Lei n.º 8/2000 - Removed Day of Portugal
+                       - Added Macao S.A.R. Establishment Day.
+                       - Moved Mid-Autumn to Day following Mid-Autumn to match Public Holidays.
+        Lei n.º 7/2008 - Consolidated with other laws, reaffirming 2000 Amendment list.
+        """
+        if self._year <= 1984:
+            return None
+
+        # New Year's Day.
+        self._add_new_years_day(tr("元旦"))
+
+        # Chinese New Year's Day.
+        self._add_chinese_new_years_day(tr("農曆正月初一"))
+
+        # The second day of Chinese New Year.
+        self._add_chinese_new_years_day_two(tr("農曆正月初二"))
+
+        # The third day of Chinese New Year.
+        self._add_chinese_new_years_day_three(tr("農曆正月初三"))
+
+        # Labor Day.
+        self._add_labor_day(tr("勞動節"))
+
+        # Double Ninth Festival.
+        self._add_double_ninth_festival(tr("重陽節"))
+
+        # National Day of the People's Republic of China.
+        self._add_holiday_oct_1(tr("中華人民共和國國慶日"))
+
+        # Decreto-Lei n.º 24/89/M - Adds Ching Ming as a Mandatory Holiday.
+        if self._year >= 1989:
+            # Tomb-Sweeping Day.
+            self._add_qingming_festival(tr("清明節"))
+
+        # Lei n.º 8/2000 - Removed Day of Portugal as a Mandatory Holiday.
+        #                - Changed observance from Mid-Autumn to the following day.
+        #                - Adds Macao S.A.R. Establishment Day as a Mandatory Holiday.
+        if self._year <= 1999:
+            # Day of Portugal, Camões, and the Portuguese Communities.
+            self._add_holiday_jun_10(tr("葡國日、賈梅士日暨葡僑日"))
+
+            # Mid-Autumn Festival.
+            self._add_mid_autumn_festival(tr("中秋節"))
+
+        else:
+            # The Day following Mid-Autumn Festival.
+            self._add_mid_autumn_festival_day_two(tr("中秋節翌日"))
+
+            # Macao S.A.R. Establishment Day.
+            self._add_holiday_dec_20(tr("澳門特別行政區成立紀念日"))
+
+    def _populate_optional_holidays(self):
+        """Macau General Holidays."""
         # New Year's Day.
         self._add_new_years_day(tr("元旦"))
 
@@ -223,61 +280,6 @@ class Macau(
             # Macao S.A.R. Establishment Day.
             self._add_holiday_dec_20(tr("澳門特別行政區成立紀念日"))
 
-    def _populate_mandatory_holidays(self):
-        """
-        Decreto-Lei n.º 101/84/M - Earliest Available Version Online.
-        Decreto-Lei n.º 24/89/M - Added Ching Ming Festival.
-        Lei n.º 8/2000 - Removed Day of Portugal
-                       - Added Macao S.A.R. Establishment Day.
-                       - Moved Mid-Autumn to Day following Mid-Autumn to match Public Holidays.
-        Lei n.º 7/2008 - Consolidated with other laws, reaffirming 2000 Amendment list.
-        """
-        if self._year <= 1984:
-            return None
-
-        # New Year's Day.
-        self._add_new_years_day(tr("元旦"))
-
-        # Chinese New Year's Day.
-        self._add_chinese_new_years_day(tr("農曆正月初一"))
-
-        # The second day of Chinese New Year.
-        self._add_chinese_new_years_day_two(tr("農曆正月初二"))
-
-        # The third day of Chinese New Year.
-        self._add_chinese_new_years_day_three(tr("農曆正月初三"))
-
-        # Labor Day.
-        self._add_labor_day(tr("勞動節"))
-
-        # Double Ninth Festival.
-        self._add_double_ninth_festival(tr("重陽節"))
-
-        # National Day of the People's Republic of China.
-        self._add_holiday_oct_1(tr("中華人民共和國國慶日"))
-
-        # Decreto-Lei n.º 24/89/M - Adds Ching Ming as a Mandatory Holiday.
-        if self._year >= 1989:
-            # Tomb-Sweeping Day.
-            self._add_qingming_festival(tr("清明節"))
-
-        # Lei n.º 8/2000 - Removed Day of Portugal as a Mandatory Holiday.
-        #                - Changed observance from Mid-Autumn to the following day.
-        #                - Adds Macao S.A.R. Establishment Day as a Mandatory Holiday.
-        if self._year <= 1999:
-            # Day of Portugal, Camões, and the Portuguese Communities.
-            self._add_holiday_jun_10(tr("葡國日、賈梅士日暨葡僑日"))
-
-            # Mid-Autumn Festival.
-            self._add_mid_autumn_festival(tr("中秋節"))
-
-        else:
-            # The Day following Mid-Autumn Festival.
-            self._add_mid_autumn_festival_day_two(tr("中秋節翌日"))
-
-            # Macao S.A.R. Establishment Day.
-            self._add_holiday_dec_20(tr("澳門特別行政區成立紀念日"))
-
     def _populate_government_holidays(self):
         # While Cross-Checking References are available for from 2005-2025,
         # SUN in-lieus starts in 2011; SAT-SUN in-lieus starts in 2012.
@@ -378,7 +380,7 @@ class Macau(
             )
             self._populate_observed(dts_observed, multiple=True)
 
-    def _populate_subdiv_i_public_holidays(self):
+    def _populate_subdiv_i_optional_holidays(self):
         # Decreto-Lei n.º 15/93/M - Moved Day of the Municipality of Ilhas from JUL 13 to NOV 30.
         # Regulamento Administrativo n.º 4/1999 - Removed as a Public Holiday.
         if self._year <= 1999:
@@ -389,7 +391,7 @@ class Macau(
             else:
                 self._add_holiday_jul_13(name)
 
-    def _populate_subdiv_m_public_holidays(self):
+    def _populate_subdiv_m_optional_holidays(self):
         # Regulamento Administrativo n.º 4/1999 - Removed Macau City Day as a Public Holiday.
         if self._year <= 1999:
             # Macau City Day.
@@ -407,10 +409,10 @@ class MAC(Macau):
 class MacauStaticHolidays:
     """Macau special holidays.
 
-    Special Public and Government Holidays:
+    Special General and Government Holidays:
         * <https://web.archive.org/web/20240421052702/https://www.io.gov.mo/pt/legis/rec/111020>
 
-    Special Mandatory Holidays:
+    Special Mandatory (Statutory) Holidays:
         * <https://web.archive.org/web/20250421090753/https://www.dsal.gov.mo/pt/standard/holiday_table.html>
 
     Cross-Checking:
@@ -457,10 +459,10 @@ class MacauStaticHolidays:
         2014: (OCT, 3, name_double_ninth_festival_national_day_2_overlap),
         2020: (OCT, 5, name_mid_autumn_festival_day_2_national_day_2_overlap),
     }
-    special_mandatory_holidays = {
+    special_public_holidays = {
         2015: (SEP, 3, name_70th_war_of_resistance),
     }
-    special_public_holidays = {
+    special_optional_holidays = {
         1998: (
             (DEC, 23, name_fullday),
             (DEC, 31, name_halfday),

holidays/countries/maldives.py

@@ -25,6 +25,8 @@ class Maldives(HolidayBase, InternationalHolidays, IslamicHolidays):
     """
 
     country = "MV"
+    # %s (estimated).
+    estimated_label = "%s (estimated)"
     weekend = {FRI, SAT}
 
     def __init__(self, *args, islamic_show_estimated: bool = True, **kwargs):

holidays/countries/mauritania.py

@@ -24,6 +24,8 @@ class Mauritania(HolidayBase, InternationalHolidays, IslamicHolidays):
     """
 
     country = "MR"
+    # %s (estimated).
+    estimated_label = "%s (estimated)"
     weekend = {FRI, SAT}
 
     def __init__(self, *args, islamic_show_estimated: bool = True, **kwargs):

holidays/countries/nigeria.py

@@ -10,7 +10,10 @@
 #  Website: https://github.com/vacanza/holidays
 #  License: MIT (see LICENSE file)
 
-from holidays.calendars.gregorian import FEB, MAY
+from gettext import gettext as tr
+
+from holidays.calendars import _CustomIslamicHolidays
+from holidays.calendars.gregorian import JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP, OCT, NOV, DEC
 from holidays.groups import (
     ChristianHolidays,
     InternationalHolidays,
@@ -27,11 +30,33 @@ class Nigeria(
 
     References:
         * <https://en.wikipedia.org/wiki/Public_holidays_in_Nigeria>
+        * [Public Holidays Decree 1979](https://web.archive.org/web/20240616072641/https://archive.gazettes.africa/archive/ng/1979/ng-government-gazette-supplement-dated-1979-02-01-no-5.pdf)
+        * [Public Holidays (Amendment) Decree 1984](https://web.archive.org/web/20240615185836/https://archive.gazettes.africa/archive/ng/1984/ng-government-gazette-supplement-dated-1984-08-30-no-52-part-a.pdf)
+        * [Public Holidays Act (2004 Consolidated Version)](https://web.archive.org/web/20250822094939/https://placng.org/lawsofnigeria/view2.php?sn=467)
+        * <https://web.archive.org/web/20250829024504/https://fmino.gov.ng/may-29th-in-nigerias-history/>
+        * <https://web.archive.org/web/20250829084254/https://www.iita.org/wp-content/uploads/2017/01/The-Bulletin-23-27-May-2011-No.-2070.pdf>
+        * <https://web.archive.org/web/20170618031224/http://pulse.ng/local/inauguration-day-fg-declares-may-29-public-holiday-id3795830.html>
+        * <https://web.archive.org/web/20250829081956/https://dailypost.ng/2019/05/27/fg-declares-may-29-public-holiday/>
+        * <https://web.archive.org/web/20230620060859/https://interior.gov.ng/fg-declares-monday-may-29th-2023-work-free-day-for-presidential-inauguration/>
+        * <https://web.archive.org/web/20250829060151/https://statehouse.gov.ng/news/president-buhari-declares-june-12-the-new-democracy-day/>
+        * <https://web.archive.org/web/20250829085227/https://www.nairaland.com/4548139/may-29-remains-inauguration-day>
+        * <https://web.archive.org/web/20250829030023/https://www.timeanddate.com/holidays/nigeria/2025?hol=9>
+
+    In-lieu holidays have been in effect since at least 2010:
+        * <http://archive.today/2025.08.30-142719/https://www.vanguardngr.com/2010/05/fg-declares-may-31-public-holiday-for-democracy/>
     """
 
     country = "NG"
-    observed_label = "%s (observed)"
+    default_language = "en_NG"
+    # %s (estimated).
+    estimated_label = tr("%s (estimated)")
+    # %s (observed, estimated).
+    observed_estimated_label = tr("%s (observed, estimated)")
+    # %s (observed).
+    observed_label = tr("%s (observed)")
+    # Public Holidays Decree 1979, in effect from January 1st, 1979.
     start_year = 1979
+    supported_languages = ("en_NG", "en_US")
 
     def __init__(self, *args, islamic_show_estimated: bool = True, **kwargs):
         """
@@ -42,53 +67,69 @@ class Nigeria(
         """
         ChristianHolidays.__init__(self)
         InternationalHolidays.__init__(self)
-        IslamicHolidays.__init__(self, show_estimated=islamic_show_estimated)
+        IslamicHolidays.__init__(
+            self, cls=NigeriaIslamicHolidays, show_estimated=islamic_show_estimated
+        )
         StaticHolidays.__init__(self, NigeriaStaticHolidays)
         kwargs.setdefault("observed_rule", SAT_SUN_TO_NEXT_WORKDAY)
-        kwargs.setdefault("observed_since", 2016)
+        kwargs.setdefault("observed_since", 2010)
         super().__init__(*args, **kwargs)
 
     def _populate_public_holidays(self):
         dts_observed = set()
 
         # New Year's Day.
-        dts_observed.add(self._add_new_years_day("New Year's Day"))
+        dts_observed.add(self._add_new_years_day(tr("New Year's Day")))
+
+        # Good Friday.
+        self._add_good_friday(tr("Good Friday"))
 
-        self._add_good_friday("Good Friday")
-        self._add_easter_monday("Easter Monday")
+        # Easter Monday.
+        self._add_easter_monday(tr("Easter Monday"))
 
-        # Worker's day.
-        if self._year >= 1981:
-            dts_observed.add(self._add_labor_day("Workers' Day"))
+        # Added via Public Holidays (Amendment) Decree 1984 on August 28th, 1984.
+        if self._year >= 1985:
+            # Workers' Day.
+            dts_observed.add(self._add_labor_day(tr("Workers' Day")))
 
-        # Democracy Day.
+        # Added via Public Holidays (Amendment) Decree 2000.
+        # Changed to June 12th for 2019 onwards on July 6th, 2018.
         if self._year >= 2000:
-            name = "Democracy Day"
+            # Democracy Day.
+            name = tr("Democracy Day")
             dts_observed.add(
                 self._add_holiday_jun_12(name)
                 if self._year >= 2019
                 else self._add_holiday_may_29(name)
             )
 
-        # Independence Day.
-        dts_observed.add(self._add_holiday_oct_1("Independence Day"))
+        if self._year >= 1999 and self._year % 4 == 3:
+            # Presidential Inauguration Day.
+            self._add_holiday_may_29(tr("Presidential Inauguration Day"))
+
+        # National Day.
+        dts_observed.add(self._add_holiday_oct_1(tr("National Day")))
+
+        # Christmas Day.
+        dts_observed.add(self._add_christmas_day(tr("Christmas Day")))
 
-        # Christmas day.
-        dts_observed.add(self._add_christmas_day("Christmas Day"))
+        # Boxing Day.
+        dts_observed.add(self._add_christmas_day_two(tr("Boxing Day")))
 
-        # Boxing day.
-        dts_observed.add(self._add_christmas_day_two("Boxing Day"))
+        # Prophet's Birthday.
+        dts_observed.update(self._add_mawlid_day(tr("Id el Maulud")))
 
         # Eid al-Fitr.
-        dts_observed.update(self._add_eid_al_fitr_day("Eid-el-Fitr"))
-        dts_observed.update(self._add_eid_al_fitr_day_two("Eid-el-Fitr Holiday"))
+        dts_observed.update(self._add_eid_al_fitr_day(tr("Id el Fitr")))
+
+        # Eid al-Fitr Holiday.
+        dts_observed.update(self._add_eid_al_fitr_day_two(tr("Id el Fitr Holiday")))
 
         # Eid al-Adha.
-        dts_observed.update(self._add_eid_al_adha_day("Eid-el-Kabir"))
-        dts_observed.update(self._add_eid_al_adha_day_two("Eid-el-Kabir Holiday"))
+        dts_observed.update(self._add_eid_al_adha_day(tr("Id el Kabir")))
 
-        # Birthday of Prophet Muhammad.
-        dts_observed.update(self._add_mawlid_day("Eid-el-Mawlid"))
+        # Eid al-Adha Holiday.
+        dts_observed.update(self._add_eid_al_adha_day_two(tr("Id el Kabir Holiday")))
 
         if self.observed:
             self._populate_observed(dts_observed)
@@ -102,10 +143,140 @@ class NGA(Nigeria):
     pass
 
 
+class NigeriaIslamicHolidays(_CustomIslamicHolidays):
+    # https://web.archive.org/web/20250829051803/https://www.timeanddate.com/holidays/nigeria/id-el-kabir
+    EID_AL_ADHA_DATES_CONFIRMED_YEARS = (1979, 2025)
+    EID_AL_ADHA_DATES = {
+        1979: (NOV, 1),
+        1980: (OCT, 20),
+        1981: (OCT, 9),
+        1982: (SEP, 29),
+        1983: (SEP, 18),
+        1984: (SEP, 6),
+        1985: (AUG, 27),
+        1986: (AUG, 16),
+        1987: (AUG, 6),
+        1988: (JUL, 25),
+        1989: (JUL, 14),
+        1990: (JUL, 4),
+        1991: (JUN, 23),
+        1993: (JUN, 1),
+        1994: (MAY, 21),
+        1995: (MAY, 10),
+        1996: (APR, 29),
+        1997: (APR, 18),
+        1998: (APR, 8),
+        1999: (MAR, 28),
+        2001: (MAR, 6),
+        2002: (FEB, 23),
+        2003: (FEB, 12),
+        2004: (FEB, 2),
+        2007: (DEC, 19),
+        2008: (DEC, 9),
+        2009: (NOV, 28),
+        2010: (NOV, 17),
+        2011: (NOV, 7),
+        2014: (OCT, 6),
+        2015: (SEP, 24),
+        2016: (SEP, 12),
+        2017: (SEP, 2),
+        2018: (AUG, 22),
+        2019: (AUG, 12),
+    }
+
+    # https://web.archive.org/web/20250829052410/https://www.timeanddate.com/holidays/nigeria/id-el-fitr
+    EID_AL_FITR_DATES_CONFIRMED_YEARS = (1979, 2025)
+    EID_AL_FITR_DATES = {
+        1979: (AUG, 25),
+        1980: (AUG, 13),
+        1981: (AUG, 2),
+        1982: (JUL, 23),
+        1983: (JUL, 12),
+        1985: (JUN, 20),
+        1986: (JUN, 9),
+        1987: (MAY, 30),
+        1988: (MAY, 18),
+        1989: (MAY, 7),
+        1990: (APR, 27),
+        1991: (APR, 16),
+        1993: (MAR, 25),
+        1994: (MAR, 14),
+        1995: (MAR, 3),
+        1996: (FEB, 21),
+        1997: (FEB, 9),
+        1998: (JAN, 30),
+        1999: (JAN, 19),
+        2000: ((JAN, 8), (DEC, 28)),
+        2001: (DEC, 17),
+        2002: (DEC, 6),
+        2003: (NOV, 26),
+        2005: (NOV, 4),
+        2006: (OCT, 24),
+        2007: (OCT, 12),
+        2008: (SEP, 29),
+        2009: (SEP, 21),
+        2010: (SEP, 9),
+        2012: (AUG, 20),
+        2017: (JUN, 26),
+    }
+
+    # https://web.archive.org/web/20250829053435/https://www.timeanddate.com/holidays/nigeria/id-el-maulud
+    # https://web.archive.org/web/20250829054319/https://pmnewsnigeria.com/2012/02/03/fg-declares-6-feb-public-holiday/
+    MAWLID_DATES_CONFIRMED_YEARS = (1979, 2025)
+    MAWLID_DATES = {
+        1979: (FEB, 10),
+        1982: ((JAN, 8), (DEC, 28)),
+        1983: (DEC, 17),
+        1984: (DEC, 6),
+        1985: (NOV, 25),
+        1986: (NOV, 15),
+        1987: (NOV, 4),
+        1988: (OCT, 23),
+        1989: (OCT, 13),
+        1990: (OCT, 2),
+        1991: (SEP, 21),
+        1992: (SEP, 10),
+        1993: (AUG, 30),
+        1995: (AUG, 9),
+        1996: (JUL, 28),
+        1997: (JUL, 18),
+        1998: (JUL, 7),
+        2000: (JUN, 15),
+        2003: (MAY, 14),
+        2004: (MAY, 2),
+        2006: (APR, 11),
+        2011: (FEB, 16),
+        2012: (FEB, 6),
+        2015: ((JAN, 2), (DEC, 24)),
+        2016: (DEC, 12),
+        2017: (DEC, 1),
+        2021: (OCT, 19),
+        2024: (SEP, 16),
+        2025: (SEP, 5),
+    }
+
+
 class NigeriaStaticHolidays:
+    """Nigeria special holidays.
+
+    References:
+        * <https://web.archive.org/web/20250829090324/https://www.pambazuka.org/governance/nigeria-holiday-blow-presidential-hopeful>
+        * <https://web.archive.org/web/20250829084913/https://www.nbcnews.com/id/wbna36974655>
+        * <https://web.archive.org/web/20250829081641/https://businessday.ng/uncategorized/article/2019-elections-fg-declares-friday-public-holiday-excludes-banksothers/>
+        * <https://web.archive.org/web/20250829024209/https://statehouse.gov.ng/news/new-date-for-special-federal-executive-council-session-in-honour-of-president-muhammadu-buhari-to-be-announced/>
+    """
+
+    # Public Holiday for Elections.
+    name_elections = tr("Public Holiday for Elections")
+
     special_public_holidays = {
-        2019: (
-            (FEB, 22, "Public Holiday for Elections"),
-            (MAY, 29, "Presidential Inauguration Day"),
+        2007: (
+            (APR, 12, name_elections),
+            (APR, 13, name_elections),
         ),
+        # Day of Mourning for President Umaru Yar'Adua.
+        2010: (MAY, 6, tr("Day of Mourning for President Umaru Yar'Adua")),
+        2019: (FEB, 22, name_elections),
+        # Day of Mourning for President Muhammadu Buhari.
+        2025: (JUL, 15, tr("Day of Mourning for President Muhammadu Buhari")),
     }

holidays/countries/rwanda.py

@@ -0,0 +1,162 @@
+#  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 CONTRIBUTORS 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 datetime import date
+from gettext import gettext as tr
+
+from holidays.calendars import _CustomIslamicHolidays
+from holidays.calendars.gregorian import MAR, JUN, JUL, AUG
+from holidays.groups import ChristianHolidays, InternationalHolidays, IslamicHolidays
+from holidays.observed_holiday_base import (
+    ObservedHolidayBase,
+    SAT_TO_NEXT_WORKDAY,
+    SAT_SUN_TO_NEXT_WORKDAY,
+)
+
+
+class Rwanda(ObservedHolidayBase, ChristianHolidays, InternationalHolidays, IslamicHolidays):
+    """Rwanda holidays.
+
+    References:
+        * <https://en.wikipedia.org/wiki/Public_holidays_in_Rwanda>
+        * [Presidential Order N° 06/01 of 16/02/2011](https://web.archive.org/web/20250601161219/https://archive.gazettes.africa/archive/rw/2011/rw-government-gazette-dated-2011-03-07-no-10.pdf)
+        * [Presidential Order N° 42/03 of 30/06/2015](https://web.archive.org/web/20180417062635/http://www.igihe.com/IMG/pdf/iteka_rya_perezida_rigena_iminsi_y_ikiruhuko_rusange.pdf)
+        * [Presidential Order N° 54/01 of 24/02/2017](https://web.archive.org/web/20220626143357/https://www.ngoma.gov.rw/index.php?eID=dumpFile&t=f&f=44336&token=fc82c76109af7950f8895d40ddd3e15bd8c57e8c)
+        * [Presidential Order N° 62/01 of 19/10/2022](https://web.archive.org/web/20250815032533/https://mifotra.prod.risa.rw/index.php?eID=dumpFile&t=f&f=85230&token=bcf0bf166638c11f4bf3d2f8c629052db26d38b6)
+    """
+
+    country = "RW"
+    default_language = "rw"
+    # %s (estimated).
+    estimated_label = tr("%s (yagereranijwe)")
+    # %s (observed).
+    observed_label = tr("%s (yizihijwe)")
+    # %s (observed, estimated).
+    observed_estimated_label = tr("%s (yizihijwe, yagereranijwe)")
+    supported_languages = ("en_US", "fr", "rw")
+    # Presidential Order N° 06/01 of 16/02/2011.
+    start_year = 2012
+
+    def __init__(self, *args, islamic_show_estimated: bool = True, **kwargs):
+        ChristianHolidays.__init__(self)
+        InternationalHolidays.__init__(self)
+        IslamicHolidays.__init__(
+            self, cls=RwandaIslamicHolidays, show_estimated=islamic_show_estimated
+        )
+        kwargs.setdefault("observed_since", 2017)
+        super().__init__(*args, **kwargs)
+
+    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.
+        """
+        special_cases = {
+            # Day after New Year's Day.
+            self.tr("Umunsi ukurikira Ubunani"),
+            # Boxing Day.
+            self.tr("Umunsi ukurikira Noheli"),
+        }
+        for dt in sorted(dts):
+            for name in self.get_list(dt):
+                self._add_observed(
+                    dt,
+                    name,
+                    SAT_TO_NEXT_WORKDAY if name in special_cases else SAT_SUN_TO_NEXT_WORKDAY,
+                )
+
+    def _populate_public_holidays(self):
+        dts_observed = set()
+
+        # New Year's Day.
+        dt = self._add_new_years_day(tr("Ubunani"))
+        if self._year >= 2018:
+            dts_observed.add(dt)
+
+        # Added via Presidential Order N° 42/03 of 30/06/2015.
+        if self._year >= 2016:
+            # Day after New Year's Day.
+            dts_observed.add(self._add_new_years_day_two(tr("Umunsi ukurikira Ubunani")))
+
+        # National Heroes' Day.
+        dts_observed.add(self._add_holiday_feb_1(tr("Umunsi w'Intwari")))
+
+        # Memorial Day of Genocide perpetrated against the Tutsi in 1994.
+        self._add_holiday_apr_7(tr("Umunsi wo Kwibuka Jenoside yakorewe Abatutsi mu 1994"))
+
+        # Good Friday.
+        self._add_good_friday(tr("Umunsi wa Gatanu Mutagatifu"))
+
+        # Added via Presidential Order N° 54/01 of 24/02/2017.
+        if self._year >= 2017:
+            # Easter Monday.
+            self._add_easter_monday(tr("Ku wa mbere wa Pasika"))
+
+        # Labor Day.
+        dts_observed.add(self._add_labor_day(tr("Umunsi Mukuru w'Umurimo")))
+
+        # Independence Day.
+        dts_observed.add(self._add_holiday_jul_1(tr("Umunsi w'Ubwigenge")))
+
+        # Liberation Day.
+        dts_observed.add(self._add_holiday_jul_4(tr("Umunsi wo Kwibohora")))
+
+        # Added via Presidential Order N° 42/03 of 30/06/2015.
+        if self._year >= 2015:
+            # Umuganura Day.
+            self._add_holiday_1st_fri_of_aug(tr("Umunsi w'Umuganura"))
+
+        # Assumption Day.
+        dts_observed.add(self._add_assumption_of_mary_day(tr("Ijyanwa mu Ijuru rya Bikiramariya")))
+
+        # Christmas Day.
+        dts_observed.add(self._add_christmas_day(tr("Noheli")))
+
+        # Boxing Day.
+        dts_observed.add(self._add_christmas_day_two(tr("Umunsi ukurikira Noheli")))
+
+        # Eid al-Fitr.
+        dts_observed.update(self._add_eid_al_fitr_day(tr("Eid El Fitr")))
+
+        # Added via Presidential Order N° 42/03 of 30/06/2015.
+        if self._year >= 2015:
+            # Eid al-Adha.
+            dts_observed.update(self._add_eid_al_adha_day(tr("Eid al-Adha")))
+
+        if self.observed:
+            self._populate_observed(dts_observed)
+
+
+class RW(Rwanda):
+    pass
+
+
+class RWA(Rwanda):
+    pass
+
+
+class RwandaIslamicHolidays(_CustomIslamicHolidays):
+    EID_AL_ADHA_DATES_CONFIRMED_YEARS = (2018, 2025)
+    EID_AL_ADHA_DATES = {
+        2018: (AUG, 22),
+        2019: (AUG, 12),
+        2022: (JUL, 11),
+    }
+
+    EID_AL_FITR_DATES_CONFIRMED_YEARS = (2012, 2025)
+    EID_AL_FITR_DATES = {
+        2014: (JUL, 29),
+        2015: (JUL, 18),
+        2016: (JUL, 7),
+        2017: (JUN, 26),
+        2025: (MAR, 31),
+    }

holidays/countries/sierra_leone.py

@@ -12,8 +12,8 @@
 
 from gettext import gettext as tr
 
+from holidays.calendars import _CustomIslamicHolidays
 from holidays.calendars.gregorian import JUN, AUG, NOV
-from holidays.calendars.islamic import _CustomIslamicHolidays
 from holidays.groups import ChristianHolidays, InternationalHolidays, IslamicHolidays
 from holidays.observed_holiday_base import ObservedHolidayBase, SAT_SUN_TO_NEXT_WORKDAY
 

holidays/countries/singapore.py

@@ -60,7 +60,11 @@ class Singapore(
     """
 
     country = "SG"
+    # %s (estimated).
+    estimated_label = tr("%s (estimated)")
     default_language = "en_SG"
+    # %s (observed, estimated).
+    observed_estimated_label = tr("%s (observed, estimated)")
     # %s (observed).
     observed_label = tr("%s (observed)")
     supported_languages = ("en_SG", "en_US", "th")