holidays 0.55__py3-none-any.whl → 0.57__py3-none-any.whl

holidays/countries/russia.py

@@ -12,15 +12,16 @@
 
 from gettext import gettext as tr
 
-from holidays.calendars.gregorian import JAN, FEB, MAR, APR, MAY, JUN, NOV, DEC
+from holidays.calendars.gregorian import JAN, FEB, MAR, APR, MAY, JUN, JUL, NOV, DEC
 from holidays.calendars.julian import JULIAN_CALENDAR
 from holidays.groups import ChristianHolidays, InternationalHolidays, StaticHolidays
-from holidays.holiday_base import HolidayBase
+from holidays.observed_holiday_base import ObservedHolidayBase
 
 
-class Russia(HolidayBase, ChristianHolidays, InternationalHolidays, StaticHolidays):
+class Russia(ObservedHolidayBase, ChristianHolidays, InternationalHolidays, StaticHolidays):
     """
     https://en.wikipedia.org/wiki/Public_holidays_in_Russia
+    https://ru.wikipedia.org/wiki/Праздники_России
     """
 
     country = "RU"
@@ -119,6 +120,190 @@ class RussiaStaticHolidays:
     substituted_label = tr("Выходной (перенесено с %s)")
 
     special_public_holidays = {
+        # Substituted Holidays 1991
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        1991: (
+            (MAY, 3, MAY, 5),
+            (MAY, 10, MAY, 12),
+        ),
+        # Substituted Holidays 1994
+        # src: https://www.consultant.ru/document/cons_doc_LAW_3235/
+        1994: (MAR, 7, MAR, 5),
+        # Substituted Holidays 1995
+        # src: https://www.consultant.ru/document/cons_doc_LAW_6316/
+        #      https://www.consultant.ru/document/cons_doc_LAW_8134/
+        #      https://www.consultant.ru/document/cons_doc_LAW_8499/
+        1995: (
+            (MAY, 8, MAY, 6),
+            (NOV, 6, NOV, 4),
+            (DEC, 11, DEC, 9),
+        ),
+        # Substituted Holidays 1996
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        1996: (
+            (MAY, 3, MAY, 5),
+            (MAY, 10, MAY, 12),
+            (JUL, 3, DEC, 14),
+            (NOV, 8, NOV, 10),
+            (DEC, 13, DEC, 15),
+        ),
+        # Substituted Holidays 1997
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        1997: (
+            (JAN, 3, JAN, 5),
+            (JUN, 13, JUN, 15),
+        ),
+        # Substituted Holidays 1999
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        1999: (JAN, 8, JAN, 10),
+        # Substituted Holidays 2000
+        # src: https://www.consultant.ru/document/cons_doc_LAW_25401/
+        2000: (
+            (MAY, 8, MAY, 6),
+            (NOV, 6, NOV, 4),
+            (DEC, 11, DEC, 9),
+        ),
+        # Substituted Holidays 2001
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        2001: (
+            (MAR, 9, MAR, 11),
+            (APR, 30, APR, 28),
+            (JUN, 11, JUN, 9),
+            (DEC, 31, DEC, 29),
+        ),
+        # Substituted Holidays 2002
+        # src: https://www.consultant.ru/document/cons_doc_LAW_33943/
+        2002: (
+            (MAY, 3, APR, 27),
+            (MAY, 10, MAY, 18),
+            (NOV, 8, NOV, 10),
+            (DEC, 13, DEC, 15),
+        ),
+        # Substituted Holidays 2003
+        # src: https://www.consultant.ru/document/cons_doc_LAW_39997/16abd0212dcc02f64a1daed24286d2ffc2a4a9e9/
+        2003: (
+            (JAN, 3, JAN, 4),
+            (JAN, 6, JAN, 5),
+            (JUN, 13, JUN, 21),
+        ),
+        # Substituted Holidays 2005
+        # src: https://www.consultant.ru/document/cons_doc_LAW_50948/
+        #      https://ru.wikipedia.org/wiki/Праздники_России
+        2005: (
+            (MAR, 7, MAR, 5),
+            (MAY, 10, MAY, 14),
+        ),
+        # Substituted Holidays 2006
+        # src: https://www.consultant.ru/document/cons_doc_LAW_57425/
+        2006: (
+            (FEB, 24, FEB, 26),
+            (MAY, 8, MAY, 6),
+        ),
+        # Substituted Holidays 2007
+        # src: https://www.consultant.ru/document/cons_doc_LAW_63838/
+        2007: (
+            (APR, 30, APR, 28),
+            (JUN, 11, JUN, 9),
+            (DEC, 31, DEC, 29),
+        ),
+        # Substituted Holidays 2008
+        # src: https://www.consultant.ru/document/cons_doc_LAW_70469/
+        2008: (
+            (MAY, 2, MAY, 4),
+            (JUN, 13, JUN, 7),
+            (NOV, 3, NOV, 1),
+        ),
+        # Substituted Holidays 2009
+        # src: https://www.consultant.ru/document/cons_doc_LAW_81981/
+        2009: (JAN, 9, JAN, 11),
+        # Substituted Holidays 2010
+        # src: https://www.consultant.ru/document/cons_doc_LAW_93374/
+        2010: (
+            (FEB, 22, FEB, 27),
+            (NOV, 5, NOV, 13),
+        ),
+        # Substituted Holidays 2011
+        # src: https://www.consultant.ru/document/cons_doc_LAW_103530/
+        2011: (MAR, 7, MAR, 5),
+        # Substituted Holidays 2012
+        # src: https://www.consultant.ru/document/cons_doc_LAW_117190/
+        2012: (
+            (MAR, 9, MAR, 11),
+            (APR, 30, APR, 28),
+            (MAY, 7, MAY, 5),
+            (MAY, 8, MAY, 12),
+            (JUN, 11, JUN, 9),
+            (DEC, 31, DEC, 29),
+        ),
+        # Substituted Holidays 2013
+        # src: https://www.consultant.ru/document/cons_doc_LAW_136654/
+        2013: (
+            (MAY, 2, JAN, 5),
+            (MAY, 3, JAN, 6),
+            (MAY, 10, FEB, 25),
+        ),
+        # Substituted Holidays 2014
+        # src: https://www.consultant.ru/document/cons_doc_LAW_146983/
+        2014: (
+            (MAY, 2, JAN, 4),
+            (JUN, 13, JAN, 5),
+            (NOV, 3, FEB, 24),
+        ),
+        # Substituted Holidays 2015
+        # src: https://www.consultant.ru/document/cons_doc_LAW_167928/
+        2015: (
+            (JAN, 9, JAN, 3),
+            (MAY, 4, JAN, 4),
+        ),
+        # Substituted Holidays 2016
+        # src: https://www.consultant.ru/document/cons_doc_LAW_186505/
+        2016: (
+            (MAY, 3, JAN, 2),
+            (MAR, 7, JAN, 3),
+            (FEB, 22, FEB, 20),
+        ),
+        # Substituted Holidays 2017
+        # src: https://www.consultant.ru/document/cons_doc_LAW_202871/
+        2017: (
+            (FEB, 24, JAN, 1),
+            (MAY, 8, JAN, 7),
+        ),
+        # Substituted Holidays 2018
+        # src: https://www.consultant.ru/document/cons_doc_LAW_280526/
+        2018: (
+            (MAR, 9, JAN, 6),
+            (MAY, 2, JAN, 7),
+            (APR, 30, APR, 28),
+            (JUN, 11, JUN, 9),
+            (DEC, 31, DEC, 29),
+        ),
+        # Substituted Holidays 2019
+        # src: https://www.consultant.ru/document/cons_doc_LAW_307996/
+        2019: (
+            (MAY, 2, JAN, 5),
+            (MAY, 3, JAN, 6),
+            (MAY, 10, FEB, 23),
+        ),
+        # Substituted Holidays 2020
+        # src: https://www.consultant.ru/document/cons_doc_law_328918/
+        2020: (
+            (MAY, 4, JAN, 4),
+            (MAY, 5, JAN, 5),
+        ),
+        # Substituted Holidays 2021
+        # src: https://www.consultant.ru/document/cons_doc_law_365179/
+        2021: (
+            (NOV, 5, JAN, 2),
+            (DEC, 31, JAN, 3),
+            (FEB, 22, FEB, 20),
+        ),
+        # Substituted Holidays 2022
+        # src: https://www.consultant.ru/document/cons_doc_LAW_395538/
+        2022: (
+            (MAY, 3, JAN, 1),
+            (MAY, 10, JAN, 2),
+            (MAR, 7, MAR, 5),
+        ),
         # Substituted Holidays 2023
         # src: https://www.consultant.ru/document/cons_doc_LAW_425407/
         2023: (
@@ -144,3 +329,197 @@ class RussiaStaticHolidays:
             (NOV, 3, NOV, 1),
         ),
     }
