diff --git a/holidays/countries/argentina.py b/holidays/countries/argentina.py index cfb975c85..0942c8a62 100644 --- a/holidays/countries/argentina.py +++ b/holidays/countries/argentina.py @@ -10,18 +10,16 @@ # License: MIT (see LICENSE file) from datetime import date -from datetime import timedelta as td from gettext import gettext as tr -from dateutil.easter import easter - from holidays.calendars import _get_nth_weekday_from, _get_nth_weekday_of_month from holidays.constants import JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP from holidays.constants import OCT, NOV, DEC, MON from holidays.holiday_base import HolidayBase +from holidays.holiday_groups import ChristianHolidays, InternationalHolidays -class Argentina(HolidayBase): +class Argentina(HolidayBase, ChristianHolidays, InternationalHolidays): """ A subclass of :py:class:`HolidayBase` representing public holidays in Argentina. @@ -144,6 +142,11 @@ class Argentina(HolidayBase): ), } + def __init__(self, *args, **kwargs): + ChristianHolidays.__init__(self) + InternationalHolidays.__init__(self) + super().__init__(*args, **kwargs) + def _populate(self, year): def _add_movable(hol_date: date, hol_name: str) -> None: """ @@ -168,12 +171,10 @@ def _add_movable(hol_date: date, hol_name: str) -> None: # Fixed Holidays - easter_date = easter(year) - # New Year's Day. # Status: In-Use. - self._add_holiday(tr("Año Nuevo"), JAN, 1) + self._add_new_years_day(tr("Año Nuevo")) # Carnival days. # Status: In-Use. @@ -182,8 +183,8 @@ def _add_movable(hol_date: date, hol_name: str) -> None: if 1956 <= year <= 1975 or year >= 2011: name = tr("Día de Carnaval") - self._add_holiday(name, easter_date + td(days=-48)) - self._add_holiday(name, easter_date + td(days=-47)) + self._add_carnival_monday(name) + self._add_carnival_tuesday(name) # Memory's National Day for the Truth and Justice. # Status: In-Use @@ -214,11 +215,11 @@ def _add_movable(hol_date: date, hol_name: str) -> None: ) # Good Friday. - self._add_holiday(tr("Viernes Santo"), easter_date + td(days=-2)) + self._add_good_friday(tr("Viernes Santo")) # Labor Day. if year >= 1930: - self._add_holiday(tr("Día del Trabajo"), MAY, 1) + self._add_labour_day(tr("Día del Trabajo")) # May Revolution Day. if year >= 1813: @@ -259,10 +260,12 @@ def _add_movable(hol_date: date, hol_name: str) -> None: self._add_holiday(tr("Día de la Independencia"), JUL, 9) # Immaculate Conception. - self._add_holiday(tr("Inmaculada Concepción de María"), DEC, 8) + self._add_immaculate_conception_day( + tr("Inmaculada Concepción de María") + ) # Christmas. - self._add_holiday(tr("Navidad"), DEC, 25) + self._add_christmas_day(tr("Navidad")) # Movable Holidays diff --git a/holidays/locale/en_US/LC_MESSAGES/AR.po b/holidays/locale/en_US/LC_MESSAGES/AR.po index 5fd764a40..d1182c7f6 100644 --- a/holidays/locale/en_US/LC_MESSAGES/AR.po +++ b/holidays/locale/en_US/LC_MESSAGES/AR.po @@ -16,72 +16,73 @@ msgstr "" "Generated-By: pygettext.py 1.5\n" "X-Generator: Poedit 3.2.2\n" -#: holidays/countries/argentina.py:71 +#: ./holidays/countries/argentina.py:69 msgid "Feriado con fines turísticos" msgstr "Bridge Public Holiday" -#: holidays/countries/argentina.py:75 +#: ./holidays/countries/argentina.py:73 msgid "Bicentenario de la creación y primera jura de la bandera nacional" msgstr "Bicentenary of the creation and first oath of the national flag" -#: holidays/countries/argentina.py:78 +#: ./holidays/countries/argentina.py:76 msgid "Bicentenario de la Batalla de Tucumán" msgstr "Bicentenary of the Battle of Tucumán" -#: holidays/countries/argentina.py:79 +#: ./holidays/countries/argentina.py:77 msgid "" "Bicentenario de la sesión inaugural de la Asamblea Nacional Constituyente " "del año 1813" msgstr "" -"Bicentenary of the inaugural session of the National Constituent Assembly of " -"the year 1813" +"Bicentenary of the inaugural session of the National Constituent Assembly of" +" the year 1813" -#: holidays/countries/argentina.py:83 +#: ./holidays/countries/argentina.py:81 msgid "Bicentenario de la Batalla de Salta" msgstr "Bicentenary of the Battle of Salta" -#: holidays/countries/argentina.py:84 +#: ./holidays/countries/argentina.py:82 msgid "Censo nacional 2022" msgstr "National Census Day 2022" -#: holidays/countries/argentina.py:162 holidays/countries/argentina.py:165 +#: ./holidays/countries/argentina.py:165 ./holidays/countries/argentina.py:168 #, c-format msgid "%s (Observado)" msgstr "%s (Observed)" -#: holidays/countries/argentina.py:177 +#: ./holidays/countries/argentina.py:178 msgid "Año Nuevo" msgstr "New Year's Day" -#: holidays/countries/argentina.py:185 +#: ./holidays/countries/argentina.py:186 msgid "Día de Carnaval" msgstr "Carnival" -#: holidays/countries/argentina.py:194 +#: ./holidays/countries/argentina.py:196 msgid "Día Nacional de la Memoria por la Verdad y la Justicia" msgstr "Memory's National Day for the Truth and Justice" -#: holidays/countries/argentina.py:209 +#: ./holidays/countries/argentina.py:210 msgid "Día del Veterano de Guerra" msgstr "War Veterans Day" -#: holidays/countries/argentina.py:211 +#: ./holidays/countries/argentina.py:212 msgid "Día del Veterano y de los Caidos en la Guerra de Malvinas" msgstr "Veterans Day and the Fallen in the Malvinas War" -#: holidays/countries/argentina.py:219 +#. Good Friday. +#: ./holidays/countries/argentina.py:219 msgid "Viernes Santo" msgstr "Good Friday" -#: holidays/countries/argentina.py:226 +#: ./holidays/countries/argentina.py:223 msgid "Día del Trabajo" msgstr "Labor Day" -#: holidays/countries/argentina.py:233 +#: ./holidays/countries/argentina.py:227 msgid "Día de la Revolución de Mayo" msgstr "May Revolution Day" -#: holidays/countries/argentina.py:244 +#: ./holidays/countries/argentina.py:237 msgid "" "Día de los Derechos Argentinos sobre las Islas Malvinas, Sandwich y del " "Atlántico Sur" @@ -89,38 +90,39 @@ msgstr "" "Day of Argentine Sovereignty over the Malvinas, Sandwich and South Atlantic " "Islands" -#: holidays/countries/argentina.py:261 +#: ./holidays/countries/argentina.py:253 msgid "Paso a la Inmortalidad del General Don Manuel Belgrano" msgstr "Pass to the Immortality of General Don Manuel Belgrano" -#: holidays/countries/argentina.py:270 +#: ./holidays/countries/argentina.py:261 msgid "Día de la Independencia" msgstr "Independence Day" -#: holidays/countries/argentina.py:275 +#: ./holidays/countries/argentina.py:265 msgid "Inmaculada Concepción de María" msgstr "Immaculate Conception" -#: holidays/countries/argentina.py:280 +#. Christmas. +#: ./holidays/countries/argentina.py:269 msgid "Navidad" msgstr "Christmas" -#: holidays/countries/argentina.py:290 +#: ./holidays/countries/argentina.py:279 msgid "Paso a la Inmortalidad del General Don Martín Miguel de Güemes" msgstr "Pass to the Immortality of General Don Martín Miguel de Güemes" -#: holidays/countries/argentina.py:307 +#: ./holidays/countries/argentina.py:296 msgid "Paso a la Inmortalidad del General Don José de San Martin" msgstr "Pass to the Immortality of General Don José de San Martin" -#: holidays/countries/argentina.py:327 +#: ./holidays/countries/argentina.py:316 msgid "Día del Respeto a la Diversidad Cultural" msgstr "Respect for Cultural Diversity Day" -#: holidays/countries/argentina.py:329 +#: ./holidays/countries/argentina.py:318 msgid "Día de la Raza" msgstr "Columbus day" -#: holidays/countries/argentina.py:340 +#: ./holidays/countries/argentina.py:329 msgid "Día de la Soberanía Nacional" msgstr "National Sovereignty Day" diff --git a/holidays/locale/es/LC_MESSAGES/AR.po b/holidays/locale/es/LC_MESSAGES/AR.po index 14bcae9c5..c73f3ce96 100644 --- a/holidays/locale/es/LC_MESSAGES/AR.po +++ b/holidays/locale/es/LC_MESSAGES/AR.po @@ -16,107 +16,109 @@ msgstr "" "Generated-By: Lingua 4.15.0\n" "X-Generator: Poedit 3.2.2\n" -#: holidays/countries/argentina.py:71 +#: ./holidays/countries/argentina.py:69 msgid "Feriado con fines turísticos" msgstr "" -#: holidays/countries/argentina.py:75 +#: ./holidays/countries/argentina.py:73 msgid "Bicentenario de la creación y primera jura de la bandera nacional" msgstr "" -#: holidays/countries/argentina.py:78 +#: ./holidays/countries/argentina.py:76 msgid "Bicentenario de la Batalla de Tucumán" msgstr "" -#: holidays/countries/argentina.py:79 +#: ./holidays/countries/argentina.py:77 msgid "" "Bicentenario de la sesión inaugural de la Asamblea Nacional Constituyente " "del año 1813" msgstr "" -#: holidays/countries/argentina.py:83 +#: ./holidays/countries/argentina.py:81 msgid "Bicentenario de la Batalla de Salta" msgstr "" -#: holidays/countries/argentina.py:84 +#: ./holidays/countries/argentina.py:82 msgid "Censo nacional 2022" msgstr "" -#: holidays/countries/argentina.py:162 holidays/countries/argentina.py:165 +#: ./holidays/countries/argentina.py:165 ./holidays/countries/argentina.py:168 #, c-format msgid "%s (Observado)" msgstr "" -#: holidays/countries/argentina.py:177 +#: ./holidays/countries/argentina.py:178 msgid "Año Nuevo" msgstr "" -#: holidays/countries/argentina.py:185 +#: ./holidays/countries/argentina.py:186 msgid "Día de Carnaval" msgstr "" -#: holidays/countries/argentina.py:194 +#: ./holidays/countries/argentina.py:196 msgid "Día Nacional de la Memoria por la Verdad y la Justicia" msgstr "" -#: holidays/countries/argentina.py:209 +#: ./holidays/countries/argentina.py:210 msgid "Día del Veterano de Guerra" msgstr "" -#: holidays/countries/argentina.py:211 +#: ./holidays/countries/argentina.py:212 msgid "Día del Veterano y de los Caidos en la Guerra de Malvinas" msgstr "" -#: holidays/countries/argentina.py:219 +#. Good Friday. +#: ./holidays/countries/argentina.py:219 msgid "Viernes Santo" msgstr "" -#: holidays/countries/argentina.py:226 +#: ./holidays/countries/argentina.py:223 msgid "Día del Trabajo" msgstr "" -#: holidays/countries/argentina.py:233 +#: ./holidays/countries/argentina.py:227 msgid "Día de la Revolución de Mayo" msgstr "" -#: holidays/countries/argentina.py:244 +#: ./holidays/countries/argentina.py:237 msgid "" "Día de los Derechos Argentinos sobre las Islas Malvinas, Sandwich y del " "Atlántico Sur" msgstr "" -#: holidays/countries/argentina.py:261 +#: ./holidays/countries/argentina.py:253 msgid "Paso a la Inmortalidad del General Don Manuel Belgrano" msgstr "" -#: holidays/countries/argentina.py:270 +#: ./holidays/countries/argentina.py:261 msgid "Día de la Independencia" msgstr "" -#: holidays/countries/argentina.py:275 +#: ./holidays/countries/argentina.py:265 msgid "Inmaculada Concepción de María" msgstr "" -#: holidays/countries/argentina.py:280 +#. Christmas. +#: ./holidays/countries/argentina.py:269 msgid "Navidad" msgstr "" -#: holidays/countries/argentina.py:290 +#: ./holidays/countries/argentina.py:279 msgid "Paso a la Inmortalidad del General Don Martín Miguel de Güemes" msgstr "" -#: holidays/countries/argentina.py:307 +#: ./holidays/countries/argentina.py:296 msgid "Paso a la Inmortalidad del General Don José de San Martin" msgstr "" -#: holidays/countries/argentina.py:327 +#: ./holidays/countries/argentina.py:316 msgid "Día del Respeto a la Diversidad Cultural" msgstr "" -#: holidays/countries/argentina.py:329 +#: ./holidays/countries/argentina.py:318 msgid "Día de la Raza" msgstr "" -#: holidays/countries/argentina.py:340 +#: ./holidays/countries/argentina.py:329 msgid "Día de la Soberanía Nacional" msgstr "" diff --git a/holidays/locale/uk/LC_MESSAGES/AR.po b/holidays/locale/uk/LC_MESSAGES/AR.po index a2ceaf724..2cd3a0857 100644 --- a/holidays/locale/uk/LC_MESSAGES/AR.po +++ b/holidays/locale/uk/LC_MESSAGES/AR.po @@ -17,71 +17,72 @@ msgstr "" "Generated-By: Lingua 4.15.0\n" "X-Generator: Poedit 3.2.2\n" -#: holidays/countries/argentina.py:71 +#: ./holidays/countries/argentina.py:69 msgid "Feriado con fines turísticos" msgstr "Додатковий вихідний" -#: holidays/countries/argentina.py:75 +#: ./holidays/countries/argentina.py:73 msgid "Bicentenario de la creación y primera jura de la bandera nacional" msgstr "200-річчя створення та першої присяги державному прапору" -#: holidays/countries/argentina.py:78 +#: ./holidays/countries/argentina.py:76 msgid "Bicentenario de la Batalla de Tucumán" msgstr "200-річчя битви при Тукумані" -#: holidays/countries/argentina.py:79 +#: ./holidays/countries/argentina.py:77 msgid "" "Bicentenario de la sesión inaugural de la Asamblea Nacional Constituyente " "del año 1813" msgstr "" "200-річчя інавгураційної сесії Національних установчих зборів 1813 року" -#: holidays/countries/argentina.py:83 +#: ./holidays/countries/argentina.py:81 msgid "Bicentenario de la Batalla de Salta" msgstr "200-річчя битви при Сальті" -#: holidays/countries/argentina.py:84 +#: ./holidays/countries/argentina.py:82 msgid "Censo nacional 2022" msgstr "День національного перепису 2022" -#: holidays/countries/argentina.py:162 holidays/countries/argentina.py:165 +#: ./holidays/countries/argentina.py:165 ./holidays/countries/argentina.py:168 #, c-format msgid "%s (Observado)" msgstr "%s (вихідний)" -#: holidays/countries/argentina.py:177 +#: ./holidays/countries/argentina.py:178 msgid "Año Nuevo" msgstr "Новий рік" -#: holidays/countries/argentina.py:185 +#: ./holidays/countries/argentina.py:186 msgid "Día de Carnaval" msgstr "Карнавал" -#: holidays/countries/argentina.py:194 +#: ./holidays/countries/argentina.py:196 msgid "Día Nacional de la Memoria por la Verdad y la Justicia" msgstr "День памʼяті заради правди та правосуддя" -#: holidays/countries/argentina.py:209 +#: ./holidays/countries/argentina.py:210 msgid "Día del Veterano de Guerra" msgstr "День ветеранів війни" -#: holidays/countries/argentina.py:211 +#: ./holidays/countries/argentina.py:212 msgid "Día del Veterano y de los Caidos en la Guerra de Malvinas" msgstr "День ветеранів та загиблих на Мальвінській війні" -#: holidays/countries/argentina.py:219 +#. Good Friday. +#: ./holidays/countries/argentina.py:219 msgid "Viernes Santo" msgstr "Страсна п'ятниця" -#: holidays/countries/argentina.py:226 +#: ./holidays/countries/argentina.py:223 msgid "Día del Trabajo" msgstr "День праці" -#: holidays/countries/argentina.py:233 +#: ./holidays/countries/argentina.py:227 msgid "Día de la Revolución de Mayo" msgstr "День Травневої революції" -#: holidays/countries/argentina.py:244 +#: ./holidays/countries/argentina.py:237 msgid "" "Día de los Derechos Argentinos sobre las Islas Malvinas, Sandwich y del " "Atlántico Sur" @@ -89,38 +90,39 @@ msgstr "" "День суверенітету Аргентини на Мальвінських, Сендвічевих і " "Південноатлантичних островах" -#: holidays/countries/argentina.py:261 +#: ./holidays/countries/argentina.py:253 msgid "Paso a la Inmortalidad del General Don Manuel Belgrano" msgstr "День пам’яті генерала Мануеля Бельграно" -#: holidays/countries/argentina.py:270 +#: ./holidays/countries/argentina.py:261 msgid "Día de la Independencia" msgstr "День незалежності" -#: holidays/countries/argentina.py:275 +#: ./holidays/countries/argentina.py:265 msgid "Inmaculada Concepción de María" msgstr "Непорочне зачаття Діви Марії" -#: holidays/countries/argentina.py:280 +#. Christmas. +#: ./holidays/countries/argentina.py:269 msgid "Navidad" msgstr "Різдво Христове" -#: holidays/countries/argentina.py:290 +#: ./holidays/countries/argentina.py:279 msgid "Paso a la Inmortalidad del General Don Martín Miguel de Güemes" msgstr "День пам'яті генерала Мартіна Мігеля де Гуемеса" -#: holidays/countries/argentina.py:307 +#: ./holidays/countries/argentina.py:296 msgid "Paso a la Inmortalidad del General Don José de San Martin" msgstr "День пам'яті генерала Хосе де Сан-Мартіна" -#: holidays/countries/argentina.py:327 +#: ./holidays/countries/argentina.py:316 msgid "Día del Respeto a la Diversidad Cultural" msgstr "День поваги до культурного різноманіття" -#: holidays/countries/argentina.py:329 +#: ./holidays/countries/argentina.py:318 msgid "Día de la Raza" msgstr "День Колумба" -#: holidays/countries/argentina.py:340 +#: ./holidays/countries/argentina.py:329 msgid "Día de la Soberanía Nacional" msgstr "День національного суверенітету"