Skip to content

Commit

Permalink
Merge branch 'dev' into haiti_holidays
Browse files Browse the repository at this point in the history
  • Loading branch information
PPsyrius committed Aug 21, 2024
2 parents b7751e0 + e3d0a35 commit 874f559
Show file tree
Hide file tree
Showing 7 changed files with 161 additions and 128 deletions.
6 changes: 6 additions & 0 deletions holidays/countries/brunei.py
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ class BruneiIslamicHolidays(_CustomIslamicHolidays):
2021: (JUL, 20),
2022: (JUL, 10),
2023: (JUN, 29),
2024: (JUN, 17),
}

EID_AL_FITR_DATES = {
Expand Down Expand Up @@ -304,6 +305,7 @@ class BruneiIslamicHolidays(_CustomIslamicHolidays):
2021: (AUG, 10),
2022: (JUL, 30),
2023: (JUL, 19),
2024: (JUL, 7),
}

ISRA_AND_MIRAJ_DATES = {
Expand Down Expand Up @@ -331,6 +333,7 @@ class BruneiIslamicHolidays(_CustomIslamicHolidays):
2021: (MAR, 11),
2022: (MAR, 1),
2023: (FEB, 18),
2024: (FEB, 8),
}

MAWLID_DATES = {
Expand Down Expand Up @@ -358,6 +361,7 @@ class BruneiIslamicHolidays(_CustomIslamicHolidays):
2021: (OCT, 19),
2022: (OCT, 8),
2023: (SEP, 28),
2024: (SEP, 16),
}

NUZUL_AL_QURAN_DATES = {
Expand Down Expand Up @@ -385,6 +389,7 @@ class BruneiIslamicHolidays(_CustomIslamicHolidays):
2021: (APR, 29),
2022: (APR, 19),
2023: (APR, 8),
2024: (MAR, 28),
}

RAMADAN_BEGINNING_DATES = {
Expand Down Expand Up @@ -412,6 +417,7 @@ class BruneiIslamicHolidays(_CustomIslamicHolidays):
2021: (APR, 13),
2022: (APR, 3),
2023: (MAR, 23),
2024: (MAR, 12),
}


Expand Down
23 changes: 20 additions & 3 deletions holidays/countries/cambodia.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

from gettext import gettext as tr

from holidays.calendars.gregorian import MAY, AUG, SEP, _timedelta
from holidays.calendars.gregorian import APR, MAY, AUG, SEP, _timedelta
from holidays.calendars.thai import KHMER_CALENDAR
from holidays.groups import InternationalHolidays, StaticHolidays, ThaiCalendarHolidays
from holidays.holiday_base import HolidayBase
Expand Down Expand Up @@ -86,12 +86,25 @@ def _populate_public_holidays(self):

# ពិធីបុណ្យចូលឆ្នាំថ្មីប្រពៃណីជាតិ
# Status: In-Use.
# Usually falls on April 13th except for 2017-2018 and 2021-2023 for years 2001-2050.
# Usually falls on April 13th except for 2017-2018, 2021-2023, 2025-2027, 2029-2031
# for years 2001-2050.

if self._year != 2020:
# Khmer New Year's Day
sangkranta = tr("ពិធីបុណ្យចូលឆ្នាំថ្មីប្រពៃណីជាតិ")
sangkranta_years_apr_14 = {2017, 2018, 2021, 2022, 2023}
sangkranta_years_apr_14 = {
2017,
2018,
2021,
2022,
2023,
2025,
2026,
2027,
2029,
2030,
2031,
}
dt = (
self._add_holiday_apr_14(sangkranta)
if self._year in sangkranta_years_apr_14
Expand Down Expand Up @@ -284,6 +297,9 @@ class CambodiaStaticHolidays:
# Special Public Holiday
special_in_lieu_holidays = tr("ថ្ងៃឈប់សម្រាកសងជំនួស")

# Khmer New Year's Day
sangkranta = tr("ពិធីបុណ្យចូលឆ្នាំថ្មីប្រពៃណីជាតិ")

special_public_holidays = {
2016: (
(MAY, 2, special_in_lieu_holidays),
Expand All @@ -299,4 +315,5 @@ class CambodiaStaticHolidays:
(AUG, 20, sangkranta_in_lieu_covid),
(AUG, 21, sangkranta_in_lieu_covid),
),
2024: (APR, 16, sangkranta),
}
16 changes: 7 additions & 9 deletions snapshots/countries/BN_COMMON.json
Original file line number Diff line number Diff line change
Expand Up @@ -762,25 +762,23 @@
"2023-09-28": "Birth of the Prophet",
"2023-12-25": "Christmas Day",
"2024-01-01": "New Year's Day",
"2024-02-08": "Isra Mi'raj (estimated)",
"2024-02-08": "Isra Mi'raj",
"2024-02-10": "Lunar New Year",
"2024-02-23": "National Day",
"2024-02-24": "National Day (observed)",
"2024-03-11": "First Day of Ramadan (estimated)",
"2024-03-27": "Anniversary of the revelation of the Quran (estimated)",
"2024-03-12": "First Day of Ramadan",
"2024-03-28": "Anniversary of the revelation of the Quran",
"2024-04-10": "Eid al-Fitr",
"2024-04-11": "Eid al-Fitr",
"2024-04-12": "Eid al-Fitr",
"2024-04-13": "Eid al-Fitr (observed)",
"2024-05-31": "Armed Forces Day",
"2024-06-01": "Armed Forces Day (observed)",
"2024-06-16": "Eid al-Adha (estimated)",
"2024-06-17": "Eid al-Adha (observed, estimated)",
"2024-07-07": "Islamic New Year (estimated)",
"2024-07-08": "Islamic New Year (observed, estimated)",
"2024-06-17": "Eid al-Adha",
"2024-07-07": "Islamic New Year",
"2024-07-08": "Islamic New Year (observed)",
"2024-07-15": "Sultan Hassanal Bolkiah's Birthday",
"2024-09-15": "Birth of the Prophet (estimated)",
"2024-09-16": "Birth of the Prophet (observed, estimated)",
"2024-09-16": "Birth of the Prophet",
"2024-12-25": "Christmas Day",
"2025-01-01": "New Year's Day",
"2025-01-27": "Isra Mi'raj (estimated)",
Expand Down
Loading

0 comments on commit 874f559

Please sign in to comment.