+    special_public_holidays_observed = {
+        # These are cases where additional in-lieus are given
+        # without actually making weekend workdays.
+        # Substituted Holidays 1992 (observed)
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        1992: (
+            (MAY, 4, MAY, 2),
+            (MAY, 11, MAY, 9),
+            (NOV, 9, NOV, 7),
+        ),
+        # Substituted Holidays 1993 (observed)
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        1993: (
+            (JAN, 4, JAN, 2),
+            (MAY, 3, MAY, 1),
+            (MAY, 4, MAY, 2),
+            (MAY, 10, MAY, 9),
+            (JUN, 14, JUN, 12),
+            (NOV, 8, NOV, 7),
+        ),
+        # Substituted Holidays 1994 (observed)
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        1994: (
+            (JAN, 3, JAN, 1),
+            (JAN, 4, JAN, 2),
+            (MAY, 3, MAY, 1),
+            (MAY, 10, MAY, 9),
+            (JUN, 13, JUN, 12),
+        ),
+        # Substituted Holidays 1995 (observed)
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        1995: (
+            (JAN, 3, JAN, 1),
+            (JAN, 9, JAN, 7),
+        ),
+        # Substituted Holidays 1996 (observed)
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        1996: (JAN, 8, JAN, 7),
+        # Substituted Holidays 1997 (observed)
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        1997: (MAR, 10, MAR, 8),
+        # Substituted Holidays 1998 (observed)
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        1998: (
+            (MAR, 9, MAR, 8),
+            (MAY, 4, MAY, 2),
+            (MAY, 11, MAY, 9),
+            (NOV, 9, NOV, 7),
+            (DEC, 14, DEC, 12),
+        ),
+        # Substituted Holidays 1999 (observed)
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        1999: (
+            (JAN, 4, JAN, 2),
+            (MAY, 3, MAY, 1),
+            (MAY, 4, MAY, 2),
+            (MAY, 10, MAY, 9),
+            (JUN, 14, JUN, 12),
+            (NOV, 8, NOV, 7),
+            (DEC, 13, DEC, 12),
+        ),
+        # Substituted Holidays 2000 (observed)
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        2000: (
+            (JAN, 3, JAN, 1),
+            (JAN, 4, JAN, 2),
+        ),
+        # Substituted Holidays 2001 (observed)
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        2001: (JAN, 8, JAN, 7),
+        # Substituted Holidays 2002 (observed)
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        2002: (FEB, 25, FEB, 23),
+        # Substituted Holidays 2003 (observed)
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        2003: (
+            (FEB, 24, FEB, 23),
+            (MAR, 10, MAR, 8),
+        ),
+        # Substituted Holidays 2004 (observed)
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        2004: (
+            (MAY, 3, MAY, 1),
+            (MAY, 4, MAY, 2),
+            (MAY, 10, MAY, 9),
+            (JUN, 14, JUN, 12),
+            (NOV, 8, NOV, 7),
+            (DEC, 13, DEC, 12),
+        ),
+        # Substituted Holidays 2005 (observed)
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        2005: (
+            (JAN, 6, JAN, 1),
+            (JAN, 10, JAN, 2),
+            (MAY, 2, MAY, 1),
+            (JUN, 13, JUN, 12),
+        ),
+        # Substituted Holidays 2006 (observed)
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        2006: (
+            (JAN, 6, JAN, 1),
+            (JAN, 9, JAN, 7),
+            (NOV, 6, NOV, 4),
+        ),
+        # Substituted Holidays 2007 (observed)
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        2007: (
+            (JAN, 8, JAN, 7),
+            (NOV, 5, NOV, 4),
+        ),
+        # Substituted Holidays 2008 (observed)
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        2008: (
+            (JAN, 8, JAN, 5),
+            (FEB, 25, FEB, 23),
+            (MAR, 10, MAR, 8),
+        ),
+        # Substituted Holidays 2009 (observed)
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        2009: (
+            (JAN, 6, JAN, 3),
+            (JAN, 8, JAN, 4),
+            (MAR, 9, MAR, 8),
+            (MAY, 11, MAY, 9),
+        ),
+        # Substituted Holidays 2010 (observed)
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        2010: (
+            (JAN, 6, JAN, 2),
+            (JAN, 8, JAN, 3),
+            (MAY, 3, MAY, 1),
+            (MAY, 10, MAY, 9),
+            (JUN, 14, JUN, 12),
+        ),
+        # Substituted Holidays 2011 (observed)
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        2011: (
+            (JAN, 6, JAN, 1),
+            (JAN, 10, JAN, 2),
+            (MAY, 2, MAY, 1),
+            (JUN, 13, JUN, 12),
+        ),
+        # Substituted Holidays 2012 (observed)
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        2012: (
+            (JAN, 6, JAN, 1),
+            (JAN, 9, JAN, 7),
+            (NOV, 5, NOV, 4),
+        ),
+        # Substituted Holidays 2014 (observed)
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        2014: (MAR, 10, MAR, 8),
+        # Substituted Holidays 2015 (observed)
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        2015: (
+            (MAR, 9, MAR, 8),
+            (MAY, 11, MAY, 9),
+        ),
+        # Substituted Holidays 2016 (observed)
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        2016: (
+            (MAY, 2, MAY, 1),
+            (JUN, 13, JUN, 12),
+        ),
+        # Substituted Holidays 2017 (observed)
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        2017: (NOV, 6, NOV, 4),
+        # Substituted Holidays 2018 (observed)
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        2018: (NOV, 5, NOV, 4),
+        # Substituted Holidays 2020 (observed)
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        2020: (
+            (FEB, 24, FEB, 23),
+            (MAR, 9, MAR, 8),
+            (MAY, 11, MAY, 9),
+        ),
+        # Substituted Holidays 2021 (observed)
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        2021: (
+            (MAY, 3, MAY, 1),
+            (MAY, 10, MAY, 9),
+            (JUN, 14, JUN, 12),
+        ),
+        # Substituted Holidays 2022 (observed)
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        2022: (
+            (MAY, 2, MAY, 1),
+            (JUN, 13, JUN, 12),
+        ),
+        # Substituted Holidays 2023 (observed)
+        # src: https://ru.wikipedia.org/wiki/Праздники_России
+        2023: (NOV, 6, NOV, 4),
+    }

