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

holidays/countries/spain.py

@@ -13,14 +13,14 @@
 from gettext import gettext as tr
 
 from holidays.calendars import _CustomIslamicHolidays
-from holidays.calendars.gregorian import MAR, MAY, JUN, AUG, SEP, OCT, NOV
+from holidays.calendars.gregorian import JAN, MAR, MAY, JUN, JUL, AUG, SEP, OCT, NOV, DEC
 from holidays.groups import (
     ChristianHolidays,
     IslamicHolidays,
     InternationalHolidays,
     StaticHolidays,
 )
-from holidays.observed_holiday_base import ObservedHolidayBase, SUN_TO_NEXT_MON
+from holidays.observed_holiday_base import ObservedHolidayBase, SUN_TO_NEXT_MON, SUN_TO_NONE
 
 
 class Spain(
@@ -29,7 +29,9 @@ class Spain(
     """Spain holidays.
 
     References:
-        * <https://web.archive.org/web/20250407130530/https://administracion.gob.es/pag_Home/atencionCiudadana/calendarios.html>
+        * <https://web.archive.org/web/20230307043804/https://administracion.gob.es/pag_Home/atencionCiudadana/calendarios.html>
+        * [2008](https://web.archive.org/web/20251029052726/https://www.boe.es/diario_boe/txt.php?id=BOE-A-2007-18306)
+        * [2009](https://web.archive.org/web/20250427104921/https://www.boe.es/buscar/doc.php?id=BOE-A-2008-18411)
         * [2010](https://web.archive.org/web/20250427181827/https://www.boe.es/buscar/doc.php?id=BOE-A-2009-18477)
         * [2011](https://web.archive.org/web/20231121065830/https://www.boe.es/buscar/doc.php?id=BOE-A-2010-15722)
         * [2012](https://web.archive.org/web/20250427181838/https://www.boe.es/buscar/doc.php?id=BOE-A-2011-16116)
@@ -46,9 +48,32 @@ class Spain(
         * [2023](https://web.archive.org/web/20240811035605/https://www.boe.es/buscar/doc.php?id=BOE-A-2022-16755)
         * [2024](https://web.archive.org/web/20240401192304/https://www.boe.es/buscar/doc.php?id=BOE-A-2023-22014)
         * [2025](https://web.archive.org/web/20241226214918/https://www.boe.es/buscar/doc.php?id=BOE-A-2024-21316)
+        * [2026](https://web.archive.org/web/20251028115438/https://www.boe.es/diario_boe/txt.php?id=BOE-A-2025-21667)
 
     Subdivisions Holidays References:
+        * Ceuta:
+            * [2018](https://web.archive.org/web/20251029132255/https://sede.ceuta.es/controlador/controlador?modulo=info&cmd=calendario&year=2018)
+            * [2019](https://web.archive.org/web/20210506145356/https://sede.ceuta.es/controlador/controlador?modulo=info&cmd=calendario&year=2019)
+            * [2020](https://web.archive.org/web/20210413221634/https://sede.ceuta.es/controlador/controlador?modulo=info&cmd=calendario&year=2020)
+            * [2021](https://web.archive.org/web/20251029131434/https://sede.ceuta.es/controlador/controlador?modulo=info&cmd=calendario&year=2021)
+            * [2022](https://web.archive.org/web/20250115161923/https://sede.ceuta.es/controlador/controlador?modulo=info&cmd=calendario&year=2022)
+            * [2023](https://web.archive.org/web/20241211133010/https://sede.ceuta.es/controlador/controlador?modulo=info&cmd=calendario&year=2023)
+            * [2024](https://web.archive.org/web/20240419004114/https://sede.ceuta.es/controlador/controlador?modulo=info&cmd=calendario&year=2024)
+            * [2025](https://web.archive.org/web/20250315132943/https://sede.ceuta.es/controlador/controlador?modulo=info&cmd=calendario&year=2025)
+        * Melilla:
+            * [2017](https://web.archive.org/web/20251029145828/https://www.melilla.es/melillaportal/contenedor.jsp?seccion=s_fact_d4_v1.jsp&contenido=23611&nivel=1400&tipo=2)
+            * [2018](https://web.archive.org/web/20251029144310/https://www.melilla.es/melillaPortal/contenedor.jsp?seccion=s_fact_d4_v1.jsp&contenido=25713&nivel=1400&tipo=2)
+            * [2019](https://web.archive.org/web/20251029132642/https://www.melilla.es/melillaportal/contenedor.jsp?seccion=s_fact_d4_v1.jsp&contenido=27481&nivel=1400&tipo=2)
+            * [2020](https://web.archive.org/web/20251028181240/https://www.melilla.es/melillaPortal/contenedor.jsp?seccion=s_fact_d4_v1.jsp&contenido=29323&nivel=1400&tipo=2)
+            * [2021](https://web.archive.org/web/20251028181807/https://www.melilla.es/melillaportal/contenedor.jsp?seccion=s_fact_d4_v1.jsp&contenido=30529&nivel=1400&tipo=2)
+            * [2022](https://web.archive.org/web/20251029030735/https://www.melilla.es/melillaportal/contenedor.jsp?seccion=s_fact_d4_v1.jsp&contenido=32051&nivel=1400&tipo=2)
+            * [2023](https://web.archive.org/web/20251029030355/https://www.melilla.es/melillaportal/contenedor.jsp?seccion=s_fact_d4_v1.jsp&contenido=33685&nivel=1400&tipo=2)
+            * [2024](https://web.archive.org/web/20241208104853/https://www.melilla.es/melillaportal/contenedor.jsp?seccion=s_fact_d4_v1.jsp&contenido=34997&nivel=1400&tipo=2)
+            * [2025](https://web.archive.org/web/20250113015447/https://www.melilla.es/melillaportal/contenedor.jsp?seccion=s_fact_d4_v1.jsp&contenido=37491&nivel=1400&tipo=2)
+            * [2026](https://web.archive.org/web/20251029045506/https://www.melilla.es/melillaportal/contenedor.jsp?seccion=s_fact_d4_v1.jsp&contenido=41767&nivel=1400&tipo=2)
         * Navarra:
+            * [2008](https://web.archive.org/web/20100407160735/http://www.lexnavarra.navarra.es/detalle.asp?r=29465)
+            * [2009](https://web.archive.org/web/20130615075729/http://www.lexnavarra.navarra.es/detalle.asp?r=29761)
             * [2010](https://web.archive.org/web/20250903095706/https://www.lexnavarra.navarra.es/detalle.asp?r=8402)
             * [2011](https://web.archive.org/web/20250903095217/https://www.lexnavarra.navarra.es/detalle.asp?r=8403)
             * [2012](https://web.archive.org/web/20250903095133/https://www.lexnavarra.navarra.es/detalle.asp?r=12993)
@@ -65,8 +90,9 @@ class Spain(
             * [2023](https://web.archive.org/web/20250623010106/https://www.lexnavarra.navarra.es/detalle.asp?r=55481)
             * [2024](https://web.archive.org/web/20250623001355/https://www.lexnavarra.navarra.es/detalle.asp?r=56116)
             * [2025](https://web.archive.org/web/20250622235218/https://www.lexnavarra.navarra.es/detalle.asp?r=57122)
+            * [2026](https://web.archive.org/web/20251028120003/https://www.lexnavarra.navarra.es/detalle.asp?r=57937)
 
-    Holidays checked with official sources for 2010-2025 only.
+    Holidays checked with official sources for 2008-2026 only.
     """
 
     country = "ES"
@@ -77,6 +103,8 @@ class Spain(
     observed_estimated_label = tr("Lunes siguiente a %s (estimado)")
     # Monday following %s.
     observed_label = tr("Lunes siguiente a %s")
+    # Earliest available online sources for all of Spain's subdivisions.
+    start_year = 2008
     subdivisions = (
         "AN",  # Andalucía.
         "AR",  # Aragón.
@@ -121,7 +149,7 @@ class Spain(
         "La Rioja": "RI",
         "Valenciana": "VC",
     }
-    supported_languages = ("ca", "en_US", "es", "uk")
+    supported_languages = ("ca", "en_US", "es", "th", "uk")
 
     def __init__(self, *args, islamic_show_estimated: bool = True, **kwargs):
         """
@@ -140,50 +168,54 @@ class Spain(
         super().__init__(*args, **kwargs)
 
     def _populate_public_holidays(self):
-        if self._year not in {2012, 2017, 2023}:
-            # New Year's Day.
-            self._add_new_years_day(tr("Año Nuevo"))
+        # New Year's Day.
+        self._add_observed(self._add_new_years_day(tr("Año Nuevo")), rule=SUN_TO_NONE)
 
-        if self._year not in {2013, 2019}:
-            # Epiphany.
-            self._add_epiphany_day(tr("Epifanía del Señor"))
+        # Epiphany.
+        self._add_observed(self._add_epiphany_day(tr("Epifanía del Señor")), rule=SUN_TO_NONE)
 
         # Good Friday.
         self._add_good_friday(tr("Viernes Santo"))
 
-        if self._year not in {2011, 2016, 2022}:
-            # Labor Day.
-            self._add_labor_day(tr("Fiesta del Trabajo"))
+        # Labor Day.
+        self._add_observed(self._add_labor_day(tr("Fiesta del Trabajo")), rule=SUN_TO_NONE)
 
-        if self._year not in {2010, 2021}:
+        self._add_observed(
             # Assumption Day.
-            self._add_assumption_of_mary_day(tr("Asunción de la Virgen"))
+            self._add_assumption_of_mary_day(tr("Asunción de la Virgen")),
+            rule=SUN_TO_NONE,
+        )
 
-        if self._year not in {2014, 2025}:
+        self._add_observed(
             # National Day.
-            self._add_holiday_oct_12(tr("Fiesta Nacional de España"))
+            self._add_holiday_oct_12(tr("Fiesta Nacional de España")),
+            rule=SUN_TO_NONE,
+        )
 
-        if self._year not in {2015, 2020}:
-            # All Saints' Day.
-            self._add_all_saints_day(tr("Todos los Santos"))
+        # All Saints' Day.
+        self._add_observed(self._add_all_saints_day(tr("Todos los Santos")), rule=SUN_TO_NONE)
 
+        self._add_observed(
             # Constitution Day.
-            self._add_holiday_dec_6(tr("Día de la Constitución Española"))
+            self._add_holiday_dec_6(tr("Día de la Constitución Española")),
+            rule=SUN_TO_NONE,
+        )
 
-        if self._year not in {2013, 2019, 2024}:
+        self._add_observed(
             # Immaculate Conception.
-            self._add_immaculate_conception_day(tr("Inmaculada Concepción"))
+            self._add_immaculate_conception_day(tr("Inmaculada Concepción")),
+            rule=SUN_TO_NONE,
+        )
 
-        if self._year not in {2011, 2016, 2022}:
-            # Christmas Day.
-            self._add_christmas_day(tr("Natividad del Señor"))
+        # Christmas Day.
+        self._add_observed(self._add_christmas_day(tr("Natividad del Señor")), rule=SUN_TO_NONE)
 
     def _populate_subdiv_an_public_holidays(self):
-        if self._year in {2012, 2017, 2023}:
-            self._move_holiday(self._add_new_years_day(tr("Año Nuevo")))
+        # New Year's Day.
+        self._move_holiday(self._add_new_years_day(tr("Año Nuevo")))
 
-        if self._year in {2013, 2019}:
-            self._move_holiday(self._add_epiphany_day(tr("Epifanía del Señor")))
+        # Epiphany.
+        self._move_holiday(self._add_epiphany_day(tr("Epifanía del Señor")))
 
         # Andalusia Day.
         self._move_holiday(self._add_holiday_feb_28(tr("Día de Andalucía")))
@@ -191,161 +223,192 @@ class Spain(
         # Maundy Thursday.
         self._add_holy_thursday(tr("Jueves Santo"))
 
-        if self._year in {2011, 2016, 2022}:
-            self._move_holiday(self._add_labor_day(tr("Fiesta del Trabajo")))
+        # Labor Day.
+        self._move_holiday(self._add_labor_day(tr("Fiesta del Trabajo")))
 
-        if self._year in {2010, 2021}:
-            self._move_holiday(self._add_assumption_of_mary_day(tr("Asunción de la Virgen")))
+        # Assumption Day.
+        self._move_holiday(self._add_assumption_of_mary_day(tr("Asunción de la Virgen")))
 
-        if self._year in {2014, 2025}:
-            self._move_holiday(self._add_holiday_oct_12(tr("Fiesta Nacional de España")))
+        # National Day.
+        self._move_holiday(self._add_holiday_oct_12(tr("Fiesta Nacional de España")))
 
-        if self._year in {2015, 2020}:
-            self._move_holiday(self._add_all_saints_day(tr("Todos los Santos")))
+        # All Saints' Day.
+        self._move_holiday(self._add_all_saints_day(tr("Todos los Santos")))
 
-        if self._year in {2015, 2020}:
-            self._move_holiday(self._add_holiday_dec_6(tr("Día de la Constitución Española")))
+        # Constitution Day.
+        self._move_holiday(self._add_holiday_dec_6(tr("Día de la Constitución Española")))
 
-        if self._year in {2013, 2019, 2024}:
-            self._move_holiday(self._add_immaculate_conception_day(tr("Inmaculada Concepción")))
+        # Immaculate Conception.
+        self._move_holiday(self._add_immaculate_conception_day(tr("Inmaculada Concepción")))
 
-        if self._year in {2011, 2016, 2022}:
-            self._move_holiday(self._add_christmas_day(tr("Natividad del Señor")))
+        # Christmas Day.
+        self._move_holiday(self._add_christmas_day(tr("Natividad del Señor")))
 
     def _populate_subdiv_ar_public_holidays(self):
-        if self._year in {2012, 2017, 2023}:
-            self._move_holiday(self._add_new_years_day(tr("Año Nuevo")))
+        # New Year's Day.
+        self._move_holiday(self._add_new_years_day(tr("Año Nuevo")))
 
-        if self._year in {2013, 2019}:
-            self._move_holiday(self._add_epiphany_day(tr("Epifanía del Señor")))
+        # Epiphany.
+        self._move_holiday(self._add_epiphany_day(tr("Epifanía del Señor")))
 
+        # Maundy Thursday.
         self._add_holy_thursday(tr("Jueves Santo"))
 
         # Saint George's Day.
         self._move_holiday(self._add_saint_georges_day(tr("Día de San Jorge")))
 
-        if self._year in {2011, 2016, 2022}:
-            self._move_holiday(self._add_labor_day(tr("Fiesta del Trabajo")))
+        # Labor Day.
+        self._move_holiday(self._add_labor_day(tr("Fiesta del Trabajo")))
 
-        if self._year in {2010, 2021}:
-            self._move_holiday(self._add_assumption_of_mary_day(tr("Asunción de la Virgen")))
+        # Assumption Day.
+        self._move_holiday(self._add_assumption_of_mary_day(tr("Asunción de la Virgen")))
 
-        if self._year in {2014, 2025}:
-            self._move_holiday(self._add_holiday_oct_12(tr("Fiesta Nacional de España")))
+        # National Day.
+        self._move_holiday(self._add_holiday_oct_12(tr("Fiesta Nacional de España")))
 
-        if self._year in {2015, 2020}:
-            self._move_holiday(self._add_all_saints_day(tr("Todos los Santos")))
+        # All Saints' Day.
+        self._move_holiday(self._add_all_saints_day(tr("Todos los Santos")))
 
-        if self._year in {2015, 2020}:
-            self._move_holiday(self._add_holiday_dec_6(tr("Día de la Constitución Española")))
+        # Constitution Day.
+        self._move_holiday(self._add_holiday_dec_6(tr("Día de la Constitución Española")))
 
-        if self._year in {2013, 2019, 2024}:
-            self._move_holiday(self._add_immaculate_conception_day(tr("Inmaculada Concepción")))
+        # Immaculate Conception.
+        self._move_holiday(self._add_immaculate_conception_day(tr("Inmaculada Concepción")))
 
-        if self._year in {2011, 2016, 2022}:
-            self._move_holiday(self._add_christmas_day(tr("Natividad del Señor")))
+        # Christmas Day.
+        self._move_holiday(self._add_christmas_day(tr("Natividad del Señor")))
 
     def _populate_subdiv_as_public_holidays(self):
-        if self._year in {2012, 2017, 2023}:
-            self._move_holiday(self._add_new_years_day(tr("Año Nuevo")))
+        # New Year's Day.
+        self._move_holiday(self._add_new_years_day(tr("Año Nuevo")))
 
-        if self._year in {2013, 2019}:
-            self._move_holiday(self._add_epiphany_day(tr("Epifanía del Señor")))
+        # Epiphany.
+        self._move_holiday(self._add_epiphany_day(tr("Epifanía del Señor")))
 
+        # Maundy Thursday.
         self._add_holy_thursday(tr("Jueves Santo"))
 
-        if self._year in {2011, 2016, 2022}:
-            self._move_holiday(self._add_labor_day(tr("Fiesta del Trabajo")))
+        # Labor Day.
+        self._move_holiday(self._add_labor_day(tr("Fiesta del Trabajo")))
 
-        if self._year in {2010, 2021}:
-            self._move_holiday(self._add_assumption_of_mary_day(tr("Asunción de la Virgen")))
+        # Assumption Day.
+        self._move_holiday(self._add_assumption_of_mary_day(tr("Asunción de la Virgen")))
 
         # Asturias Day.
         self._move_holiday(self._add_holiday_sep_8(tr("Día de Asturias")))
 
-        if self._year in {2014, 2025}:
-            self._move_holiday(self._add_holiday_oct_12(tr("Fiesta Nacional de España")))
+        # National Day.
+        self._move_holiday(self._add_holiday_oct_12(tr("Fiesta Nacional de España")))
 
-        if self._year in {2015, 2020}:
-            self._move_holiday(self._add_all_saints_day(tr("Todos los Santos")))
+        # All Saints' Day.
+        self._move_holiday(self._add_all_saints_day(tr("Todos los Santos")))
 
-        if self._year in {2015, 2020}:
-            self._move_holiday(self._add_holiday_dec_6(tr("Día de la Constitución Española")))
+        # Constitution Day.
+        self._move_holiday(self._add_holiday_dec_6(tr("Día de la Constitución Española")))
 
-        if self._year in {2013, 2019, 2024}:
-            self._move_holiday(self._add_immaculate_conception_day(tr("Inmaculada Concepción")))
+        # Immaculate Conception.
+        self._move_holiday(self._add_immaculate_conception_day(tr("Inmaculada Concepción")))
 
-        if self._year in {2011, 2016, 2022}:
-            self._move_holiday(self._add_christmas_day(tr("Natividad del Señor")))
+        # Christmas Day.
+        self._move_holiday(self._add_christmas_day(tr("Natividad del Señor")))
 
     def _populate_subdiv_cb_public_holidays(self):
         if self._year == 2013:
+            # Epiphany.
             self._move_holiday(self._add_epiphany_day(tr("Epifanía del Señor")))
 
         if self._year != 2018:
+            # Maundy Thursday.
             self._add_holy_thursday(tr("Jueves Santo"))
 
-        if self._year in {2013, 2015, 2019, 2020, 2024}:
+        # Add when Cantabria Institutions Day is on Sunday.
+        if self._is_sunday(JUL, 28) or self._year in {2015, 2020}:
             # Easter Monday.
             self._add_easter_monday(tr("Lunes de Pascua"))
 
         if self._year == 2011:
+            # Labor Day.
             self._move_holiday(self._add_labor_day(tr("Fiesta del Trabajo")))
 
-        if self._year in {2012, 2013, 2014, 2019, 2024}:
+        # Add when Our Lady of Bien Aparecida is on Sunday.
+        if self._is_sunday(SEP, 15) or self._year in {2012, 2014}:
             # Saint James' Day.
             self._add_saint_james_day(tr("Santiago Apóstol"))
 
-        if self._year not in {2012, 2015, 2019, 2024}:
-            # Cantabria Institutions Day.
-            self._add_holiday_jul_28(tr("Día de las Instituciones de Cantabria"))
+        if self._year not in {2012, 2015}:
+            self._add_observed(
+                # Cantabria Institutions Day.
+                self._add_holiday_jul_28(tr("Día de las Instituciones de Cantabria")),
+                rule=SUN_TO_NONE,
+            )
 
-        if self._year not in {2013, 2019, 2024}:
-            # Our Lady of Bien Aparecida.
-            self._add_holiday_sep_15(tr("La Bien Aparecida"))
+        # Our Lady of Bien Aparecida.
+        self._add_observed(self._add_holiday_sep_15(tr("La Bien Aparecida")), rule=SUN_TO_NONE)
+
+        if self._year == 2008:
+            # National Day.
+            self._move_holiday(self._add_holiday_oct_12(tr("Fiesta Nacional de España")))
 
         if self._year == 2015:
+            # All Saints' Day.
             self._move_holiday(self._add_all_saints_day(tr("Todos los Santos")))
 
+        if self._year == 2009 or self._year >= 2026:
+            # Constitution Day.
+            self._move_holiday(self._add_holiday_dec_6(tr("Día de la Constitución Española")))
+
         if self._year == 2019:
+            # Immaculate Conception.
             self._move_holiday(self._add_immaculate_conception_day(tr("Inmaculada Concepción")))
 
-        if self._year in {2016, 2022}:
+        if self._year >= 2016:
+            # Christmas Day.
             self._move_holiday(self._add_christmas_day(tr("Natividad del Señor")))
 
     def _populate_subdiv_ce_public_holidays(self):
         if self._year == 2012:
+            # New Year's Day.
             self._move_holiday(self._add_new_years_day(tr("Año Nuevo")))
 
-        if self._year in {2013, 2019}:
-            self._move_holiday(self._add_epiphany_day(tr("Epifanía del Señor")))
+        # Epiphany.
+        self._move_holiday(self._add_epiphany_day(tr("Epifanía del Señor")))
 
+        # Maundy Thursday.
         self._add_holy_thursday(tr("Jueves Santo"))
 
         if self._year == 2011:
+            # Labor Day.
             self._move_holiday(self._add_labor_day(tr("Fiesta del Trabajo")))
 
+        # Saint Anthony's Day.
+        self._move_holiday(self._add_saint_anthonys_day(tr("San Antonio")))
+
         if self._year >= 2022:
             # Santa Maria of Africa.
             self._add_holiday_aug_5(tr("Nuestra Señora de África"))
 
-        if self._year not in {2011, 2012, 2015, 2018, 2025}:
+        if self._year not in {2011, 2015, 2025}:
             # Ceuta Day.
-            self._add_holiday_sep_2(tr("Día de Ceuta"))
+            self._add_observed(self._add_holiday_sep_2(tr("Día de Ceuta")), rule=SUN_TO_NONE)
 
-        if self._year == 2014:
+        if self._year <= 2014:
+            # National Day.
             self._move_holiday(self._add_holiday_oct_12(tr("Fiesta Nacional de España")))
 
-        if self._year == 2015:
+        if self._year <= 2015:
+            # All Saints' Day.
             self._move_holiday(self._add_all_saints_day(tr("Todos los Santos")))
 
-        if self._year in {2015, 2020}:
+        if self._year <= 2020:
+            # Constitution Day.
             self._move_holiday(self._add_holiday_dec_6(tr("Día de la Constitución Española")))
 
         if self._year == 2013:
+            # Immaculate Conception.
             self._move_holiday(self._add_immaculate_conception_day(tr("Inmaculada Concepción")))
 
-        if self._year in {2011, 2016}:
+        if self._year <= 2016:
+            # Christmas Day.
             self._move_holiday(self._add_christmas_day(tr("Natividad del Señor")))
 
         # Eid al-Adha.
@@ -358,122 +421,150 @@ class Spain(
             self._add_eid_al_adha_day(name)
 
     def _populate_subdiv_cl_public_holidays(self):
-        if self._year in {2017, 2023}:
+        if self._year >= 2017:
+            # New Year's Day.
             self._move_holiday(self._add_new_years_day(tr("Año Nuevo")))
 
-        if self._year in {2013, 2019}:
-            self._move_holiday(self._add_epiphany_day(tr("Epifanía del Señor")))
+        # Epiphany.
+        self._move_holiday(self._add_epiphany_day(tr("Epifanía del Señor")))
 
-        if self._year in {2010, 2012}:
+        if self._year in {2009, 2010, 2012}:
+            # Saint Joseph's Day.
             self._add_saint_josephs_day(tr("San José"))
 
+        # Maundy Thursday.
         self._add_holy_thursday(tr("Jueves Santo"))
 
         if self._year != 2023:
             # Castile and León Day.
             self._move_holiday(self._add_holiday_apr_23(tr("Fiesta de Castilla y León")))
 
-        if self._year in {2016, 2022}:
+        if self._year >= 2016:
+            # Labor Day.
             self._move_holiday(self._add_labor_day(tr("Fiesta del Trabajo")))
 
         if self._year in {2011, 2023}:
+            # Saint James' Day.
             self._add_saint_james_day(tr("Santiago Apóstol"))
 
-        if self._year == 2021:
+        if self._year >= 2021:
+            # Assumption Day.
             self._move_holiday(self._add_assumption_of_mary_day(tr("Asunción de la Virgen")))
 
-        if self._year in {2014, 2025}:
-            self._move_holiday(self._add_holiday_oct_12(tr("Fiesta Nacional de España")))
+        # National Day.
+        self._move_holiday(self._add_holiday_oct_12(tr("Fiesta Nacional de España")))
 
-        if self._year in {2015, 2020}:
-            self._move_holiday(self._add_all_saints_day(tr("Todos los Santos")))
+        # All Saints' Day.
+        self._move_holiday(self._add_all_saints_day(tr("Todos los Santos")))
 
-        if self._year in {2015, 2020}:
+        if self._year >= 2015:
+            # Constitution Day.
             self._move_holiday(self._add_holiday_dec_6(tr("Día de la Constitución Española")))
 
-        if self._year in {2013, 2019, 2024}:
-            self._move_holiday(self._add_immaculate_conception_day(tr("Inmaculada Concepción")))
+        # Immaculate Conception.
+        self._move_holiday(self._add_immaculate_conception_day(tr("Inmaculada Concepción")))
 
-        if self._year in {2011, 2016, 2022}:
-            self._move_holiday(self._add_christmas_day(tr("Natividad del Señor")))
+        # Christmas Day.
+        self._move_holiday(self._add_christmas_day(tr("Natividad del Señor")))
 
     def _populate_subdiv_cm_public_holidays(self):
-        if self._year == 2013:
+        if self._year <= 2013:
+            # Epiphany.
             self._move_holiday(self._add_epiphany_day(tr("Epifanía del Señor")))
 
-        if self._year in {2010, 2011, 2020}:
+        if self._year in {2008, 2009, 2010, 2011, 2020}:
             # Saint Joseph's Day.
             self._add_saint_josephs_day(tr("San José"))
 
+        # Maundy Thursday.
         self._add_holy_thursday(tr("Jueves Santo"))
 
-        if self._year in {2014, 2015, 2019, 2020}:
+        if self._year in {2014, 2015, 2019, 2020, 2026}:
+            # Easter Monday.
             self._add_easter_monday(tr("Lunes de Pascua"))
 
-        if self._year not in {2010, 2018}:
+        if self._year not in {2009, 2010, 2018}:
             # Corpus Christi.
             self._add_corpus_christi_day(tr("Corpus Christi"))
 
-        if self._year not in {2015, 2020}:
-            # Castilla-La Mancha Day.
-            self._add_holiday_may_31(tr("Día de Castilla-La Mancha"))
+        # Castilla-La Mancha Day.
+        may_31 = self._add_holiday_may_31(tr("Día de Castilla-La Mancha"))
+        if self._year <= 2009:
+            self._move_holiday(may_31, show_observed_label=False)
+        else:
+            self._add_observed(may_31, rule=SUN_TO_NONE)
 
-        if self._year == 2015:
+        if self._year >= 2026:
+            # All Saints' Day.
+            self._move_holiday(self._add_all_saints_day(tr("Todos los Santos")))
+
+        if self._year <= 2015:
+            # Constitution Day.
             self._move_holiday(self._add_holiday_dec_6(tr("Día de la Constitución Española")))
 
-        if self._year in {2016, 2022}:
+        if self._year >= 2016:
+            # Christmas Day.
             self._move_holiday(self._add_christmas_day(tr("Natividad del Señor")))
 
     def _populate_subdiv_cn_public_holidays(self):
-        if self._year in {2013, 2019}:
-            self._move_holiday(self._add_epiphany_day(tr("Epifanía del Señor")))
+        # Epiphany.
+        self._move_holiday(self._add_epiphany_day(tr("Epifanía del Señor")))
 
+        # Maundy Thursday.
         self._add_holy_thursday(tr("Jueves Santo"))
 
         if self._year == 2016:
+            # Labor Day.
             self._move_holiday(self._add_labor_day(tr("Fiesta del Trabajo")))
 
         if self._year != 2021:
             # Day of the Canary Islands.
             self._move_holiday(self._add_holiday_may_30(tr("Día de Canarias")))
 
-        if self._year == 2021:
+        if self._year >= 2021:
+            # Assumption Day.
             self._move_holiday(self._add_assumption_of_mary_day(tr("Asunción de la Virgen")))
 
-        if self._year == 2015:
+        if self._year == 2015 or self._year >= 2026:
+            # All Saints' Day.
             self._move_holiday(self._add_all_saints_day(tr("Todos los Santos")))
 
-        if self._year == 2020:
+        if self._year in {2009, 2020}:
+            # Constitution Day.
             self._move_holiday(self._add_holiday_dec_6(tr("Día de la Constitución Española")))
 
-        if self._year in {2011, 2022}:
+        if self._year == 2011 or self._year >= 2022:
+            # Christmas Day.
             self._move_holiday(self._add_christmas_day(tr("Natividad del Señor")))
 
     def _populate_subdiv_ct_public_holidays(self):
+        # Easter Monday.
         self._add_easter_monday(tr("Lunes de Pascua"))
 
-        if self._year in {2011, 2016, 2022}:
+        # Add when Labor Day or Christmas Day falls on Sunday.
+        if self._is_sunday(MAY, 1):
             # Whit Monday.
             self._add_whit_monday(tr("Día de la Pascua Granada"))
 
-        if self._year not in {2012, 2018}:
-            # Saint John the Baptist.
-            self._add_saint_johns_day(tr("San Juan"))
+        # Saint John the Baptist.
+        self._add_observed(self._add_saint_johns_day(tr("San Juan")), rule=SUN_TO_NONE)
 
-        if self._year not in {2011, 2022}:
+        self._add_observed(
             # National Day of Catalonia.
-            self._add_holiday_sep_11(tr("Fiesta Nacional de Cataluña"))
+            self._add_holiday_sep_11(tr("Fiesta Nacional de Cataluña")),
+            rule=SUN_TO_NONE,
+        )
 
-        if self._year not in {2010, 2021}:
-            # Saint Stephen's Day.
-            self._add_christmas_day_two(tr("San Esteban"))
+        # Saint Stephen's Day.
+        self._add_observed(self._add_christmas_day_two(tr("San Esteban")), rule=SUN_TO_NONE)
 
     def _populate_subdiv_ex_public_holidays(self):
         if self._year == 2012:
+            # New Year's Day.
             self._move_holiday(self._add_new_years_day(tr("Año Nuevo")))
 
-        if self._year in {2013, 2019}:
-            self._move_holiday(self._add_epiphany_day(tr("Epifanía del Señor")))
+        # Epiphany.
+        self._move_holiday(self._add_epiphany_day(tr("Epifanía del Señor")))
 
         if self._year in {2023, 2024}:
             # Shrove Tuesday.
@@ -483,157 +574,230 @@ class Spain(
             # Saint Joseph's Day.
             self._move_holiday(self._add_saint_josephs_day(tr("San José")))
 
+        # Maundy Thursday.
         self._add_holy_thursday(tr("Jueves Santo"))
 
-        if self._year in {2011, 2016, 2022}:
-            self._move_holiday(self._add_labor_day(tr("Fiesta del Trabajo")))
+        # Labor Day.
+        self._move_holiday(self._add_labor_day(tr("Fiesta del Trabajo")))
 
         if self._year != 2024:
             # Extremadura Day.
             self._move_holiday(self._add_holiday_sep_8(tr("Día de Extremadura")))
 
-        if self._year in {2014, 2025}:
-            self._move_holiday(self._add_holiday_oct_12(tr("Fiesta Nacional de España")))
+        # National Day.
+        self._move_holiday(self._add_holiday_oct_12(tr("Fiesta Nacional de España")))
 
-        if self._year in {2015, 2020}:
-            self._move_holiday(self._add_all_saints_day(tr("Todos los Santos")))
+        # All Saints' Day.
+        self._move_holiday(self._add_all_saints_day(tr("Todos los Santos")))
 
-        if self._year in {2015, 2020}:
-            self._move_holiday(self._add_holiday_dec_6(tr("Día de la Constitución Española")))
+        # Constitution Day.
+        self._move_holiday(self._add_holiday_dec_6(tr("Día de la Constitución Española")))
 
-        if self._year in {2013, 2019, 2024}:
-            self._move_holiday(self._add_immaculate_conception_day(tr("Inmaculada Concepción")))
+        # Immaculate Conception.
+        self._move_holiday(self._add_immaculate_conception_day(tr("Inmaculada Concepción")))
 
-        if self._year in {2011, 2016, 2022}:
-            self._move_holiday(self._add_christmas_day(tr("Natividad del Señor")))
+        # Christmas Day.
+        self._move_holiday(self._add_christmas_day(tr("Natividad del Señor")))
 
     def _populate_subdiv_ga_public_holidays(self):
-        if self._year in {2010, 2011} or 2019 <= self._year <= 2021:
+        if self._year in {2008, 2009, 2010, 2011, 2019, 2020, 2021, 2026}:
+            # Saint Joseph's Day.
             self._move_holiday(self._add_saint_josephs_day(tr("San José")))
 
+        # Maundy Thursday.
         self._add_holy_thursday(tr("Jueves Santo"))
 
-        if self._year not in {2015, 2020}:
+        self._add_observed(
             # Galician Literature Day.
-            self._add_holiday_may_17(tr("Día de las Letras Gallegas"))
+            self._add_holiday_may_17(tr("Día de las Letras Gallegas")),
+            rule=SUN_TO_NONE,
+        )
 
-        if self._year in {2013, 2016, 2020, 2022}:
+        if self._year in {2013, 2016, 2020, 2022, 2026}:
+            # Saint John the Baptist.
             self._add_saint_johns_day(tr("San Juan"))
 
-        if self._year != 2021:
+        self._add_observed(
             # Galician National Day.
-            self._add_holiday_jul_25(tr("Día Nacional de Galicia"))
+            self._add_holiday_jul_25(tr("Día Nacional de Galicia")),
+            rule=SUN_TO_NONE,
+        )
 
         if self._year == 2015:
+            # All Saints' Day.
             self._move_holiday(self._add_all_saints_day(tr("Todos los Santos")))
 
+        if self._year == 2009:
+            # Constitution Day.
+            self._move_holiday(self._add_holiday_dec_6(tr("Día de la Constitución Española")))
+
     def _populate_subdiv_ib_public_holidays(self):
-        if self._year not in {2015, 2020}:
-            # Day of the Balearic Islands.
-            self._add_holiday_mar_1(tr("Día de las Islas Baleares"))
+        # Day of the Balearic Islands.
+        mar_1 = self._add_holiday_mar_1(tr("Día de las Islas Baleares"))
+        if self._year >= 2026:
+            self._move_holiday(mar_1)
+        else:
+            self._add_observed(mar_1, rule=SUN_TO_NONE)
 
+        # Maundy Thursday.
         self._add_holy_thursday(tr("Jueves Santo"))
 
         if self._year not in {2014, 2025}:
+            # Easter Monday.
             self._add_easter_monday(tr("Lunes de Pascua"))
 
+        if self._year == 2008:
+            # National Day.
+            self._move_holiday(self._add_holiday_oct_12(tr("Fiesta Nacional de España")))
+
         if self._year == 2015:
+            # All Saints' Day.
             self._move_holiday(self._add_all_saints_day(tr("Todos los Santos")))
 
-        if self._year in {2015, 2020}:
+        if self._year <= 2020:
+            # Constitution Day.
             self._move_holiday(self._add_holiday_dec_6(tr("Día de la Constitución Española")))
 
-        if self._year in {2011, 2016, 2022}:
-            self._move_holiday(self._add_christmas_day(tr("Natividad del Señor")))
+        # Christmas Day.
+        self._move_holiday(self._add_christmas_day(tr("Natividad del Señor")))
 
-        if self._year in {2013, 2014, 2019, 2020, 2025}:
+        if self._year in {2008, 2009, 2013, 2014, 2019, 2020, 2025, 2026}:
+            # Saint Stephen's Day.
             self._add_christmas_day_two(tr("San Esteban"))
 
     def _populate_subdiv_mc_public_holidays(self):
-        if self._year in {2017, 2023}:
+        if self._year >= 2017:
+            # New Year's Day.
             self._move_holiday(self._add_new_years_day(tr("Año Nuevo")))
 
-        if self._year in {2013, 2019}:
+        if self._year >= 2013:
+            # Epiphany.
             self._move_holiday(self._add_epiphany_day(tr("Epifanía del Señor")))
 
-        if (self._year <= 2021 and self._year != 2017) or self._year in {2024, 2025}:
-            self._move_holiday(self._add_saint_josephs_day(tr("San José")))
+        if self._year != 2022:
+            # Saint Joseph's Day.
+            self._add_observed(self._add_saint_josephs_day(tr("San José")), rule=SUN_TO_NONE)
 
+        # Maundy Thursday.
         self._add_holy_thursday(tr("Jueves Santo"))
 
-        if self._year in {2011, 2022}:
+        if self._year == 2011 or self._year >= 2022:
+            # Labor Day.
             self._move_holiday(self._add_labor_day(tr("Fiesta del Trabajo")))
 
         if self._year not in {2013, 2024}:
             # Murcia Day.
             self._move_holiday(self._add_holiday_jun_9(tr("Día de la Región de Murcia")))
 
-        if self._year in {2015, 2020}:
-            self._move_holiday(self._add_holiday_dec_6(tr("Día de la Constitución Española")))
+        if self._year == 2008:
+            # National Day.
+            self._move_holiday(self._add_holiday_oct_12(tr("Fiesta Nacional de España")))
+
+        # Constitution Day.
+        self._move_holiday(self._add_holiday_dec_6(tr("Día de la Constitución Española")))
 
-        if self._year in {2013, 2024}:
+        if self._year == 2013 or self._year >= 2024:
+            # Immaculate Conception.
             self._move_holiday(self._add_immaculate_conception_day(tr("Inmaculada Concepción")))
 
-        if self._year in {2016, 2022}:
+        if self._year >= 2016:
+            # Christmas Day.
             self._move_holiday(self._add_christmas_day(tr("Natividad del Señor")))
 
     def _populate_subdiv_md_public_holidays(self):
-        if self._year in {2013, 2019}:
-            self._move_holiday(self._add_epiphany_day(tr("Epifanía del Señor")))
-
-        if self._year in {2010, 2012, 2015, 2017, 2021, 2023}:
+        # Epiphany.
+        self._move_holiday(self._add_epiphany_day(tr("Epifanía del Señor")))
+
+        # Add when New Year's Day, Assumption Day, or All Saints' Day (until 2015) falls on Sunday.
+        if (
+            self._is_sunday(JAN, 1)
+            or self._is_sunday(AUG, 15)
+            or (self._year <= 2015 and self._is_sunday(NOV, 1))
+        ):
+            # Saint Joseph's Day.
             self._move_holiday(self._add_saint_josephs_day(tr("San José")))
 
+        # Maundy Thursday.
         self._add_holy_thursday(tr("Jueves Santo"))
 
         if self._year != 2010:
             # Madrid Day.
             self._move_holiday(self._add_holiday_may_2(tr("Fiesta de la Comunidad de Madrid")))
 
-        if self._year in {2010, 2011, 2014}:
+        if self._year in {2009, 2010, 2011, 2014}:
+            # Corpus Christi.
             self._add_corpus_christi_day(tr("Corpus Christi"))
 
-        if self._year in {2011, 2016, 2022, 2024, 2025}:
+        # Add when Labor Day falls on Sunday.
+        if self._is_sunday(MAY, 1) or self._year in {2008, 2024, 2025}:
+            # Saint James' Day.
             self._add_saint_james_day(tr("Santiago Apóstol"))
 
-        if self._year == 2020:
+        if self._year >= 2020:
+            # All Saints' Day.
             self._move_holiday(self._add_all_saints_day(tr("Todos los Santos")))
 
-        if self._year == 2020:
+            # Constitution Day.
             self._move_holiday(self._add_holiday_dec_6(tr("Día de la Constitución Española")))
 
         if self._year == 2019:
+            # Immaculate Conception.
             self._move_holiday(self._add_immaculate_conception_day(tr("Inmaculada Concepción")))
 
-        if self._year in {2016, 2022}:
+        if self._year >= 2016:
+            # Christmas Day.
             self._move_holiday(self._add_christmas_day(tr("Natividad del Señor")))
 
     def _populate_subdiv_ml_public_holidays(self):
         if self._year == 2017:
+            # New Year's Day.
             self._move_holiday(self._add_new_years_day(tr("Año Nuevo")))
 
-        if self._year in {2013, 2019}:
-            self._move_holiday(self._add_epiphany_day(tr("Epifanía del Señor")))
+        # Epiphany.
+        self._move_holiday(self._add_epiphany_day(tr("Epifanía del Señor")))
 
-        if self._year in {2020, 2021}:
+        if self._year in {2020, 2021, 2023}:
             # Statute of Autonomy of Melilla Day.
             self._add_holiday_mar_13(tr("Estatuto de Autonomía de la Ciudad de Melilla"))
 
         if self._year <= 2016:
+            # Saint Joseph's Day.
             self._add_saint_josephs_day(tr("San José"))
 
+        # Maundy Thursday.
         self._add_holy_thursday(tr("Jueves Santo"))
 
-        if self._year in {2015, 2020}:
-            self._move_holiday(self._add_holiday_dec_6(tr("Día de la Constitución Española")))
+        if self._year != 2024:
+            self._move_holiday(
+                self._add_nativity_of_mary_day(
+                    # Day of Our Lady of Victory.
+                    tr("Día de Nuestra Señora la Virgen de la Victoria")
+                )
+            )
+
+        if self._year != 2023:
+            # Melilla Day.
+            self._move_holiday(self._add_holiday_sep_17(tr("Día de Melilla")))
+
+        if self._year == 2008:
+            # National Day.
+            self._move_holiday(self._add_holiday_oct_12(tr("Fiesta Nacional de España")))
 
-        if self._year in {2019, 2024}:
+        if self._year == 2009:
+            # All Saints' Day.
+            self._move_holiday(self._add_all_saints_day(tr("Todos los Santos")))
+
+        # Constitution Day.
+        self._move_holiday(self._add_holiday_dec_6(tr("Día de la Constitución Española")))
+
+        if self._year >= 2019:
+            # Immaculate Conception.
             self._move_holiday(self._add_immaculate_conception_day(tr("Inmaculada Concepción")))
 
-        if self._year in {2011, 2016, 2022}:
-            self._move_holiday(self._add_christmas_day(tr("Natividad del Señor")))
+        # Christmas Day.
+        self._move_holiday(self._add_christmas_day(tr("Natividad del Señor")))
 
-        if self._year in {2022, 2023, 2025}:
+        if self._year >= 2022:
             # Eid al-Fitr.
             self._add_eid_al_fitr_day(tr("Fiesta del Eid Fitr"))
 
@@ -647,90 +811,130 @@ class Spain(
             self._add_eid_al_adha_day(name)
 
     def _populate_subdiv_nc_public_holidays(self):
-        if self._year in {2013, 2019}:
+        if self._year >= 2013:
+            # Epiphany.
             self._move_holiday(self._add_epiphany_day(tr("Epifanía del Señor")))
 
-        if self._year in {2010, 2012, 2014, 2015, 2019, 2020, 2021}:
+        if self._year in {2008, 2009, 2010, 2012, 2014, 2015, 2019, 2020, 2021, 2026}:
+            # Saint Joseph's Day.
             self._add_saint_josephs_day(tr("San José"))
 
+        # Maundy Thursday.
         self._add_holy_thursday(tr("Jueves Santo"))
 
+        # Easter Monday.
         self._add_easter_monday(tr("Lunes de Pascua"))
 
-        if self._year in {2011, 2013, 2015, 2016, 2017} or self._year >= 2022:
+        if self._year in {2008, 2009, 2011, 2013, 2015, 2016, 2017, 2022, 2023, 2024, 2025}:
+            # Saint James' Day.
             self._add_saint_james_day(tr("Santiago Apóstol"))
 
+        if self._year >= 2026:
+            # All Saints' Day.
+            self._move_holiday(self._add_all_saints_day(tr("Todos los Santos")))
+
         # Saint Francis Xavier's Day.
         self._move_holiday(self._add_holiday_dec_3(tr("San Francisco Javier")))
 
         if self._year == 2020:
+            # Constitution Day.
             self._move_holiday(self._add_holiday_dec_6(tr("Día de la Constitución Española")))
 
-        if self._year in {2011, 2016, 2022}:
-            self._move_holiday(self._add_christmas_day(tr("Natividad del Señor")))
+        # Christmas Day.
+        self._move_holiday(self._add_christmas_day(tr("Natividad del Señor")))
 
     def _populate_subdiv_pv_public_holidays(self):
-        if self._year in {2010, 2015, 2019, 2020, 2021}:
+        # Add when Epiphany (non-País Vasco Day years), Assumption Day,
+        # or All Saints' Day falls on Sunday.
+        if (
+            ((self._year <= 2010 or self._year >= 2015) and self._is_sunday(JAN, 6))
+            or self._is_sunday(AUG, 15)
+            or self._is_sunday(NOV, 1)
+        ):
+            # Saint Joseph's Day.
             self._add_saint_josephs_day(tr("San José"))
 
+        # Maundy Thursday.
         self._add_holy_thursday(tr("Jueves Santo"))
 
+        # Easter Monday.
         self._add_easter_monday(tr("Lunes de Pascua"))
 
-        if self._year not in {2010, 2012, 2014, 2018, 2021}:
-            self._add_saint_james_day(tr("Santiago Apóstol"))
+        if self._year not in {2012, 2014, 2018}:
+            # Saint James' Day.
+            self._add_observed(self._add_saint_james_day(tr("Santiago Apóstol")), rule=SUN_TO_NONE)
 
         if 2011 <= self._year <= 2014:
             # País Vasco Day.
             self._add_holiday_oct_25(tr("Día del País Vasco"))
 
     def _populate_subdiv_ri_public_holidays(self):
-        if self._year in {2010, 2012}:
+        if self._year in {2009, 2010, 2012}:
+            # Saint Joseph's Day.
             self._add_saint_josephs_day(tr("San José"))
 
+        # Maundy Thursday.
         self._add_holy_thursday(tr("Jueves Santo"))
 
-        if self._year not in {2010, 2012, 2018}:
+        if self._year not in {2009, 2010, 2012, 2018}:
+            # Easter Monday.
             self._add_easter_monday(tr("Lunes de Pascua"))
 
         # La Rioja Day.
         self._move_holiday(self._add_holiday_jun_9(tr("Día de La Rioja")))
 
-        if self._year in {2011, 2016}:
+        # Add when Christmas Day (until 2016) falls on Sunday.
+        if (self._year <= 2016 and self._is_sunday(DEC, 25)) or self._year == 2008:
+            # Saint James' Day.
             self._add_saint_james_day(tr("Santiago Apóstol"))
 
-        if self._year in {2015, 2020}:
-            self._move_holiday(self._add_holiday_dec_6(tr("Día de la Constitución Española")))
+        # Constitution Day.
+        self._move_holiday(self._add_holiday_dec_6(tr("Día de la Constitución Española")))
 
-        if self._year in {2013, 2019}:
+        if self._year <= 2019:
+            # Immaculate Conception.
             self._move_holiday(self._add_immaculate_conception_day(tr("Inmaculada Concepción")))
 
-        if self._year == 2022:
+        if self._year >= 2022:
+            # Christmas Day.
             self._move_holiday(self._add_christmas_day(tr("Natividad del Señor")))
 
     def _populate_subdiv_vc_public_holidays(self):
-        if (self._year <= 2022 and self._year != 2017) or self._year in {2024, 2025}:
-            self._add_saint_josephs_day(tr("San José"))
-
-        if self._year in {2011, 2016, 2017, 2022}:
+        # Saint Joseph's Day.
+        self._add_observed(self._add_saint_josephs_day(tr("San José")), rule=SUN_TO_NONE)
+
+        # Add when Saint Joseph's Day (until 2017) or Valencian Community Day falls on Sunday.
+        if (
+            (self._year <= 2017 and self._is_sunday(MAR, 19))
+            or self._is_sunday(OCT, 9)
+            or self._year in {2008, 2009}
+        ):
+            # Maundy Thursday.
             self._add_holy_thursday(tr("Jueves Santo"))
 
+        # Easter Monday.
         self._add_easter_monday(tr("Lunes de Pascua"))
 
         if self._year == 2011:
+            # Labor Day.
             self._move_holiday(self._add_labor_day(tr("Fiesta del Trabajo")))
 
         if self._year >= 2019:
+            # Saint John the Baptist.
             self._add_saint_johns_day(tr("San Juan"))
 
-        if self._year not in {2011, 2016, 2022}:
+        self._add_observed(
             # Valencian Community Day.
-            self._add_holiday_oct_9(tr("Día de la Comunidad Valenciana"))
+            self._add_holiday_oct_9(tr("Día de la Comunidad Valenciana")),
+            rule=SUN_TO_NONE,
+        )
 
         if self._year == 2015:
+            # Constitution Day.
             self._move_holiday(self._add_holiday_dec_6(tr("Día de la Constitución Española")))
 
         if self._year == 2016:
+            # Christmas Day.
             self._move_holiday(self._add_christmas_day(tr("Natividad del Señor")))
 
 
@@ -743,7 +947,7 @@ class ESP(Spain):
 
 
 class SpainIslamicHolidays(_CustomIslamicHolidays):
-    EID_AL_ADHA_DATES_CONFIRMED_YEARS = (2010, 2025)
+    EID_AL_ADHA_DATES_CONFIRMED_YEARS = (2010, 2026)
     EID_AL_ADHA_DATES = {
         2010: (NOV, 17),
         2012: (OCT, 25),
@@ -755,7 +959,7 @@ class SpainIslamicHolidays(_CustomIslamicHolidays):
         2024: (JUN, 17),
     }
 
-    EID_AL_FITR_DATES_CONFIRMED_YEARS = (2022, 2025)
+    EID_AL_FITR_DATES_CONFIRMED_YEARS = (2022, 2026)
     EID_AL_FITR_DATES = {
         2022: (MAY, 3),
         2025: (MAR, 31),