From c2dbf32dd64131601fb057f510a9ddde36f13d30 Mon Sep 17 00:00:00 2001 From: Dianne Skoll Date: Sun, 10 Nov 2024 21:31:10 -0500 Subject: [PATCH] Use orthodoxeaster() rather than easterdate() for countries that observe Easter on that date. --- include/holidays/ba.rem | 4 ++-- include/holidays/ba/bih.rem | 8 ++++---- include/holidays/ba/srp.rem | 8 ++++---- include/holidays/bg.rem | 8 ++++---- include/holidays/by.rem | 2 +- include/holidays/cy.rem | 14 +++++++------- include/holidays/eg.rem | 4 ++-- include/holidays/et.rem | 4 ++-- include/holidays/ge.rem | 8 ++++---- include/holidays/md.rem | 4 ++-- include/holidays/me.rem | 6 +++--- include/holidays/mk.rem | 2 +- include/holidays/ro.rem | 10 +++++----- include/holidays/rs.rem | 8 ++++---- include/holidays/ua.rem | 4 ++-- 15 files changed, 47 insertions(+), 47 deletions(-) diff --git a/include/holidays/ba.rem b/include/holidays/ba.rem index a3868d80..3222fd22 100644 --- a/include/holidays/ba.rem +++ b/include/holidays/ba.rem @@ -12,8 +12,8 @@ OMIT 1 January MSG Nova godina OMIT 2 January MSG Nova godina -OMIT [easterdate($Uy)-2] MSG Veliki petak (Pravoslavni) -OMIT [easterdate($Uy)+1] MSG Uskrsni ponedjeljak (Katolički) +OMIT [orthodoxeaster($Uy)-2] MSG Veliki petak (Pravoslavni) +OMIT [orthodoxeaster($Uy)+1] MSG Uskrsni ponedjeljak (Katolički) OMIT 1 May MSG Međunarodni praznik rada OMIT 2 May MSG Međunarodni praznik rada OMIT 25 December MSG Božić (Katolički) diff --git a/include/holidays/ba/bih.rem b/include/holidays/ba/bih.rem index 3bb6ef87..22dfbb45 100644 --- a/include/holidays/ba/bih.rem +++ b/include/holidays/ba/bih.rem @@ -11,10 +11,10 @@ REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Nova godina (preneseno) OMIT 1 March MSG Dan nezavisnosti -OMIT [easterdate($Uy)-2] MSG Veliki petak (Katolički) -OMIT [easterdate($Uy)] MSG Uskrs (Katolički) -OMIT [easterdate($Uy)] MSG Vaskrs (Pravoslavni) -OMIT [easterdate($Uy)+1] MSG Uskrsni ponedjeljak (Pravoslavni) +OMIT [orthodoxeaster($Uy)-2] MSG Veliki petak (Katolički) +OMIT [orthodoxeaster($Uy)] MSG Uskrs (Katolički) +OMIT [orthodoxeaster($Uy)] MSG Vaskrs (Pravoslavni) +OMIT [orthodoxeaster($Uy)+1] MSG Uskrsni ponedjeljak (Pravoslavni) REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Međunarodni praznik rada (preneseno) OMIT 9 May MSG Dan pobjede nad fašizmom OMIT 25 November MSG Dan državnosti diff --git a/include/holidays/ba/srp.rem b/include/holidays/ba/srp.rem index c756516a..d36f53c6 100644 --- a/include/holidays/ba/srp.rem +++ b/include/holidays/ba/srp.rem @@ -11,10 +11,10 @@ REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG Nova godina (preneseno) OMIT 14 January MSG Pravoslavna Nova godina -OMIT [easterdate($Uy)-2] MSG Veliki petak (Katolički) -OMIT [easterdate($Uy)] MSG Uskrs (Katolički) -OMIT [easterdate($Uy)] MSG Vaskrs (Pravoslavni) -OMIT [easterdate($Uy)+1] MSG Uskrsni ponedjeljak (Pravoslavni) +OMIT [orthodoxeaster($Uy)-2] MSG Veliki petak (Katolički) +OMIT [orthodoxeaster($Uy)] MSG Uskrs (Katolički) +OMIT [orthodoxeaster($Uy)] MSG Vaskrs (Pravoslavni) +OMIT [orthodoxeaster($Uy)+1] MSG Uskrsni ponedjeljak (Pravoslavni) REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG Međunarodni praznik rada (preneseno) OMIT 9 May MSG Dan pobjede nad fašizmom OMIT 21 November MSG Dan uspostave Opšteg okvirnog sporazuma za mir u Bosni i Hercegovini diff --git a/include/holidays/bg.rem b/include/holidays/bg.rem index 85affbd9..552b4b7e 100644 --- a/include/holidays/bg.rem +++ b/include/holidays/bg.rem @@ -7,10 +7,10 @@ OMIT 1 January MSG Нова година REM 1 January OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1))==0 || wkdaynum(date($Ty, 1, 1))==6] MSG Нова година (почивен ден) OMIT 3 March MSG Ден на Освобождението на България от османско иго REM 3 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 3))==0 || wkdaynum(date($Ty, 3, 3))==6] MSG Ден на Освобождението на България от османско иго (почивен ден) -OMIT [easterdate($Uy)-2] MSG Велики петък -OMIT [easterdate($Uy)-1] MSG Велика събота -OMIT [easterdate($Uy)] MSG Великден -OMIT [easterdate($Uy)+1] MSG Великден +OMIT [orthodoxeaster($Uy)-2] MSG Велики петък +OMIT [orthodoxeaster($Uy)-1] MSG Велика събота +OMIT [orthodoxeaster($Uy)] MSG Великден +OMIT [orthodoxeaster($Uy)+1] MSG Великден OMIT 1 May MSG Ден на труда и на международната работническа солидарност REM 1 May OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1))==0 || wkdaynum(date($Ty, 5, 1))==6] MSG Ден на труда и на международната работническа солидарност (почивен ден) OMIT 6 May MSG Гергьовден, Ден на храбростта и Българската армия diff --git a/include/holidays/by.rem b/include/holidays/by.rem index 3f938d84..16208cf6 100644 --- a/include/holidays/by.rem +++ b/include/holidays/by.rem @@ -6,7 +6,7 @@ OMIT 1 January MSG Новы год OMIT 2 January MSG Новы год OMIT 8 March MSG Дзень жанчын -OMIT [easterdate($Uy)+9] MSG Радаўніца +OMIT [orthodoxeaster($Uy)+9] MSG Радаўніца OMIT 1 May MSG Свята працы OMIT 9 May MSG Дзень Перамогі OMIT 3 July MSG Дзень Незалежнасці Рэспублікі Беларусь (Дзень Рэспублікі) diff --git a/include/holidays/cy.rem b/include/holidays/cy.rem index e0baf5ee..8452c1db 100644 --- a/include/holidays/cy.rem +++ b/include/holidays/cy.rem @@ -5,14 +5,14 @@ OMIT 1 January MSG Πρωτοχρονιά OMIT 6 January MSG Ημέρα των Θεοφανίων -OMIT [easterdate($Uy)-48] MSG Καθαρά Δευτέρα +OMIT [orthodoxeaster($Uy)-48] MSG Καθαρά Δευτέρα OMIT 25 March MSG Ημέρα της Ελληνικής Ανεξαρτησίας OMIT 1 April MSG Εθνική Ημέρα Κύπρου -OMIT [easterdate($Uy)-2] MSG Μεγάλη Παρασκευή -OMIT [easterdate($Uy)] MSG Κυριακή του Πάσχα -OMIT [easterdate($Uy)+1] MSG Δευτέρα της Διακαινησίμου +OMIT [orthodoxeaster($Uy)-2] MSG Μεγάλη Παρασκευή +OMIT [orthodoxeaster($Uy)] MSG Κυριακή του Πάσχα +OMIT [orthodoxeaster($Uy)+1] MSG Δευτέρα της Διακαινησίμου OMIT 1 May MSG Πρωτομαγιά -OMIT [easterdate($Uy)+50] MSG Δευτέρα του Αγίου Πνεύματος +OMIT [orthodoxeaster($Uy)+50] MSG Δευτέρα του Αγίου Πνεύματος OMIT 15 August MSG Κοίμηση της Θεοτόκου OMIT 1 October MSG Ημέρα της Κυπριακής Ανεξαρτησίας OMIT 28 October MSG Ημέρα του Όχι @@ -20,6 +20,6 @@ OMIT 25 December MSG Χριστούγεννα OMIT 26 December MSG Επομένη Χριστουγέννων # Optional holidays -REM [easterdate($Uy)-1] MSG Μεγάλο Σάββατο -REM [easterdate($Uy)+2] MSG Τρίτη της Διακαινησίμου +REM [orthodoxeaster($Uy)-1] MSG Μεγάλο Σάββατο +REM [orthodoxeaster($Uy)+2] MSG Τρίτη της Διακαινησίμου REM 24 December MSG Παραμονή Χριστουγέννων diff --git a/include/holidays/eg.rem b/include/holidays/eg.rem index 5fde1c3f..0456c7dd 100644 --- a/include/holidays/eg.rem +++ b/include/holidays/eg.rem @@ -5,8 +5,8 @@ OMIT 1 January MSG رأس السنة الميلادية OMIT 25 January MSG عيد ثورة 25 يناير -OMIT [easterdate($Uy)] MSG عيد الفصح القبطي -OMIT [easterdate($Uy)+1] MSG شم النسيم +OMIT [orthodoxeaster($Uy)] MSG عيد الفصح القبطي +OMIT [orthodoxeaster($Uy)+1] MSG شم النسيم OMIT 25 April MSG عيد تحرير سيناء OMIT 1 May MSG عيد العمال OMIT 30 June MSG عيد ثورة 30 يونيو diff --git a/include/holidays/et.rem b/include/holidays/et.rem index 3a6adc60..2e8c0862 100644 --- a/include/holidays/et.rem +++ b/include/holidays/et.rem @@ -6,8 +6,8 @@ REM 19 January ADDOMIT SCANFROM -28 SATISFY [!isleap($T)] MSG ጥምቀት REM 20 January ADDOMIT SCANFROM -28 SATISFY [isleap($T)] MSG ጥምቀት OMIT 2 March MSG አድዋ -OMIT [easterdate($Uy)-2] MSG ስቅለት -OMIT [easterdate($Uy)] MSG ፋሲካ +OMIT [orthodoxeaster($Uy)-2] MSG ስቅለት +OMIT [orthodoxeaster($Uy)] MSG ፋሲካ OMIT 1 May MSG የሰራተኞች ቀን OMIT 5 May MSG የአርበኞች ቀን OMIT 28 May MSG ደርግ የወደቀበት ቀን diff --git a/include/holidays/ge.rem b/include/holidays/ge.rem index b5a351ff..dfd18ef1 100644 --- a/include/holidays/ge.rem +++ b/include/holidays/ge.rem @@ -9,10 +9,10 @@ OMIT 19 January MSG ნათლისღება OMIT 3 March MSG დედის დღე OMIT 8 March MSG ქალთა საერთაშორისო დღე OMIT 9 April MSG ეროვნული ერთიანობის დღე -OMIT [easterdate($Uy)-2] MSG წითელი პარასკევი -OMIT [easterdate($Uy)-1] MSG დიდი შაბათი -OMIT [easterdate($Uy)] MSG აღდგომა -OMIT [easterdate($Uy)+1] MSG შავი ორშაბათი +OMIT [orthodoxeaster($Uy)-2] MSG წითელი პარასკევი +OMIT [orthodoxeaster($Uy)-1] MSG დიდი შაბათი +OMIT [orthodoxeaster($Uy)] MSG აღდგომა +OMIT [orthodoxeaster($Uy)+1] MSG შავი ორშაბათი OMIT 9 May MSG ფაშიზმზე გამარჯვების დღე OMIT 12 May MSG წმინდა ანდრია პირველწოდებულის დღე OMIT 26 May MSG დამოუკიდებლობის დღე diff --git a/include/holidays/md.rem b/include/holidays/md.rem index 66838443..c193d420 100644 --- a/include/holidays/md.rem +++ b/include/holidays/md.rem @@ -5,8 +5,8 @@ OMIT 1 January MSG Anul Nou OMIT 8 March MSG Ziua internatională a femeii -OMIT [easterdate($Uy)] MSG Paștele -OMIT [easterdate($Uy)+1] MSG Paștele +OMIT [orthodoxeaster($Uy)] MSG Paștele +OMIT [orthodoxeaster($Uy)+1] MSG Paștele OMIT [easterdate($Uy)+8] MSG Paștele blajinilor OMIT 1 May MSG Ziua internaţională a solidarităţii oamenilor muncii OMIT 9 May MSG Ziua Europei diff --git a/include/holidays/me.rem b/include/holidays/me.rem index ab992136..cf0715cb 100644 --- a/include/holidays/me.rem +++ b/include/holidays/me.rem @@ -7,9 +7,9 @@ OMIT 1 January MSG New Year's Day OMIT 2 January MSG New Year's Day REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed) REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 2)) == 0] MSG New Year's Day (observed) -OMIT [easterdate($Uy)-2] MSG Orthodox Good Friday -OMIT [easterdate($Uy)] MSG Orthodox Easter Sunday -OMIT [easterdate($Uy)+1] MSG Orthodox Easter Monday +OMIT [orthodoxeaster($Uy)-2] MSG Orthodox Good Friday +OMIT [orthodoxeaster($Uy)] MSG Orthodox Easter Sunday +OMIT [orthodoxeaster($Uy)+1] MSG Orthodox Easter Monday OMIT 1 May MSG Labour Day OMIT 2 May MSG Labour Day REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed) diff --git a/include/holidays/mk.rem b/include/holidays/mk.rem index 413be6a9..506bab0d 100644 --- a/include/holidays/mk.rem +++ b/include/holidays/mk.rem @@ -4,7 +4,7 @@ # https://github.com/vacanza/holidays OMIT 1 January MSG New Year's Day -OMIT [easterdate($Uy)+1] MSG Easter Monday (Orthodox) +OMIT [orthodoxeaster($Uy)+1] MSG Easter Monday (Orthodox) OMIT 1 May MSG Labour Day OMIT 24 May MSG Saints Cyril and Methodius Day OMIT 2 August MSG Republic Day diff --git a/include/holidays/ro.rem b/include/holidays/ro.rem index 895f5571..bf8e19d5 100644 --- a/include/holidays/ro.rem +++ b/include/holidays/ro.rem @@ -8,13 +8,13 @@ OMIT 2 January MSG Anul Nou OMIT 6 January MSG Bobotează OMIT 7 January MSG Sfântul Ion OMIT 24 January MSG Ziua Unirii Principatelor Române -OMIT [easterdate($Uy)-2] MSG Paștele -OMIT [easterdate($Uy)] MSG Paștele -OMIT [easterdate($Uy)+1] MSG Paștele +OMIT [orthodoxeaster($Uy)-2] MSG Paștele +OMIT [orthodoxeaster($Uy)] MSG Paștele +OMIT [orthodoxeaster($Uy)+1] MSG Paștele OMIT 1 May MSG Ziua Muncii OMIT 1 June MSG Ziua Copilului -OMIT [easterdate($Uy)+49] MSG Rusaliile -OMIT [easterdate($Uy)+50] MSG Rusaliile +OMIT [orthodoxeaster($Uy)+49] MSG Rusaliile +OMIT [orthodoxeaster($Uy)+50] MSG Rusaliile OMIT 15 August MSG Adormirea Maicii Domnului OMIT 30 November MSG Sfantul Apostol Andrei cel Intai chemat OMIT 1 December MSG Ziua Națională a României diff --git a/include/holidays/rs.rem b/include/holidays/rs.rem index 05e0080d..0dc5ef67 100644 --- a/include/holidays/rs.rem +++ b/include/holidays/rs.rem @@ -11,10 +11,10 @@ OMIT 15 February MSG Дан државности Србије OMIT 16 February MSG Дан државности Србије REM 17 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 15)) == 0] MSG Дан државности Србије (слободан дан) REM 17 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 16)) == 0] MSG Дан државности Србије (слободан дан) -OMIT [easterdate($Uy)-2] MSG Велики петак -OMIT [easterdate($Uy)-1] MSG Велика субота -OMIT [easterdate($Uy)] MSG Васкрс -OMIT [easterdate($Uy)+1] MSG Други дан Васкрса +OMIT [orthodoxeaster($Uy)-2] MSG Велики петак +OMIT [orthodoxeaster($Uy)-1] MSG Велика субота +OMIT [orthodoxeaster($Uy)] MSG Васкрс +OMIT [orthodoxeaster($Uy)+1] MSG Други дан Васкрса OMIT 1 May MSG Празник рада OMIT 2 May MSG Празник рада REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Празник рада (слободан дан) diff --git a/include/holidays/ua.rem b/include/holidays/ua.rem index 29b83b4f..461b236d 100644 --- a/include/holidays/ua.rem +++ b/include/holidays/ua.rem @@ -7,10 +7,10 @@ # Optional holidays REM 1 January MSG Новий рік REM 8 March MSG Міжнародний жіночий день -REM [easterdate($Uy)] MSG Великдень (Пасха) +REM [orthodoxeaster($Uy)] MSG Великдень (Пасха) REM 1 May MSG День праці REM 8 May MSG День памʼяті та перемоги над нацизмом у Другій світовій війні 1939-1945 років -REM [easterdate($Uy)+49] MSG Трійця +REM [orthodoxeaster($Uy)+49] MSG Трійця REM 28 June MSG День Конституції України REM 15 July MSG День Української Державності REM 24 August MSG День незалежності України