holidays/countries/slovakia.py

@@ -62,7 +62,7 @@ class Slovakia(HolidayBase, ChristianHolidays, InternationalHolidays, StaticHoli
             # Day of Victory over Fascism.
             self._add_holiday_may_8(tr("Deň víťazstva nad fašizmom"))
 
-        # St. Cyril and Methodius Day.
+        # Saints Cyril and Methodius Day.
         self._add_holiday_jul_5(tr("Sviatok svätého Cyrila a svätého Metoda"))
 
         # Slovak National Uprising Anniversary.

holidays/countries/south_korea.py

@@ -625,6 +625,8 @@ class SouthKoreaStaticHolidays:
         2020: (AUG, 17, temporary_public_holiday),
         # Added to create a 6-day long holiday period.
         2023: (OCT, 2, temporary_public_holiday),
+        # 76th Anniversary of the Armed Forces of Korea.
+        2024: (OCT, 1, armed_forces_day),
     }
     # Pre-2014 Alternate Holidays
     # https://namu.wiki/w/대체%20휴일%20제도#s-4.2.1

holidays/countries/spain.py

@@ -167,7 +167,7 @@ class Spain(
 
         self._add_holy_thursday(tr("Jueves Santo"))
 
-        # St. George's Day.
+        # 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}:
@@ -239,7 +239,7 @@ class Spain(
             self._move_holiday(self._add_labor_day(tr("Fiesta del Trabajo")))
 
         if self._year in {2012, 2013, 2014, 2019, 2024}:
-            # St. James' Day.
+            # Saint James' Day.
             self._add_saint_james_day(tr("Santiago Apóstol"))
 
         if self._year not in {2012, 2015, 2019, 2024}:
@@ -348,7 +348,7 @@ class Spain(
             self._move_holiday(self._add_epiphany_day(tr("Epifanía del Señor")))
 
         if self._year in {2010, 2011, 2020}:
-            # St. Joseph's Day.
+            # Saint Joseph's Day.
             self._add_saint_josephs_day(tr("San José"))
 
         self._add_holy_thursday(tr("Jueves Santo"))
@@ -403,7 +403,7 @@ class Spain(
             self._add_whit_monday(tr("Día de la Pascua Granada"))
 
         if self._year not in {2012, 2018}:
-            # St. John the Baptist.
+            # Saint John the Baptist.
             self._add_saint_johns_day(tr("San Juan"))
 
         if self._year not in {2011, 2022}:
@@ -411,7 +411,7 @@ class Spain(
             self._add_holiday_sep_11(tr("Fiesta Nacional de Cataluña"))
 
         if self._year not in {2010, 2021}:
-            # St. Stephen's Day.
+            # Saint Stephen's Day.
             self._add_christmas_day_two(tr("San Esteban"))
 
     def _populate_subdiv_ex_public_holidays(self):
@@ -426,7 +426,7 @@ class Spain(
             self._add_carnival_tuesday(tr("Martes de Carnaval"))
 
         if self._year in {2010, 2017, 2021}:
-            # St. Joseph's Day.
+            # Saint Joseph's Day.
             self._move_holiday(self._add_saint_josephs_day(tr("San José")))
 
         self._add_holy_thursday(tr("Jueves Santo"))
@@ -712,12 +712,12 @@ class SpainIslamicHolidays(_CustomIslamicHolidays):
 
 class SpainStaticHolidays:
     special_ga_public_holidays = {
-        # Day following St. Joseph's Day.
+        # Day following Saint Joseph's Day.
         2015: (MAR, 20, tr("Día siguiente a San José")),
     }
 
     special_md_public_holidays = {
-        # St. Joseph's Day Transfer.
+        # Saint Joseph's Day Transfer.
         2013: (MAR, 18, tr("Traslado de San José")),
     }
 

holidays/countries/switzerland.py

@@ -105,7 +105,7 @@ class Switzerland(ObservedHolidayBase, ChristianHolidays, InternationalHolidays)
         # Immaculate Conception.
         self._add_immaculate_conception_day(tr("Mariä Empfängnis"))
 
-        # St. Stephen's Day.
+        # Saint Stephen's Day.
         self._add_christmas_day_two(tr("Stephanstag"))
 
     def _populate_subdiv_ar_public_holidays(self):
@@ -286,7 +286,7 @@ class Switzerland(ObservedHolidayBase, ChristianHolidays, InternationalHolidays)
         self._add_observed(self._add_christmas_day_two(tr("Stephanstag")), rule=MON_ONLY)
 
     def _populate_subdiv_nw_public_holidays(self):
-        # St. Joseph's Day.
+        # Saint Joseph's Day.
         self._add_saint_josephs_day(tr("Josefstag"))
 
         self._add_good_friday(tr("Karfreitag"))
@@ -315,7 +315,7 @@ class Switzerland(ObservedHolidayBase, ChristianHolidays, InternationalHolidays)
 
         self._add_assumption_of_mary_day(tr("Mariä Himmelfahrt"))
 
-        # St. Nicholas of Flüe.
+        # Saint Nicholas of Flüe.
         self._add_holiday_sep_25(tr("Bruder Klaus"))
 
         self._add_all_saints_day(tr("Allerheiligen"))

holidays/countries/tanzania.py

@@ -219,7 +219,7 @@ class Tanzania(
         # Maulidi.
         # Status: In-Use.
 
-        # Maulid Day.
+        # Prophet's Birthday.
         self._add_mawlid_day(tr("Maulidi"))
 
         # Defunct Holidays.

holidays/countries/thailand.py

@@ -115,7 +115,7 @@ class Thailand(ObservedHolidayBase, InternationalHolidays, StaticHolidays, ThaiC
             Applied Automatically for Workday if on Weekends: 2001-Present
 
     Limitations:
-        - This is only 100% accurate for 1997-2023; any future dates are up to the
+        - This is only 100% accurate for 1997-2024; any future dates are up to the
           Royal Thai Government Gazette which updates on a year-by-year basis.
 
         - Approx. date only goes as far back as 1941 (B.E. 2484) as the Thai
@@ -123,7 +123,7 @@ class Thailand(ObservedHolidayBase, InternationalHolidays, StaticHolidays, ThaiC
           New Year Date (April 1st to January 1st).
 
         - Thai Lunar Calendar Holidays only work from 1941 (B.E. 2484) onwards
-          until 2057 (B.E. 2600) as we only have Thai year-type data for
+          until 2157 (B.E. 2700) as we only have Thai year-type data for
           cross-checking until then.
 
         - Royal Ploughing Ceremony Day is date is announced on an annual basis

holidays/countries/timor_leste.py

@@ -131,13 +131,13 @@ class TimorLeste(
         # Holy Friday.
         self._add_good_friday(tr("Sexta-Feira Santa"))
 
-        # Idul Fitri.
+        # Eid al-Fitr.
         self._add_eid_al_fitr_day(tr("Idul Fitri"))
 
         # Corpus Christi.
         self._add_corpus_christi_day(tr("Festa do Corpo de Deus"))
 
-        # Idul Adha.
+        # Eid al-Adha.
         self._add_eid_al_adha_day(tr("Idul Adha"))
 
     def _populate_workday_holidays(self):

holidays/countries/united_kingdom.py

@@ -44,14 +44,13 @@ class UnitedKingdom(ObservedHolidayBase, ChristianHolidays, InternationalHoliday
         "SCT",  # Scotland
         "WLS",  # Wales
     )
-
-    _deprecated_subdivisions: Tuple[str, ...] = (
-        "England",
-        "Northern Ireland",
-        "Scotland",
-        "UK",
-        "Wales",
-    )
+    subdivisions_aliases = {
+        "England": "ENG",
+        "Northern Ireland": "NIR",
+        "Scotland": "SCT",
+        "Wales": "WLS",
+    }
+    _deprecated_subdivisions = ("UK",)
 
     def __init__(self, *args, **kwargs):
         ChristianHolidays.__init__(self)
@@ -91,21 +90,12 @@ class UnitedKingdom(ObservedHolidayBase, ChristianHolidays, InternationalHoliday
             else:
                 self._add_holiday_last_mon_of_may(name)
 
-        if self.subdiv == "England":
-            self._populate_subdiv_eng_public_holidays()
-        elif self.subdiv == "Northern Ireland":
-            self._populate_subdiv_nir_public_holidays()
-        elif self.subdiv == "Scotland":
-            self._populate_subdiv_sct_public_holidays()
-        elif self.subdiv == "Wales":
-            self._populate_subdiv_wls_public_holidays()
-
     def _populate_subdiv_holidays(self):
         # Bank Holidays Act 1871
         if self._year <= 1871:
             return None
 
-        if self.subdiv not in {"SCT", "Scotland"}:
+        if self.subdiv != "SCT":
             # New Year's Day
             if self._year >= 1975:
                 self._add_observed(self._add_new_years_day("New Year's Day"))
@@ -136,8 +126,8 @@ class UnitedKingdom(ObservedHolidayBase, ChristianHolidays, InternationalHoliday
 
     def _populate_subdiv_nir_public_holidays(self):
         if self._year >= 1903:
-            # St. Patrick's Day
-            self._add_observed(self._add_holiday_mar_17("St. Patrick's Day"))
+            # Saint Patrick's Day
+            self._add_observed(self._add_holiday_mar_17("Saint Patrick's Day"))
 
         # Easter Monday
         self._add_easter_monday("Easter Monday")
@@ -168,8 +158,8 @@ class UnitedKingdom(ObservedHolidayBase, ChristianHolidays, InternationalHoliday
         self._add_holiday_1st_mon_of_aug("Summer Bank Holiday")
 
         if self._year >= 2006:
-            # St. Andrew's Day
-            self._add_observed(self._add_holiday_nov_30("St. Andrew's Day"))
+            # Saint Andrew's Day
+            self._add_observed(self._add_holiday_nov_30("Saint Andrew's Day"))
 
         # Christmas Day
         self._add_observed(

holidays/countries/united_states.py

@@ -40,6 +40,9 @@ class UnitedStates(ObservedHolidayBase, ChristianHolidays, InternationalHolidays
     - https://en.wikipedia.org/wiki/Indigenous_Peoples%27_Day_(United_States)
     - https://www.sos.ri.gov/divisions/civics-and-education/reference-desk/ri-state-holidays
     - https://web.archive.org/web/20080831103521/http://www.dpa.ca.gov/personnel-policies/holidays.htm
+
+    Frances Xavier Cabrini Day:
+        - https://leg.colorado.gov/sites/default/files/2020a_1031_signed.pdf
     """
 
     country = "US"
@@ -325,6 +328,10 @@ class UnitedStates(ObservedHolidayBase, ChristianHolidays, InternationalHolidays
         if self._year >= 2001:
             self._add_holiday_mar_31("Cesar Chavez Day")
 
+        # Frances Xavier Cabrini Day
+        if self._year >= 2020:
+            self._add_holiday_1st_mon_of_oct("Frances Xavier Cabrini Day")
+
     def _populate_subdiv_ct_public_holidays(self):
         # Lincoln's Birthday
         if self._year >= 1971:
@@ -945,10 +952,10 @@ class UnitedStates(ObservedHolidayBase, ChristianHolidays, InternationalHolidays
         if self._year >= 1847:
             self._add_holiday_feb_14("Valentine's Day")
 
-        # St. Patrick's Day
+        # Saint Patrick's Day
         # Started in Boston in 1737 for the US.
 
-        self._add_holiday_mar_17("St. Patrick's Day")
+        self._add_holiday_mar_17("Saint Patrick's Day")
 
         # Halloween
         # Halloween began in the US sometime around the 19th century.