From 86f0f5a5aec51d88960baa92026ff408ed66502b Mon Sep 17 00:00:00 2001 From: havardnyboe <40893697+havardnyboe@users.noreply.github.com> Date: Sun, 3 Dec 2023 22:39:09 +0100 Subject: [PATCH 1/3] fixed sundays fixed sundays in advent for norway Should be before 25th not 24th since the fourth sunday can be the 24th. Valid days for 1st sunday are Nov 27th to Dec 3rd. Source: https://no.wikipedia.org/wiki/Advent --- data/countries/NO.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/data/countries/NO.yaml b/data/countries/NO.yaml index 3689e554f..831f69269 100644 --- a/data/countries/NO.yaml +++ b/data/countries/NO.yaml @@ -6,6 +6,7 @@ holidays: # @source https://www.timeanddate.com/holidays/norway/2023 # @attrib https://no.wikipedia.org/wiki/Norges_offisielle_flaggdager # @attrib https://no.wikipedia.org/wiki/Allehelgensaften + # @attrib https://no.wikipedia.org/wiki/Advent NO: names: no: Norge @@ -115,22 +116,22 @@ holidays: 2nd sunday in November: _name: Fathers Day type: observance - 4th sunday before 12-24: + 4th sunday before 12-25: name: no: Første søndag i advent en: First Sunday of Advent type: observance - 3rd sunday before 12-24: + 3rd sunday before 12-25: name: no: Andre søndag i advent en: Second Sunday of Advent type: observance - 2nd sunday before 12-24: + 2nd sunday before 12-25: name: no: Tredje søndag i advent en: Third Sunday of Advent type: observance - 1st sunday before 12-24: + 1st sunday before 12-25: name: no: Fjerde søndag i advent en: Fourth Sunday of Advent From 73d783834d9f3f40a1ae04c5896215a5c50ea5de Mon Sep 17 00:00:00 2001 From: havardnyboe <40893697+havardnyboe@users.noreply.github.com> Date: Sun, 3 Dec 2023 22:42:48 +0100 Subject: [PATCH 2/3] Generated and ran test files --- test/fixtures/EG-2023.json | 28 ++++++++++++++-------------- test/fixtures/EG-2024.json | 32 ++++++++++++++++---------------- test/fixtures/EG-2025.json | 30 +++++++++++++++--------------- test/fixtures/EG-2026.json | 32 ++++++++++++++++---------------- test/fixtures/EG-2027.json | 32 ++++++++++++++++---------------- test/fixtures/GL-2024.json | 28 ++++++++++++++-------------- test/fixtures/GL-2025.json | 36 ++++++++++++++++++------------------ test/fixtures/GL-2026.json | 36 ++++++++++++++++++------------------ test/fixtures/GL-2027.json | 28 ++++++++++++++-------------- test/fixtures/NO-2015.json | 8 ++++---- test/fixtures/NO-2016.json | 8 ++++---- test/fixtures/NO-2017.json | 28 ++++++++++++++-------------- test/fixtures/NO-2018.json | 8 ++++---- test/fixtures/NO-2019.json | 8 ++++---- test/fixtures/NO-2020.json | 8 ++++---- test/fixtures/NO-2021.json | 8 ++++---- test/fixtures/NO-2022.json | 8 ++++---- test/fixtures/NO-2023.json | 28 ++++++++++++++-------------- test/fixtures/NO-2024.json | 8 ++++---- test/fixtures/NO-2025.json | 8 ++++---- test/fixtures/NO-2026.json | 8 ++++---- test/fixtures/NO-2027.json | 8 ++++---- test/fixtures/SJ-2015.json | 8 ++++---- test/fixtures/SJ-2016.json | 8 ++++---- test/fixtures/SJ-2017.json | 28 ++++++++++++++-------------- test/fixtures/SJ-2018.json | 8 ++++---- test/fixtures/SJ-2019.json | 8 ++++---- test/fixtures/SJ-2020.json | 8 ++++---- test/fixtures/SJ-2021.json | 8 ++++---- test/fixtures/SJ-2022.json | 8 ++++---- test/fixtures/SJ-2023.json | 28 ++++++++++++++-------------- test/fixtures/SJ-2024.json | 8 ++++---- test/fixtures/SJ-2025.json | 8 ++++---- test/fixtures/SJ-2026.json | 8 ++++---- test/fixtures/SJ-2027.json | 8 ++++---- 35 files changed, 285 insertions(+), 285 deletions(-) diff --git a/test/fixtures/EG-2023.json b/test/fixtures/EG-2023.json index 8eecf9486..08239794d 100644 --- a/test/fixtures/EG-2023.json +++ b/test/fixtures/EG-2023.json @@ -55,8 +55,8 @@ }, { "date": "2023-05-01 00:00:00", - "start": "2023-04-30T21:00:00.000Z", - "end": "2023-05-01T21:00:00.000Z", + "start": "2023-04-30T22:00:00.000Z", + "end": "2023-05-01T22:00:00.000Z", "name": "يوم العمال", "type": "public", "rule": "05-01", @@ -64,8 +64,8 @@ }, { "date": "2023-06-28 00:00:00 -0600", - "start": "2023-06-27T15:00:00.000Z", - "end": "2023-07-01T15:00:00.000Z", + "start": "2023-06-27T16:00:00.000Z", + "end": "2023-07-01T16:00:00.000Z", "name": "عيد الأضحى", "type": "public", "rule": "10 Dhu al-Hijjah P4D", @@ -73,8 +73,8 @@ }, { "date": "2023-06-30 00:00:00", - "start": "2023-06-29T21:00:00.000Z", - "end": "2023-06-30T21:00:00.000Z", + "start": "2023-06-29T22:00:00.000Z", + "end": "2023-06-30T22:00:00.000Z", "name": "عيد ثورة 30 يونيو", "type": "public", "rule": "06-30", @@ -82,8 +82,8 @@ }, { "date": "2023-07-19 00:00:00 -0600", - "start": "2023-07-18T15:00:00.000Z", - "end": "2023-07-19T15:00:00.000Z", + "start": "2023-07-18T16:00:00.000Z", + "end": "2023-07-19T16:00:00.000Z", "name": "رأس السنة الهجرية", "type": "public", "rule": "1 Muharram", @@ -91,8 +91,8 @@ }, { "date": "2023-07-23 00:00:00", - "start": "2023-07-22T21:00:00.000Z", - "end": "2023-07-23T21:00:00.000Z", + "start": "2023-07-22T22:00:00.000Z", + "end": "2023-07-23T22:00:00.000Z", "name": "يوم الثورة", "type": "public", "rule": "07-23", @@ -100,8 +100,8 @@ }, { "date": "2023-09-27 00:00:00 -0600", - "start": "2023-09-26T15:00:00.000Z", - "end": "2023-09-27T15:00:00.000Z", + "start": "2023-09-26T16:00:00.000Z", + "end": "2023-09-27T16:00:00.000Z", "name": "المولد النبويّ", "type": "public", "rule": "12 Rabi al-awwal", @@ -109,8 +109,8 @@ }, { "date": "2023-10-06 00:00:00", - "start": "2023-10-05T21:00:00.000Z", - "end": "2023-10-06T21:00:00.000Z", + "start": "2023-10-05T22:00:00.000Z", + "end": "2023-10-06T22:00:00.000Z", "name": "عيد القوات المسلحة", "type": "public", "rule": "10-06", diff --git a/test/fixtures/EG-2024.json b/test/fixtures/EG-2024.json index 6f148a7bb..6304b471d 100644 --- a/test/fixtures/EG-2024.json +++ b/test/fixtures/EG-2024.json @@ -46,8 +46,8 @@ }, { "date": "2024-05-01 00:00:00", - "start": "2024-04-30T21:00:00.000Z", - "end": "2024-05-01T21:00:00.000Z", + "start": "2024-04-30T22:00:00.000Z", + "end": "2024-05-01T22:00:00.000Z", "name": "يوم العمال", "type": "public", "rule": "05-01", @@ -55,8 +55,8 @@ }, { "date": "2024-05-06 00:00:00", - "start": "2024-05-05T21:00:00.000Z", - "end": "2024-05-06T21:00:00.000Z", + "start": "2024-05-05T22:00:00.000Z", + "end": "2024-05-06T22:00:00.000Z", "name": "شم النسيم", "type": "public", "rule": "orthodox 1", @@ -64,8 +64,8 @@ }, { "date": "2024-06-16 00:00:00 -0600", - "start": "2024-06-15T15:00:00.000Z", - "end": "2024-06-19T15:00:00.000Z", + "start": "2024-06-15T16:00:00.000Z", + "end": "2024-06-19T16:00:00.000Z", "name": "عيد الأضحى", "type": "public", "rule": "10 Dhu al-Hijjah P4D", @@ -73,8 +73,8 @@ }, { "date": "2024-06-30 00:00:00", - "start": "2024-06-29T21:00:00.000Z", - "end": "2024-06-30T21:00:00.000Z", + "start": "2024-06-29T22:00:00.000Z", + "end": "2024-06-30T22:00:00.000Z", "name": "عيد ثورة 30 يونيو", "type": "public", "rule": "06-30", @@ -82,8 +82,8 @@ }, { "date": "2024-07-07 00:00:00 -0600", - "start": "2024-07-06T15:00:00.000Z", - "end": "2024-07-07T15:00:00.000Z", + "start": "2024-07-06T16:00:00.000Z", + "end": "2024-07-07T16:00:00.000Z", "name": "رأس السنة الهجرية", "type": "public", "rule": "1 Muharram", @@ -91,8 +91,8 @@ }, { "date": "2024-07-23 00:00:00", - "start": "2024-07-22T21:00:00.000Z", - "end": "2024-07-23T21:00:00.000Z", + "start": "2024-07-22T22:00:00.000Z", + "end": "2024-07-23T22:00:00.000Z", "name": "يوم الثورة", "type": "public", "rule": "07-23", @@ -100,8 +100,8 @@ }, { "date": "2024-09-15 00:00:00 -0600", - "start": "2024-09-14T15:00:00.000Z", - "end": "2024-09-15T15:00:00.000Z", + "start": "2024-09-14T16:00:00.000Z", + "end": "2024-09-15T16:00:00.000Z", "name": "المولد النبويّ", "type": "public", "rule": "12 Rabi al-awwal", @@ -109,8 +109,8 @@ }, { "date": "2024-10-06 00:00:00", - "start": "2024-10-05T21:00:00.000Z", - "end": "2024-10-06T21:00:00.000Z", + "start": "2024-10-05T22:00:00.000Z", + "end": "2024-10-06T22:00:00.000Z", "name": "عيد القوات المسلحة", "type": "public", "rule": "10-06", diff --git a/test/fixtures/EG-2025.json b/test/fixtures/EG-2025.json index 8bec39546..b20dcaf38 100644 --- a/test/fixtures/EG-2025.json +++ b/test/fixtures/EG-2025.json @@ -47,7 +47,7 @@ { "date": "2025-04-25 00:00:00", "start": "2025-04-24T22:00:00.000Z", - "end": "2025-04-25T21:00:00.000Z", + "end": "2025-04-25T22:00:00.000Z", "name": "عيد تحرير سيناء", "type": "public", "rule": "04-25", @@ -55,8 +55,8 @@ }, { "date": "2025-05-01 00:00:00", - "start": "2025-04-30T21:00:00.000Z", - "end": "2025-05-01T21:00:00.000Z", + "start": "2025-04-30T22:00:00.000Z", + "end": "2025-05-01T22:00:00.000Z", "name": "يوم العمال", "type": "public", "rule": "05-01", @@ -64,8 +64,8 @@ }, { "date": "2025-06-06 00:00:00 -0600", - "start": "2025-06-05T15:00:00.000Z", - "end": "2025-06-09T15:00:00.000Z", + "start": "2025-06-05T16:00:00.000Z", + "end": "2025-06-09T16:00:00.000Z", "name": "عيد الأضحى", "type": "public", "rule": "10 Dhu al-Hijjah P4D", @@ -73,8 +73,8 @@ }, { "date": "2025-06-26 00:00:00 -0600", - "start": "2025-06-25T15:00:00.000Z", - "end": "2025-06-26T15:00:00.000Z", + "start": "2025-06-25T16:00:00.000Z", + "end": "2025-06-26T16:00:00.000Z", "name": "رأس السنة الهجرية", "type": "public", "rule": "1 Muharram", @@ -82,8 +82,8 @@ }, { "date": "2025-06-30 00:00:00", - "start": "2025-06-29T21:00:00.000Z", - "end": "2025-06-30T21:00:00.000Z", + "start": "2025-06-29T22:00:00.000Z", + "end": "2025-06-30T22:00:00.000Z", "name": "عيد ثورة 30 يونيو", "type": "public", "rule": "06-30", @@ -91,8 +91,8 @@ }, { "date": "2025-07-23 00:00:00", - "start": "2025-07-22T21:00:00.000Z", - "end": "2025-07-23T21:00:00.000Z", + "start": "2025-07-22T22:00:00.000Z", + "end": "2025-07-23T22:00:00.000Z", "name": "يوم الثورة", "type": "public", "rule": "07-23", @@ -100,8 +100,8 @@ }, { "date": "2025-09-04 00:00:00 -0600", - "start": "2025-09-03T15:00:00.000Z", - "end": "2025-09-04T15:00:00.000Z", + "start": "2025-09-03T16:00:00.000Z", + "end": "2025-09-04T16:00:00.000Z", "name": "المولد النبويّ", "type": "public", "rule": "12 Rabi al-awwal", @@ -109,8 +109,8 @@ }, { "date": "2025-10-06 00:00:00", - "start": "2025-10-05T21:00:00.000Z", - "end": "2025-10-06T21:00:00.000Z", + "start": "2025-10-05T22:00:00.000Z", + "end": "2025-10-06T22:00:00.000Z", "name": "عيد القوات المسلحة", "type": "public", "rule": "10-06", diff --git a/test/fixtures/EG-2026.json b/test/fixtures/EG-2026.json index 88c858657..06465050a 100644 --- a/test/fixtures/EG-2026.json +++ b/test/fixtures/EG-2026.json @@ -46,8 +46,8 @@ }, { "date": "2026-04-25 00:00:00", - "start": "2026-04-24T21:00:00.000Z", - "end": "2026-04-25T21:00:00.000Z", + "start": "2026-04-24T22:00:00.000Z", + "end": "2026-04-25T22:00:00.000Z", "name": "عيد تحرير سيناء", "type": "public", "rule": "04-25", @@ -55,8 +55,8 @@ }, { "date": "2026-05-01 00:00:00", - "start": "2026-04-30T21:00:00.000Z", - "end": "2026-05-01T21:00:00.000Z", + "start": "2026-04-30T22:00:00.000Z", + "end": "2026-05-01T22:00:00.000Z", "name": "يوم العمال", "type": "public", "rule": "05-01", @@ -64,8 +64,8 @@ }, { "date": "2026-05-27 00:00:00 -0600", - "start": "2026-05-26T15:00:00.000Z", - "end": "2026-05-30T15:00:00.000Z", + "start": "2026-05-26T16:00:00.000Z", + "end": "2026-05-30T16:00:00.000Z", "name": "عيد الأضحى", "type": "public", "rule": "10 Dhu al-Hijjah P4D", @@ -73,8 +73,8 @@ }, { "date": "2026-06-16 00:00:00 -0600", - "start": "2026-06-15T15:00:00.000Z", - "end": "2026-06-16T15:00:00.000Z", + "start": "2026-06-15T16:00:00.000Z", + "end": "2026-06-16T16:00:00.000Z", "name": "رأس السنة الهجرية", "type": "public", "rule": "1 Muharram", @@ -82,8 +82,8 @@ }, { "date": "2026-06-30 00:00:00", - "start": "2026-06-29T21:00:00.000Z", - "end": "2026-06-30T21:00:00.000Z", + "start": "2026-06-29T22:00:00.000Z", + "end": "2026-06-30T22:00:00.000Z", "name": "عيد ثورة 30 يونيو", "type": "public", "rule": "06-30", @@ -91,8 +91,8 @@ }, { "date": "2026-07-23 00:00:00", - "start": "2026-07-22T21:00:00.000Z", - "end": "2026-07-23T21:00:00.000Z", + "start": "2026-07-22T22:00:00.000Z", + "end": "2026-07-23T22:00:00.000Z", "name": "يوم الثورة", "type": "public", "rule": "07-23", @@ -100,8 +100,8 @@ }, { "date": "2026-08-25 00:00:00 -0600", - "start": "2026-08-24T15:00:00.000Z", - "end": "2026-08-25T15:00:00.000Z", + "start": "2026-08-24T16:00:00.000Z", + "end": "2026-08-25T16:00:00.000Z", "name": "المولد النبويّ", "type": "public", "rule": "12 Rabi al-awwal", @@ -109,8 +109,8 @@ }, { "date": "2026-10-06 00:00:00", - "start": "2026-10-05T21:00:00.000Z", - "end": "2026-10-06T21:00:00.000Z", + "start": "2026-10-05T22:00:00.000Z", + "end": "2026-10-06T22:00:00.000Z", "name": "عيد القوات المسلحة", "type": "public", "rule": "10-06", diff --git a/test/fixtures/EG-2027.json b/test/fixtures/EG-2027.json index c19a0d448..13e212d4d 100644 --- a/test/fixtures/EG-2027.json +++ b/test/fixtures/EG-2027.json @@ -46,8 +46,8 @@ }, { "date": "2027-05-01 00:00:00", - "start": "2027-04-30T21:00:00.000Z", - "end": "2027-05-01T21:00:00.000Z", + "start": "2027-04-30T22:00:00.000Z", + "end": "2027-05-01T22:00:00.000Z", "name": "يوم العمال", "type": "public", "rule": "05-01", @@ -55,8 +55,8 @@ }, { "date": "2027-05-03 00:00:00", - "start": "2027-05-02T21:00:00.000Z", - "end": "2027-05-03T21:00:00.000Z", + "start": "2027-05-02T22:00:00.000Z", + "end": "2027-05-03T22:00:00.000Z", "name": "شم النسيم", "type": "public", "rule": "orthodox 1", @@ -64,8 +64,8 @@ }, { "date": "2027-05-16 00:00:00 -0600", - "start": "2027-05-15T15:00:00.000Z", - "end": "2027-05-19T15:00:00.000Z", + "start": "2027-05-15T16:00:00.000Z", + "end": "2027-05-19T16:00:00.000Z", "name": "عيد الأضحى", "type": "public", "rule": "10 Dhu al-Hijjah P4D", @@ -73,8 +73,8 @@ }, { "date": "2027-06-06 00:00:00 -0600", - "start": "2027-06-05T15:00:00.000Z", - "end": "2027-06-06T15:00:00.000Z", + "start": "2027-06-05T16:00:00.000Z", + "end": "2027-06-06T16:00:00.000Z", "name": "رأس السنة الهجرية", "type": "public", "rule": "1 Muharram", @@ -82,8 +82,8 @@ }, { "date": "2027-06-30 00:00:00", - "start": "2027-06-29T21:00:00.000Z", - "end": "2027-06-30T21:00:00.000Z", + "start": "2027-06-29T22:00:00.000Z", + "end": "2027-06-30T22:00:00.000Z", "name": "عيد ثورة 30 يونيو", "type": "public", "rule": "06-30", @@ -91,8 +91,8 @@ }, { "date": "2027-07-23 00:00:00", - "start": "2027-07-22T21:00:00.000Z", - "end": "2027-07-23T21:00:00.000Z", + "start": "2027-07-22T22:00:00.000Z", + "end": "2027-07-23T22:00:00.000Z", "name": "يوم الثورة", "type": "public", "rule": "07-23", @@ -100,8 +100,8 @@ }, { "date": "2027-08-14 00:00:00 -0600", - "start": "2027-08-13T15:00:00.000Z", - "end": "2027-08-14T15:00:00.000Z", + "start": "2027-08-13T16:00:00.000Z", + "end": "2027-08-14T16:00:00.000Z", "name": "المولد النبويّ", "type": "public", "rule": "12 Rabi al-awwal", @@ -109,8 +109,8 @@ }, { "date": "2027-10-06 00:00:00", - "start": "2027-10-05T21:00:00.000Z", - "end": "2027-10-06T21:00:00.000Z", + "start": "2027-10-05T22:00:00.000Z", + "end": "2027-10-06T22:00:00.000Z", "name": "عيد القوات المسلحة", "type": "public", "rule": "10-06", diff --git a/test/fixtures/GL-2024.json b/test/fixtures/GL-2024.json index 4d244d6b2..e48c310cf 100644 --- a/test/fixtures/GL-2024.json +++ b/test/fixtures/GL-2024.json @@ -37,8 +37,8 @@ }, { "date": "2024-03-31 00:00:00", - "start": "2024-03-31T01:00:00.000Z", - "end": "2024-04-01T01:00:00.000Z", + "start": "2024-03-31T02:00:00.000Z", + "end": "2024-04-01T02:00:00.000Z", "name": "poorskip-ullua", "type": "public", "rule": "easter", @@ -46,8 +46,8 @@ }, { "date": "2024-04-01 00:00:00", - "start": "2024-04-01T01:00:00.000Z", - "end": "2024-04-02T01:00:00.000Z", + "start": "2024-04-01T02:00:00.000Z", + "end": "2024-04-02T02:00:00.000Z", "name": "poorskip-aappaa", "type": "public", "rule": "easter 1", @@ -55,8 +55,8 @@ }, { "date": "2024-04-26 00:00:00", - "start": "2024-04-26T01:00:00.000Z", - "end": "2024-04-27T01:00:00.000Z", + "start": "2024-04-26T02:00:00.000Z", + "end": "2024-04-27T02:00:00.000Z", "name": "tussiarfissuaq", "type": "public", "rule": "easter 26", @@ -64,8 +64,8 @@ }, { "date": "2024-05-09 00:00:00", - "start": "2024-05-09T01:00:00.000Z", - "end": "2024-05-10T01:00:00.000Z", + "start": "2024-05-09T02:00:00.000Z", + "end": "2024-05-10T02:00:00.000Z", "name": "qilaliarfik", "type": "public", "rule": "easter 39", @@ -73,8 +73,8 @@ }, { "date": "2024-05-19 00:00:00", - "start": "2024-05-19T01:00:00.000Z", - "end": "2024-05-20T01:00:00.000Z", + "start": "2024-05-19T02:00:00.000Z", + "end": "2024-05-20T02:00:00.000Z", "name": "piinsip ullua", "type": "public", "rule": "easter 49", @@ -82,8 +82,8 @@ }, { "date": "2024-05-20 00:00:00", - "start": "2024-05-20T01:00:00.000Z", - "end": "2024-05-21T01:00:00.000Z", + "start": "2024-05-20T02:00:00.000Z", + "end": "2024-05-21T02:00:00.000Z", "name": "piinsip aappaa", "type": "public", "rule": "easter 50", @@ -91,8 +91,8 @@ }, { "date": "2024-06-21 00:00:00", - "start": "2024-06-21T01:00:00.000Z", - "end": "2024-06-22T01:00:00.000Z", + "start": "2024-06-21T02:00:00.000Z", + "end": "2024-06-22T02:00:00.000Z", "name": "ullortuneq", "type": "public", "rule": "06-21", diff --git a/test/fixtures/GL-2025.json b/test/fixtures/GL-2025.json index 6764c384d..5d6968880 100644 --- a/test/fixtures/GL-2025.json +++ b/test/fixtures/GL-2025.json @@ -19,8 +19,8 @@ }, { "date": "2025-04-17 00:00:00", - "start": "2025-04-17T01:00:00.000Z", - "end": "2025-04-18T01:00:00.000Z", + "start": "2025-04-17T02:00:00.000Z", + "end": "2025-04-18T02:00:00.000Z", "name": "sisamanngortoq illernartoq", "type": "public", "rule": "easter -3", @@ -28,8 +28,8 @@ }, { "date": "2025-04-18 00:00:00", - "start": "2025-04-18T01:00:00.000Z", - "end": "2025-04-19T01:00:00.000Z", + "start": "2025-04-18T02:00:00.000Z", + "end": "2025-04-19T02:00:00.000Z", "name": "tallimanngornersuaq", "type": "public", "rule": "easter -2", @@ -37,8 +37,8 @@ }, { "date": "2025-04-20 00:00:00", - "start": "2025-04-20T01:00:00.000Z", - "end": "2025-04-21T01:00:00.000Z", + "start": "2025-04-20T02:00:00.000Z", + "end": "2025-04-21T02:00:00.000Z", "name": "poorskip-ullua", "type": "public", "rule": "easter", @@ -46,8 +46,8 @@ }, { "date": "2025-04-21 00:00:00", - "start": "2025-04-21T01:00:00.000Z", - "end": "2025-04-22T01:00:00.000Z", + "start": "2025-04-21T02:00:00.000Z", + "end": "2025-04-22T02:00:00.000Z", "name": "poorskip-aappaa", "type": "public", "rule": "easter 1", @@ -55,8 +55,8 @@ }, { "date": "2025-05-16 00:00:00", - "start": "2025-05-16T01:00:00.000Z", - "end": "2025-05-17T01:00:00.000Z", + "start": "2025-05-16T02:00:00.000Z", + "end": "2025-05-17T02:00:00.000Z", "name": "tussiarfissuaq", "type": "public", "rule": "easter 26", @@ -64,8 +64,8 @@ }, { "date": "2025-05-29 00:00:00", - "start": "2025-05-29T01:00:00.000Z", - "end": "2025-05-30T01:00:00.000Z", + "start": "2025-05-29T02:00:00.000Z", + "end": "2025-05-30T02:00:00.000Z", "name": "qilaliarfik", "type": "public", "rule": "easter 39", @@ -73,8 +73,8 @@ }, { "date": "2025-06-08 00:00:00", - "start": "2025-06-08T01:00:00.000Z", - "end": "2025-06-09T01:00:00.000Z", + "start": "2025-06-08T02:00:00.000Z", + "end": "2025-06-09T02:00:00.000Z", "name": "piinsip ullua", "type": "public", "rule": "easter 49", @@ -82,8 +82,8 @@ }, { "date": "2025-06-09 00:00:00", - "start": "2025-06-09T01:00:00.000Z", - "end": "2025-06-10T01:00:00.000Z", + "start": "2025-06-09T02:00:00.000Z", + "end": "2025-06-10T02:00:00.000Z", "name": "piinsip aappaa", "type": "public", "rule": "easter 50", @@ -91,8 +91,8 @@ }, { "date": "2025-06-21 00:00:00", - "start": "2025-06-21T01:00:00.000Z", - "end": "2025-06-22T01:00:00.000Z", + "start": "2025-06-21T02:00:00.000Z", + "end": "2025-06-22T02:00:00.000Z", "name": "ullortuneq", "type": "public", "rule": "06-21", diff --git a/test/fixtures/GL-2026.json b/test/fixtures/GL-2026.json index 4e6ce6b2f..b28f835b4 100644 --- a/test/fixtures/GL-2026.json +++ b/test/fixtures/GL-2026.json @@ -19,8 +19,8 @@ }, { "date": "2026-04-02 00:00:00", - "start": "2026-04-02T01:00:00.000Z", - "end": "2026-04-03T01:00:00.000Z", + "start": "2026-04-02T02:00:00.000Z", + "end": "2026-04-03T02:00:00.000Z", "name": "sisamanngortoq illernartoq", "type": "public", "rule": "easter -3", @@ -28,8 +28,8 @@ }, { "date": "2026-04-03 00:00:00", - "start": "2026-04-03T01:00:00.000Z", - "end": "2026-04-04T01:00:00.000Z", + "start": "2026-04-03T02:00:00.000Z", + "end": "2026-04-04T02:00:00.000Z", "name": "tallimanngornersuaq", "type": "public", "rule": "easter -2", @@ -37,8 +37,8 @@ }, { "date": "2026-04-05 00:00:00", - "start": "2026-04-05T01:00:00.000Z", - "end": "2026-04-06T01:00:00.000Z", + "start": "2026-04-05T02:00:00.000Z", + "end": "2026-04-06T02:00:00.000Z", "name": "poorskip-ullua", "type": "public", "rule": "easter", @@ -46,8 +46,8 @@ }, { "date": "2026-04-06 00:00:00", - "start": "2026-04-06T01:00:00.000Z", - "end": "2026-04-07T01:00:00.000Z", + "start": "2026-04-06T02:00:00.000Z", + "end": "2026-04-07T02:00:00.000Z", "name": "poorskip-aappaa", "type": "public", "rule": "easter 1", @@ -55,8 +55,8 @@ }, { "date": "2026-05-01 00:00:00", - "start": "2026-05-01T01:00:00.000Z", - "end": "2026-05-02T01:00:00.000Z", + "start": "2026-05-01T02:00:00.000Z", + "end": "2026-05-02T02:00:00.000Z", "name": "tussiarfissuaq", "type": "public", "rule": "easter 26", @@ -64,8 +64,8 @@ }, { "date": "2026-05-14 00:00:00", - "start": "2026-05-14T01:00:00.000Z", - "end": "2026-05-15T01:00:00.000Z", + "start": "2026-05-14T02:00:00.000Z", + "end": "2026-05-15T02:00:00.000Z", "name": "qilaliarfik", "type": "public", "rule": "easter 39", @@ -73,8 +73,8 @@ }, { "date": "2026-05-24 00:00:00", - "start": "2026-05-24T01:00:00.000Z", - "end": "2026-05-25T01:00:00.000Z", + "start": "2026-05-24T02:00:00.000Z", + "end": "2026-05-25T02:00:00.000Z", "name": "piinsip ullua", "type": "public", "rule": "easter 49", @@ -82,8 +82,8 @@ }, { "date": "2026-05-25 00:00:00", - "start": "2026-05-25T01:00:00.000Z", - "end": "2026-05-26T01:00:00.000Z", + "start": "2026-05-25T02:00:00.000Z", + "end": "2026-05-26T02:00:00.000Z", "name": "piinsip aappaa", "type": "public", "rule": "easter 50", @@ -91,8 +91,8 @@ }, { "date": "2026-06-21 00:00:00", - "start": "2026-06-21T01:00:00.000Z", - "end": "2026-06-22T01:00:00.000Z", + "start": "2026-06-21T02:00:00.000Z", + "end": "2026-06-22T02:00:00.000Z", "name": "ullortuneq", "type": "public", "rule": "06-21", diff --git a/test/fixtures/GL-2027.json b/test/fixtures/GL-2027.json index a91441f48..2b468a068 100644 --- a/test/fixtures/GL-2027.json +++ b/test/fixtures/GL-2027.json @@ -37,8 +37,8 @@ }, { "date": "2027-03-28 00:00:00", - "start": "2027-03-28T01:00:00.000Z", - "end": "2027-03-29T01:00:00.000Z", + "start": "2027-03-28T02:00:00.000Z", + "end": "2027-03-29T02:00:00.000Z", "name": "poorskip-ullua", "type": "public", "rule": "easter", @@ -46,8 +46,8 @@ }, { "date": "2027-03-29 00:00:00", - "start": "2027-03-29T01:00:00.000Z", - "end": "2027-03-30T01:00:00.000Z", + "start": "2027-03-29T02:00:00.000Z", + "end": "2027-03-30T02:00:00.000Z", "name": "poorskip-aappaa", "type": "public", "rule": "easter 1", @@ -55,8 +55,8 @@ }, { "date": "2027-04-23 00:00:00", - "start": "2027-04-23T01:00:00.000Z", - "end": "2027-04-24T01:00:00.000Z", + "start": "2027-04-23T02:00:00.000Z", + "end": "2027-04-24T02:00:00.000Z", "name": "tussiarfissuaq", "type": "public", "rule": "easter 26", @@ -64,8 +64,8 @@ }, { "date": "2027-05-06 00:00:00", - "start": "2027-05-06T01:00:00.000Z", - "end": "2027-05-07T01:00:00.000Z", + "start": "2027-05-06T02:00:00.000Z", + "end": "2027-05-07T02:00:00.000Z", "name": "qilaliarfik", "type": "public", "rule": "easter 39", @@ -73,8 +73,8 @@ }, { "date": "2027-05-16 00:00:00", - "start": "2027-05-16T01:00:00.000Z", - "end": "2027-05-17T01:00:00.000Z", + "start": "2027-05-16T02:00:00.000Z", + "end": "2027-05-17T02:00:00.000Z", "name": "piinsip ullua", "type": "public", "rule": "easter 49", @@ -82,8 +82,8 @@ }, { "date": "2027-05-17 00:00:00", - "start": "2027-05-17T01:00:00.000Z", - "end": "2027-05-18T01:00:00.000Z", + "start": "2027-05-17T02:00:00.000Z", + "end": "2027-05-18T02:00:00.000Z", "name": "piinsip aappaa", "type": "public", "rule": "easter 50", @@ -91,8 +91,8 @@ }, { "date": "2027-06-21 00:00:00", - "start": "2027-06-21T01:00:00.000Z", - "end": "2027-06-22T01:00:00.000Z", + "start": "2027-06-21T02:00:00.000Z", + "end": "2027-06-22T02:00:00.000Z", "name": "ullortuneq", "type": "public", "rule": "06-21", diff --git a/test/fixtures/NO-2015.json b/test/fixtures/NO-2015.json index d02ed6687..daf4e0937 100644 --- a/test/fixtures/NO-2015.json +++ b/test/fixtures/NO-2015.json @@ -266,7 +266,7 @@ "end": "2015-11-29T23:00:00.000Z", "name": "Første søndag i advent", "type": "observance", - "rule": "4th sunday before 12-24", + "rule": "4th sunday before 12-25", "_weekday": "Sun" }, { @@ -275,7 +275,7 @@ "end": "2015-12-06T23:00:00.000Z", "name": "Andre søndag i advent", "type": "observance", - "rule": "3rd sunday before 12-24", + "rule": "3rd sunday before 12-25", "_weekday": "Sun" }, { @@ -284,7 +284,7 @@ "end": "2015-12-13T23:00:00.000Z", "name": "Tredje søndag i advent", "type": "observance", - "rule": "2nd sunday before 12-24", + "rule": "2nd sunday before 12-25", "_weekday": "Sun" }, { @@ -293,7 +293,7 @@ "end": "2015-12-20T23:00:00.000Z", "name": "Fjerde søndag i advent", "type": "observance", - "rule": "1st sunday before 12-24", + "rule": "1st sunday before 12-25", "_weekday": "Sun" }, { diff --git a/test/fixtures/NO-2016.json b/test/fixtures/NO-2016.json index 20caa407a..077823db1 100644 --- a/test/fixtures/NO-2016.json +++ b/test/fixtures/NO-2016.json @@ -266,7 +266,7 @@ "end": "2016-11-27T23:00:00.000Z", "name": "Første søndag i advent", "type": "observance", - "rule": "4th sunday before 12-24", + "rule": "4th sunday before 12-25", "_weekday": "Sun" }, { @@ -275,7 +275,7 @@ "end": "2016-12-04T23:00:00.000Z", "name": "Andre søndag i advent", "type": "observance", - "rule": "3rd sunday before 12-24", + "rule": "3rd sunday before 12-25", "_weekday": "Sun" }, { @@ -284,7 +284,7 @@ "end": "2016-12-11T23:00:00.000Z", "name": "Tredje søndag i advent", "type": "observance", - "rule": "2nd sunday before 12-24", + "rule": "2nd sunday before 12-25", "_weekday": "Sun" }, { @@ -293,7 +293,7 @@ "end": "2016-12-18T23:00:00.000Z", "name": "Fjerde søndag i advent", "type": "observance", - "rule": "1st sunday before 12-24", + "rule": "1st sunday before 12-25", "_weekday": "Sun" }, { diff --git a/test/fixtures/NO-2017.json b/test/fixtures/NO-2017.json index a5f52f128..6907e36dd 100644 --- a/test/fixtures/NO-2017.json +++ b/test/fixtures/NO-2017.json @@ -260,40 +260,40 @@ "rule": "2nd sunday in November", "_weekday": "Sun" }, - { - "date": "2017-11-26 00:00:00", - "start": "2017-11-25T23:00:00.000Z", - "end": "2017-11-26T23:00:00.000Z", - "name": "Første søndag i advent", - "type": "observance", - "rule": "4th sunday before 12-24", - "_weekday": "Sun" - }, { "date": "2017-12-03 00:00:00", "start": "2017-12-02T23:00:00.000Z", "end": "2017-12-03T23:00:00.000Z", - "name": "Andre søndag i advent", + "name": "Første søndag i advent", "type": "observance", - "rule": "3rd sunday before 12-24", + "rule": "4th sunday before 12-25", "_weekday": "Sun" }, { "date": "2017-12-10 00:00:00", "start": "2017-12-09T23:00:00.000Z", "end": "2017-12-10T23:00:00.000Z", - "name": "Tredje søndag i advent", + "name": "Andre søndag i advent", "type": "observance", - "rule": "2nd sunday before 12-24", + "rule": "3rd sunday before 12-25", "_weekday": "Sun" }, { "date": "2017-12-17 00:00:00", "start": "2017-12-16T23:00:00.000Z", "end": "2017-12-17T23:00:00.000Z", + "name": "Tredje søndag i advent", + "type": "observance", + "rule": "2nd sunday before 12-25", + "_weekday": "Sun" + }, + { + "date": "2017-12-24 00:00:00", + "start": "2017-12-23T23:00:00.000Z", + "end": "2017-12-24T23:00:00.000Z", "name": "Fjerde søndag i advent", "type": "observance", - "rule": "1st sunday before 12-24", + "rule": "1st sunday before 12-25", "_weekday": "Sun" }, { diff --git a/test/fixtures/NO-2018.json b/test/fixtures/NO-2018.json index a6afd7e16..bab4168e6 100644 --- a/test/fixtures/NO-2018.json +++ b/test/fixtures/NO-2018.json @@ -266,7 +266,7 @@ "end": "2018-12-02T23:00:00.000Z", "name": "Første søndag i advent", "type": "observance", - "rule": "4th sunday before 12-24", + "rule": "4th sunday before 12-25", "_weekday": "Sun" }, { @@ -275,7 +275,7 @@ "end": "2018-12-09T23:00:00.000Z", "name": "Andre søndag i advent", "type": "observance", - "rule": "3rd sunday before 12-24", + "rule": "3rd sunday before 12-25", "_weekday": "Sun" }, { @@ -284,7 +284,7 @@ "end": "2018-12-16T23:00:00.000Z", "name": "Tredje søndag i advent", "type": "observance", - "rule": "2nd sunday before 12-24", + "rule": "2nd sunday before 12-25", "_weekday": "Sun" }, { @@ -293,7 +293,7 @@ "end": "2018-12-23T23:00:00.000Z", "name": "Fjerde søndag i advent", "type": "observance", - "rule": "1st sunday before 12-24", + "rule": "1st sunday before 12-25", "_weekday": "Sun" }, { diff --git a/test/fixtures/NO-2019.json b/test/fixtures/NO-2019.json index 30d25d0c4..c8a11bc96 100644 --- a/test/fixtures/NO-2019.json +++ b/test/fixtures/NO-2019.json @@ -266,7 +266,7 @@ "end": "2019-12-01T23:00:00.000Z", "name": "Første søndag i advent", "type": "observance", - "rule": "4th sunday before 12-24", + "rule": "4th sunday before 12-25", "_weekday": "Sun" }, { @@ -275,7 +275,7 @@ "end": "2019-12-08T23:00:00.000Z", "name": "Andre søndag i advent", "type": "observance", - "rule": "3rd sunday before 12-24", + "rule": "3rd sunday before 12-25", "_weekday": "Sun" }, { @@ -284,7 +284,7 @@ "end": "2019-12-15T23:00:00.000Z", "name": "Tredje søndag i advent", "type": "observance", - "rule": "2nd sunday before 12-24", + "rule": "2nd sunday before 12-25", "_weekday": "Sun" }, { @@ -293,7 +293,7 @@ "end": "2019-12-22T23:00:00.000Z", "name": "Fjerde søndag i advent", "type": "observance", - "rule": "1st sunday before 12-24", + "rule": "1st sunday before 12-25", "_weekday": "Sun" }, { diff --git a/test/fixtures/NO-2020.json b/test/fixtures/NO-2020.json index fb28d413c..152afdf6b 100644 --- a/test/fixtures/NO-2020.json +++ b/test/fixtures/NO-2020.json @@ -266,7 +266,7 @@ "end": "2020-11-29T23:00:00.000Z", "name": "Første søndag i advent", "type": "observance", - "rule": "4th sunday before 12-24", + "rule": "4th sunday before 12-25", "_weekday": "Sun" }, { @@ -275,7 +275,7 @@ "end": "2020-12-06T23:00:00.000Z", "name": "Andre søndag i advent", "type": "observance", - "rule": "3rd sunday before 12-24", + "rule": "3rd sunday before 12-25", "_weekday": "Sun" }, { @@ -284,7 +284,7 @@ "end": "2020-12-13T23:00:00.000Z", "name": "Tredje søndag i advent", "type": "observance", - "rule": "2nd sunday before 12-24", + "rule": "2nd sunday before 12-25", "_weekday": "Sun" }, { @@ -293,7 +293,7 @@ "end": "2020-12-20T23:00:00.000Z", "name": "Fjerde søndag i advent", "type": "observance", - "rule": "1st sunday before 12-24", + "rule": "1st sunday before 12-25", "_weekday": "Sun" }, { diff --git a/test/fixtures/NO-2021.json b/test/fixtures/NO-2021.json index a75438e1e..a0d844f5b 100644 --- a/test/fixtures/NO-2021.json +++ b/test/fixtures/NO-2021.json @@ -266,7 +266,7 @@ "end": "2021-11-28T23:00:00.000Z", "name": "Første søndag i advent", "type": "observance", - "rule": "4th sunday before 12-24", + "rule": "4th sunday before 12-25", "_weekday": "Sun" }, { @@ -275,7 +275,7 @@ "end": "2021-12-05T23:00:00.000Z", "name": "Andre søndag i advent", "type": "observance", - "rule": "3rd sunday before 12-24", + "rule": "3rd sunday before 12-25", "_weekday": "Sun" }, { @@ -284,7 +284,7 @@ "end": "2021-12-12T23:00:00.000Z", "name": "Tredje søndag i advent", "type": "observance", - "rule": "2nd sunday before 12-24", + "rule": "2nd sunday before 12-25", "_weekday": "Sun" }, { @@ -293,7 +293,7 @@ "end": "2021-12-19T23:00:00.000Z", "name": "Fjerde søndag i advent", "type": "observance", - "rule": "1st sunday before 12-24", + "rule": "1st sunday before 12-25", "_weekday": "Sun" }, { diff --git a/test/fixtures/NO-2022.json b/test/fixtures/NO-2022.json index bc0cdaefe..d11016f98 100644 --- a/test/fixtures/NO-2022.json +++ b/test/fixtures/NO-2022.json @@ -266,7 +266,7 @@ "end": "2022-11-27T23:00:00.000Z", "name": "Første søndag i advent", "type": "observance", - "rule": "4th sunday before 12-24", + "rule": "4th sunday before 12-25", "_weekday": "Sun" }, { @@ -275,7 +275,7 @@ "end": "2022-12-04T23:00:00.000Z", "name": "Andre søndag i advent", "type": "observance", - "rule": "3rd sunday before 12-24", + "rule": "3rd sunday before 12-25", "_weekday": "Sun" }, { @@ -284,7 +284,7 @@ "end": "2022-12-11T23:00:00.000Z", "name": "Tredje søndag i advent", "type": "observance", - "rule": "2nd sunday before 12-24", + "rule": "2nd sunday before 12-25", "_weekday": "Sun" }, { @@ -293,7 +293,7 @@ "end": "2022-12-18T23:00:00.000Z", "name": "Fjerde søndag i advent", "type": "observance", - "rule": "1st sunday before 12-24", + "rule": "1st sunday before 12-25", "_weekday": "Sun" }, { diff --git a/test/fixtures/NO-2023.json b/test/fixtures/NO-2023.json index 8932a8b49..069b5dad2 100644 --- a/test/fixtures/NO-2023.json +++ b/test/fixtures/NO-2023.json @@ -260,40 +260,40 @@ "rule": "2nd sunday in November", "_weekday": "Sun" }, - { - "date": "2023-11-26 00:00:00", - "start": "2023-11-25T23:00:00.000Z", - "end": "2023-11-26T23:00:00.000Z", - "name": "Første søndag i advent", - "type": "observance", - "rule": "4th sunday before 12-24", - "_weekday": "Sun" - }, { "date": "2023-12-03 00:00:00", "start": "2023-12-02T23:00:00.000Z", "end": "2023-12-03T23:00:00.000Z", - "name": "Andre søndag i advent", + "name": "Første søndag i advent", "type": "observance", - "rule": "3rd sunday before 12-24", + "rule": "4th sunday before 12-25", "_weekday": "Sun" }, { "date": "2023-12-10 00:00:00", "start": "2023-12-09T23:00:00.000Z", "end": "2023-12-10T23:00:00.000Z", - "name": "Tredje søndag i advent", + "name": "Andre søndag i advent", "type": "observance", - "rule": "2nd sunday before 12-24", + "rule": "3rd sunday before 12-25", "_weekday": "Sun" }, { "date": "2023-12-17 00:00:00", "start": "2023-12-16T23:00:00.000Z", "end": "2023-12-17T23:00:00.000Z", + "name": "Tredje søndag i advent", + "type": "observance", + "rule": "2nd sunday before 12-25", + "_weekday": "Sun" + }, + { + "date": "2023-12-24 00:00:00", + "start": "2023-12-23T23:00:00.000Z", + "end": "2023-12-24T23:00:00.000Z", "name": "Fjerde søndag i advent", "type": "observance", - "rule": "1st sunday before 12-24", + "rule": "1st sunday before 12-25", "_weekday": "Sun" }, { diff --git a/test/fixtures/NO-2024.json b/test/fixtures/NO-2024.json index 22195ee45..4a8ba6977 100644 --- a/test/fixtures/NO-2024.json +++ b/test/fixtures/NO-2024.json @@ -266,7 +266,7 @@ "end": "2024-12-01T23:00:00.000Z", "name": "Første søndag i advent", "type": "observance", - "rule": "4th sunday before 12-24", + "rule": "4th sunday before 12-25", "_weekday": "Sun" }, { @@ -275,7 +275,7 @@ "end": "2024-12-08T23:00:00.000Z", "name": "Andre søndag i advent", "type": "observance", - "rule": "3rd sunday before 12-24", + "rule": "3rd sunday before 12-25", "_weekday": "Sun" }, { @@ -284,7 +284,7 @@ "end": "2024-12-15T23:00:00.000Z", "name": "Tredje søndag i advent", "type": "observance", - "rule": "2nd sunday before 12-24", + "rule": "2nd sunday before 12-25", "_weekday": "Sun" }, { @@ -293,7 +293,7 @@ "end": "2024-12-22T23:00:00.000Z", "name": "Fjerde søndag i advent", "type": "observance", - "rule": "1st sunday before 12-24", + "rule": "1st sunday before 12-25", "_weekday": "Sun" }, { diff --git a/test/fixtures/NO-2025.json b/test/fixtures/NO-2025.json index be0a89e96..4bf2916ba 100644 --- a/test/fixtures/NO-2025.json +++ b/test/fixtures/NO-2025.json @@ -266,7 +266,7 @@ "end": "2025-11-30T23:00:00.000Z", "name": "Første søndag i advent", "type": "observance", - "rule": "4th sunday before 12-24", + "rule": "4th sunday before 12-25", "_weekday": "Sun" }, { @@ -275,7 +275,7 @@ "end": "2025-12-07T23:00:00.000Z", "name": "Andre søndag i advent", "type": "observance", - "rule": "3rd sunday before 12-24", + "rule": "3rd sunday before 12-25", "_weekday": "Sun" }, { @@ -284,7 +284,7 @@ "end": "2025-12-14T23:00:00.000Z", "name": "Tredje søndag i advent", "type": "observance", - "rule": "2nd sunday before 12-24", + "rule": "2nd sunday before 12-25", "_weekday": "Sun" }, { @@ -293,7 +293,7 @@ "end": "2025-12-21T23:00:00.000Z", "name": "Fjerde søndag i advent", "type": "observance", - "rule": "1st sunday before 12-24", + "rule": "1st sunday before 12-25", "_weekday": "Sun" }, { diff --git a/test/fixtures/NO-2026.json b/test/fixtures/NO-2026.json index 67e6d89c0..2395416b3 100644 --- a/test/fixtures/NO-2026.json +++ b/test/fixtures/NO-2026.json @@ -266,7 +266,7 @@ "end": "2026-11-29T23:00:00.000Z", "name": "Første søndag i advent", "type": "observance", - "rule": "4th sunday before 12-24", + "rule": "4th sunday before 12-25", "_weekday": "Sun" }, { @@ -275,7 +275,7 @@ "end": "2026-12-06T23:00:00.000Z", "name": "Andre søndag i advent", "type": "observance", - "rule": "3rd sunday before 12-24", + "rule": "3rd sunday before 12-25", "_weekday": "Sun" }, { @@ -284,7 +284,7 @@ "end": "2026-12-13T23:00:00.000Z", "name": "Tredje søndag i advent", "type": "observance", - "rule": "2nd sunday before 12-24", + "rule": "2nd sunday before 12-25", "_weekday": "Sun" }, { @@ -293,7 +293,7 @@ "end": "2026-12-20T23:00:00.000Z", "name": "Fjerde søndag i advent", "type": "observance", - "rule": "1st sunday before 12-24", + "rule": "1st sunday before 12-25", "_weekday": "Sun" }, { diff --git a/test/fixtures/NO-2027.json b/test/fixtures/NO-2027.json index 71b88fbc8..4694f7566 100644 --- a/test/fixtures/NO-2027.json +++ b/test/fixtures/NO-2027.json @@ -266,7 +266,7 @@ "end": "2027-11-28T23:00:00.000Z", "name": "Første søndag i advent", "type": "observance", - "rule": "4th sunday before 12-24", + "rule": "4th sunday before 12-25", "_weekday": "Sun" }, { @@ -275,7 +275,7 @@ "end": "2027-12-05T23:00:00.000Z", "name": "Andre søndag i advent", "type": "observance", - "rule": "3rd sunday before 12-24", + "rule": "3rd sunday before 12-25", "_weekday": "Sun" }, { @@ -284,7 +284,7 @@ "end": "2027-12-12T23:00:00.000Z", "name": "Tredje søndag i advent", "type": "observance", - "rule": "2nd sunday before 12-24", + "rule": "2nd sunday before 12-25", "_weekday": "Sun" }, { @@ -293,7 +293,7 @@ "end": "2027-12-19T23:00:00.000Z", "name": "Fjerde søndag i advent", "type": "observance", - "rule": "1st sunday before 12-24", + "rule": "1st sunday before 12-25", "_weekday": "Sun" }, { diff --git a/test/fixtures/SJ-2015.json b/test/fixtures/SJ-2015.json index d02ed6687..daf4e0937 100644 --- a/test/fixtures/SJ-2015.json +++ b/test/fixtures/SJ-2015.json @@ -266,7 +266,7 @@ "end": "2015-11-29T23:00:00.000Z", "name": "Første søndag i advent", "type": "observance", - "rule": "4th sunday before 12-24", + "rule": "4th sunday before 12-25", "_weekday": "Sun" }, { @@ -275,7 +275,7 @@ "end": "2015-12-06T23:00:00.000Z", "name": "Andre søndag i advent", "type": "observance", - "rule": "3rd sunday before 12-24", + "rule": "3rd sunday before 12-25", "_weekday": "Sun" }, { @@ -284,7 +284,7 @@ "end": "2015-12-13T23:00:00.000Z", "name": "Tredje søndag i advent", "type": "observance", - "rule": "2nd sunday before 12-24", + "rule": "2nd sunday before 12-25", "_weekday": "Sun" }, { @@ -293,7 +293,7 @@ "end": "2015-12-20T23:00:00.000Z", "name": "Fjerde søndag i advent", "type": "observance", - "rule": "1st sunday before 12-24", + "rule": "1st sunday before 12-25", "_weekday": "Sun" }, { diff --git a/test/fixtures/SJ-2016.json b/test/fixtures/SJ-2016.json index 20caa407a..077823db1 100644 --- a/test/fixtures/SJ-2016.json +++ b/test/fixtures/SJ-2016.json @@ -266,7 +266,7 @@ "end": "2016-11-27T23:00:00.000Z", "name": "Første søndag i advent", "type": "observance", - "rule": "4th sunday before 12-24", + "rule": "4th sunday before 12-25", "_weekday": "Sun" }, { @@ -275,7 +275,7 @@ "end": "2016-12-04T23:00:00.000Z", "name": "Andre søndag i advent", "type": "observance", - "rule": "3rd sunday before 12-24", + "rule": "3rd sunday before 12-25", "_weekday": "Sun" }, { @@ -284,7 +284,7 @@ "end": "2016-12-11T23:00:00.000Z", "name": "Tredje søndag i advent", "type": "observance", - "rule": "2nd sunday before 12-24", + "rule": "2nd sunday before 12-25", "_weekday": "Sun" }, { @@ -293,7 +293,7 @@ "end": "2016-12-18T23:00:00.000Z", "name": "Fjerde søndag i advent", "type": "observance", - "rule": "1st sunday before 12-24", + "rule": "1st sunday before 12-25", "_weekday": "Sun" }, { diff --git a/test/fixtures/SJ-2017.json b/test/fixtures/SJ-2017.json index a5f52f128..6907e36dd 100644 --- a/test/fixtures/SJ-2017.json +++ b/test/fixtures/SJ-2017.json @@ -260,40 +260,40 @@ "rule": "2nd sunday in November", "_weekday": "Sun" }, - { - "date": "2017-11-26 00:00:00", - "start": "2017-11-25T23:00:00.000Z", - "end": "2017-11-26T23:00:00.000Z", - "name": "Første søndag i advent", - "type": "observance", - "rule": "4th sunday before 12-24", - "_weekday": "Sun" - }, { "date": "2017-12-03 00:00:00", "start": "2017-12-02T23:00:00.000Z", "end": "2017-12-03T23:00:00.000Z", - "name": "Andre søndag i advent", + "name": "Første søndag i advent", "type": "observance", - "rule": "3rd sunday before 12-24", + "rule": "4th sunday before 12-25", "_weekday": "Sun" }, { "date": "2017-12-10 00:00:00", "start": "2017-12-09T23:00:00.000Z", "end": "2017-12-10T23:00:00.000Z", - "name": "Tredje søndag i advent", + "name": "Andre søndag i advent", "type": "observance", - "rule": "2nd sunday before 12-24", + "rule": "3rd sunday before 12-25", "_weekday": "Sun" }, { "date": "2017-12-17 00:00:00", "start": "2017-12-16T23:00:00.000Z", "end": "2017-12-17T23:00:00.000Z", + "name": "Tredje søndag i advent", + "type": "observance", + "rule": "2nd sunday before 12-25", + "_weekday": "Sun" + }, + { + "date": "2017-12-24 00:00:00", + "start": "2017-12-23T23:00:00.000Z", + "end": "2017-12-24T23:00:00.000Z", "name": "Fjerde søndag i advent", "type": "observance", - "rule": "1st sunday before 12-24", + "rule": "1st sunday before 12-25", "_weekday": "Sun" }, { diff --git a/test/fixtures/SJ-2018.json b/test/fixtures/SJ-2018.json index a6afd7e16..bab4168e6 100644 --- a/test/fixtures/SJ-2018.json +++ b/test/fixtures/SJ-2018.json @@ -266,7 +266,7 @@ "end": "2018-12-02T23:00:00.000Z", "name": "Første søndag i advent", "type": "observance", - "rule": "4th sunday before 12-24", + "rule": "4th sunday before 12-25", "_weekday": "Sun" }, { @@ -275,7 +275,7 @@ "end": "2018-12-09T23:00:00.000Z", "name": "Andre søndag i advent", "type": "observance", - "rule": "3rd sunday before 12-24", + "rule": "3rd sunday before 12-25", "_weekday": "Sun" }, { @@ -284,7 +284,7 @@ "end": "2018-12-16T23:00:00.000Z", "name": "Tredje søndag i advent", "type": "observance", - "rule": "2nd sunday before 12-24", + "rule": "2nd sunday before 12-25", "_weekday": "Sun" }, { @@ -293,7 +293,7 @@ "end": "2018-12-23T23:00:00.000Z", "name": "Fjerde søndag i advent", "type": "observance", - "rule": "1st sunday before 12-24", + "rule": "1st sunday before 12-25", "_weekday": "Sun" }, { diff --git a/test/fixtures/SJ-2019.json b/test/fixtures/SJ-2019.json index 30d25d0c4..c8a11bc96 100644 --- a/test/fixtures/SJ-2019.json +++ b/test/fixtures/SJ-2019.json @@ -266,7 +266,7 @@ "end": "2019-12-01T23:00:00.000Z", "name": "Første søndag i advent", "type": "observance", - "rule": "4th sunday before 12-24", + "rule": "4th sunday before 12-25", "_weekday": "Sun" }, { @@ -275,7 +275,7 @@ "end": "2019-12-08T23:00:00.000Z", "name": "Andre søndag i advent", "type": "observance", - "rule": "3rd sunday before 12-24", + "rule": "3rd sunday before 12-25", "_weekday": "Sun" }, { @@ -284,7 +284,7 @@ "end": "2019-12-15T23:00:00.000Z", "name": "Tredje søndag i advent", "type": "observance", - "rule": "2nd sunday before 12-24", + "rule": "2nd sunday before 12-25", "_weekday": "Sun" }, { @@ -293,7 +293,7 @@ "end": "2019-12-22T23:00:00.000Z", "name": "Fjerde søndag i advent", "type": "observance", - "rule": "1st sunday before 12-24", + "rule": "1st sunday before 12-25", "_weekday": "Sun" }, { diff --git a/test/fixtures/SJ-2020.json b/test/fixtures/SJ-2020.json index fb28d413c..152afdf6b 100644 --- a/test/fixtures/SJ-2020.json +++ b/test/fixtures/SJ-2020.json @@ -266,7 +266,7 @@ "end": "2020-11-29T23:00:00.000Z", "name": "Første søndag i advent", "type": "observance", - "rule": "4th sunday before 12-24", + "rule": "4th sunday before 12-25", "_weekday": "Sun" }, { @@ -275,7 +275,7 @@ "end": "2020-12-06T23:00:00.000Z", "name": "Andre søndag i advent", "type": "observance", - "rule": "3rd sunday before 12-24", + "rule": "3rd sunday before 12-25", "_weekday": "Sun" }, { @@ -284,7 +284,7 @@ "end": "2020-12-13T23:00:00.000Z", "name": "Tredje søndag i advent", "type": "observance", - "rule": "2nd sunday before 12-24", + "rule": "2nd sunday before 12-25", "_weekday": "Sun" }, { @@ -293,7 +293,7 @@ "end": "2020-12-20T23:00:00.000Z", "name": "Fjerde søndag i advent", "type": "observance", - "rule": "1st sunday before 12-24", + "rule": "1st sunday before 12-25", "_weekday": "Sun" }, { diff --git a/test/fixtures/SJ-2021.json b/test/fixtures/SJ-2021.json index a75438e1e..a0d844f5b 100644 --- a/test/fixtures/SJ-2021.json +++ b/test/fixtures/SJ-2021.json @@ -266,7 +266,7 @@ "end": "2021-11-28T23:00:00.000Z", "name": "Første søndag i advent", "type": "observance", - "rule": "4th sunday before 12-24", + "rule": "4th sunday before 12-25", "_weekday": "Sun" }, { @@ -275,7 +275,7 @@ "end": "2021-12-05T23:00:00.000Z", "name": "Andre søndag i advent", "type": "observance", - "rule": "3rd sunday before 12-24", + "rule": "3rd sunday before 12-25", "_weekday": "Sun" }, { @@ -284,7 +284,7 @@ "end": "2021-12-12T23:00:00.000Z", "name": "Tredje søndag i advent", "type": "observance", - "rule": "2nd sunday before 12-24", + "rule": "2nd sunday before 12-25", "_weekday": "Sun" }, { @@ -293,7 +293,7 @@ "end": "2021-12-19T23:00:00.000Z", "name": "Fjerde søndag i advent", "type": "observance", - "rule": "1st sunday before 12-24", + "rule": "1st sunday before 12-25", "_weekday": "Sun" }, { diff --git a/test/fixtures/SJ-2022.json b/test/fixtures/SJ-2022.json index bc0cdaefe..d11016f98 100644 --- a/test/fixtures/SJ-2022.json +++ b/test/fixtures/SJ-2022.json @@ -266,7 +266,7 @@ "end": "2022-11-27T23:00:00.000Z", "name": "Første søndag i advent", "type": "observance", - "rule": "4th sunday before 12-24", + "rule": "4th sunday before 12-25", "_weekday": "Sun" }, { @@ -275,7 +275,7 @@ "end": "2022-12-04T23:00:00.000Z", "name": "Andre søndag i advent", "type": "observance", - "rule": "3rd sunday before 12-24", + "rule": "3rd sunday before 12-25", "_weekday": "Sun" }, { @@ -284,7 +284,7 @@ "end": "2022-12-11T23:00:00.000Z", "name": "Tredje søndag i advent", "type": "observance", - "rule": "2nd sunday before 12-24", + "rule": "2nd sunday before 12-25", "_weekday": "Sun" }, { @@ -293,7 +293,7 @@ "end": "2022-12-18T23:00:00.000Z", "name": "Fjerde søndag i advent", "type": "observance", - "rule": "1st sunday before 12-24", + "rule": "1st sunday before 12-25", "_weekday": "Sun" }, { diff --git a/test/fixtures/SJ-2023.json b/test/fixtures/SJ-2023.json index 8932a8b49..069b5dad2 100644 --- a/test/fixtures/SJ-2023.json +++ b/test/fixtures/SJ-2023.json @@ -260,40 +260,40 @@ "rule": "2nd sunday in November", "_weekday": "Sun" }, - { - "date": "2023-11-26 00:00:00", - "start": "2023-11-25T23:00:00.000Z", - "end": "2023-11-26T23:00:00.000Z", - "name": "Første søndag i advent", - "type": "observance", - "rule": "4th sunday before 12-24", - "_weekday": "Sun" - }, { "date": "2023-12-03 00:00:00", "start": "2023-12-02T23:00:00.000Z", "end": "2023-12-03T23:00:00.000Z", - "name": "Andre søndag i advent", + "name": "Første søndag i advent", "type": "observance", - "rule": "3rd sunday before 12-24", + "rule": "4th sunday before 12-25", "_weekday": "Sun" }, { "date": "2023-12-10 00:00:00", "start": "2023-12-09T23:00:00.000Z", "end": "2023-12-10T23:00:00.000Z", - "name": "Tredje søndag i advent", + "name": "Andre søndag i advent", "type": "observance", - "rule": "2nd sunday before 12-24", + "rule": "3rd sunday before 12-25", "_weekday": "Sun" }, { "date": "2023-12-17 00:00:00", "start": "2023-12-16T23:00:00.000Z", "end": "2023-12-17T23:00:00.000Z", + "name": "Tredje søndag i advent", + "type": "observance", + "rule": "2nd sunday before 12-25", + "_weekday": "Sun" + }, + { + "date": "2023-12-24 00:00:00", + "start": "2023-12-23T23:00:00.000Z", + "end": "2023-12-24T23:00:00.000Z", "name": "Fjerde søndag i advent", "type": "observance", - "rule": "1st sunday before 12-24", + "rule": "1st sunday before 12-25", "_weekday": "Sun" }, { diff --git a/test/fixtures/SJ-2024.json b/test/fixtures/SJ-2024.json index 22195ee45..4a8ba6977 100644 --- a/test/fixtures/SJ-2024.json +++ b/test/fixtures/SJ-2024.json @@ -266,7 +266,7 @@ "end": "2024-12-01T23:00:00.000Z", "name": "Første søndag i advent", "type": "observance", - "rule": "4th sunday before 12-24", + "rule": "4th sunday before 12-25", "_weekday": "Sun" }, { @@ -275,7 +275,7 @@ "end": "2024-12-08T23:00:00.000Z", "name": "Andre søndag i advent", "type": "observance", - "rule": "3rd sunday before 12-24", + "rule": "3rd sunday before 12-25", "_weekday": "Sun" }, { @@ -284,7 +284,7 @@ "end": "2024-12-15T23:00:00.000Z", "name": "Tredje søndag i advent", "type": "observance", - "rule": "2nd sunday before 12-24", + "rule": "2nd sunday before 12-25", "_weekday": "Sun" }, { @@ -293,7 +293,7 @@ "end": "2024-12-22T23:00:00.000Z", "name": "Fjerde søndag i advent", "type": "observance", - "rule": "1st sunday before 12-24", + "rule": "1st sunday before 12-25", "_weekday": "Sun" }, { diff --git a/test/fixtures/SJ-2025.json b/test/fixtures/SJ-2025.json index be0a89e96..4bf2916ba 100644 --- a/test/fixtures/SJ-2025.json +++ b/test/fixtures/SJ-2025.json @@ -266,7 +266,7 @@ "end": "2025-11-30T23:00:00.000Z", "name": "Første søndag i advent", "type": "observance", - "rule": "4th sunday before 12-24", + "rule": "4th sunday before 12-25", "_weekday": "Sun" }, { @@ -275,7 +275,7 @@ "end": "2025-12-07T23:00:00.000Z", "name": "Andre søndag i advent", "type": "observance", - "rule": "3rd sunday before 12-24", + "rule": "3rd sunday before 12-25", "_weekday": "Sun" }, { @@ -284,7 +284,7 @@ "end": "2025-12-14T23:00:00.000Z", "name": "Tredje søndag i advent", "type": "observance", - "rule": "2nd sunday before 12-24", + "rule": "2nd sunday before 12-25", "_weekday": "Sun" }, { @@ -293,7 +293,7 @@ "end": "2025-12-21T23:00:00.000Z", "name": "Fjerde søndag i advent", "type": "observance", - "rule": "1st sunday before 12-24", + "rule": "1st sunday before 12-25", "_weekday": "Sun" }, { diff --git a/test/fixtures/SJ-2026.json b/test/fixtures/SJ-2026.json index 67e6d89c0..2395416b3 100644 --- a/test/fixtures/SJ-2026.json +++ b/test/fixtures/SJ-2026.json @@ -266,7 +266,7 @@ "end": "2026-11-29T23:00:00.000Z", "name": "Første søndag i advent", "type": "observance", - "rule": "4th sunday before 12-24", + "rule": "4th sunday before 12-25", "_weekday": "Sun" }, { @@ -275,7 +275,7 @@ "end": "2026-12-06T23:00:00.000Z", "name": "Andre søndag i advent", "type": "observance", - "rule": "3rd sunday before 12-24", + "rule": "3rd sunday before 12-25", "_weekday": "Sun" }, { @@ -284,7 +284,7 @@ "end": "2026-12-13T23:00:00.000Z", "name": "Tredje søndag i advent", "type": "observance", - "rule": "2nd sunday before 12-24", + "rule": "2nd sunday before 12-25", "_weekday": "Sun" }, { @@ -293,7 +293,7 @@ "end": "2026-12-20T23:00:00.000Z", "name": "Fjerde søndag i advent", "type": "observance", - "rule": "1st sunday before 12-24", + "rule": "1st sunday before 12-25", "_weekday": "Sun" }, { diff --git a/test/fixtures/SJ-2027.json b/test/fixtures/SJ-2027.json index 71b88fbc8..4694f7566 100644 --- a/test/fixtures/SJ-2027.json +++ b/test/fixtures/SJ-2027.json @@ -266,7 +266,7 @@ "end": "2027-11-28T23:00:00.000Z", "name": "Første søndag i advent", "type": "observance", - "rule": "4th sunday before 12-24", + "rule": "4th sunday before 12-25", "_weekday": "Sun" }, { @@ -275,7 +275,7 @@ "end": "2027-12-05T23:00:00.000Z", "name": "Andre søndag i advent", "type": "observance", - "rule": "3rd sunday before 12-24", + "rule": "3rd sunday before 12-25", "_weekday": "Sun" }, { @@ -284,7 +284,7 @@ "end": "2027-12-12T23:00:00.000Z", "name": "Tredje søndag i advent", "type": "observance", - "rule": "2nd sunday before 12-24", + "rule": "2nd sunday before 12-25", "_weekday": "Sun" }, { @@ -293,7 +293,7 @@ "end": "2027-12-19T23:00:00.000Z", "name": "Fjerde søndag i advent", "type": "observance", - "rule": "1st sunday before 12-24", + "rule": "1st sunday before 12-25", "_weekday": "Sun" }, { From cd5bd13941afe8a2272681a42343bce01ce563bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Holhjem?= Date: Tue, 5 Dec 2023 18:01:32 +0100 Subject: [PATCH 3/3] Fixing tests --- test/fixtures/EG-2023.json | 28 ++++++++++++++-------------- test/fixtures/EG-2024.json | 32 ++++++++++++++++---------------- test/fixtures/EG-2025.json | 30 +++++++++++++++--------------- test/fixtures/EG-2026.json | 32 ++++++++++++++++---------------- test/fixtures/EG-2027.json | 32 ++++++++++++++++---------------- test/fixtures/GL-2024.json | 28 ++++++++++++++-------------- test/fixtures/GL-2025.json | 36 ++++++++++++++++++------------------ test/fixtures/GL-2026.json | 36 ++++++++++++++++++------------------ test/fixtures/GL-2027.json | 28 ++++++++++++++-------------- 9 files changed, 141 insertions(+), 141 deletions(-) diff --git a/test/fixtures/EG-2023.json b/test/fixtures/EG-2023.json index 08239794d..8eecf9486 100644 --- a/test/fixtures/EG-2023.json +++ b/test/fixtures/EG-2023.json @@ -55,8 +55,8 @@ }, { "date": "2023-05-01 00:00:00", - "start": "2023-04-30T22:00:00.000Z", - "end": "2023-05-01T22:00:00.000Z", + "start": "2023-04-30T21:00:00.000Z", + "end": "2023-05-01T21:00:00.000Z", "name": "يوم العمال", "type": "public", "rule": "05-01", @@ -64,8 +64,8 @@ }, { "date": "2023-06-28 00:00:00 -0600", - "start": "2023-06-27T16:00:00.000Z", - "end": "2023-07-01T16:00:00.000Z", + "start": "2023-06-27T15:00:00.000Z", + "end": "2023-07-01T15:00:00.000Z", "name": "عيد الأضحى", "type": "public", "rule": "10 Dhu al-Hijjah P4D", @@ -73,8 +73,8 @@ }, { "date": "2023-06-30 00:00:00", - "start": "2023-06-29T22:00:00.000Z", - "end": "2023-06-30T22:00:00.000Z", + "start": "2023-06-29T21:00:00.000Z", + "end": "2023-06-30T21:00:00.000Z", "name": "عيد ثورة 30 يونيو", "type": "public", "rule": "06-30", @@ -82,8 +82,8 @@ }, { "date": "2023-07-19 00:00:00 -0600", - "start": "2023-07-18T16:00:00.000Z", - "end": "2023-07-19T16:00:00.000Z", + "start": "2023-07-18T15:00:00.000Z", + "end": "2023-07-19T15:00:00.000Z", "name": "رأس السنة الهجرية", "type": "public", "rule": "1 Muharram", @@ -91,8 +91,8 @@ }, { "date": "2023-07-23 00:00:00", - "start": "2023-07-22T22:00:00.000Z", - "end": "2023-07-23T22:00:00.000Z", + "start": "2023-07-22T21:00:00.000Z", + "end": "2023-07-23T21:00:00.000Z", "name": "يوم الثورة", "type": "public", "rule": "07-23", @@ -100,8 +100,8 @@ }, { "date": "2023-09-27 00:00:00 -0600", - "start": "2023-09-26T16:00:00.000Z", - "end": "2023-09-27T16:00:00.000Z", + "start": "2023-09-26T15:00:00.000Z", + "end": "2023-09-27T15:00:00.000Z", "name": "المولد النبويّ", "type": "public", "rule": "12 Rabi al-awwal", @@ -109,8 +109,8 @@ }, { "date": "2023-10-06 00:00:00", - "start": "2023-10-05T22:00:00.000Z", - "end": "2023-10-06T22:00:00.000Z", + "start": "2023-10-05T21:00:00.000Z", + "end": "2023-10-06T21:00:00.000Z", "name": "عيد القوات المسلحة", "type": "public", "rule": "10-06", diff --git a/test/fixtures/EG-2024.json b/test/fixtures/EG-2024.json index 6304b471d..6f148a7bb 100644 --- a/test/fixtures/EG-2024.json +++ b/test/fixtures/EG-2024.json @@ -46,8 +46,8 @@ }, { "date": "2024-05-01 00:00:00", - "start": "2024-04-30T22:00:00.000Z", - "end": "2024-05-01T22:00:00.000Z", + "start": "2024-04-30T21:00:00.000Z", + "end": "2024-05-01T21:00:00.000Z", "name": "يوم العمال", "type": "public", "rule": "05-01", @@ -55,8 +55,8 @@ }, { "date": "2024-05-06 00:00:00", - "start": "2024-05-05T22:00:00.000Z", - "end": "2024-05-06T22:00:00.000Z", + "start": "2024-05-05T21:00:00.000Z", + "end": "2024-05-06T21:00:00.000Z", "name": "شم النسيم", "type": "public", "rule": "orthodox 1", @@ -64,8 +64,8 @@ }, { "date": "2024-06-16 00:00:00 -0600", - "start": "2024-06-15T16:00:00.000Z", - "end": "2024-06-19T16:00:00.000Z", + "start": "2024-06-15T15:00:00.000Z", + "end": "2024-06-19T15:00:00.000Z", "name": "عيد الأضحى", "type": "public", "rule": "10 Dhu al-Hijjah P4D", @@ -73,8 +73,8 @@ }, { "date": "2024-06-30 00:00:00", - "start": "2024-06-29T22:00:00.000Z", - "end": "2024-06-30T22:00:00.000Z", + "start": "2024-06-29T21:00:00.000Z", + "end": "2024-06-30T21:00:00.000Z", "name": "عيد ثورة 30 يونيو", "type": "public", "rule": "06-30", @@ -82,8 +82,8 @@ }, { "date": "2024-07-07 00:00:00 -0600", - "start": "2024-07-06T16:00:00.000Z", - "end": "2024-07-07T16:00:00.000Z", + "start": "2024-07-06T15:00:00.000Z", + "end": "2024-07-07T15:00:00.000Z", "name": "رأس السنة الهجرية", "type": "public", "rule": "1 Muharram", @@ -91,8 +91,8 @@ }, { "date": "2024-07-23 00:00:00", - "start": "2024-07-22T22:00:00.000Z", - "end": "2024-07-23T22:00:00.000Z", + "start": "2024-07-22T21:00:00.000Z", + "end": "2024-07-23T21:00:00.000Z", "name": "يوم الثورة", "type": "public", "rule": "07-23", @@ -100,8 +100,8 @@ }, { "date": "2024-09-15 00:00:00 -0600", - "start": "2024-09-14T16:00:00.000Z", - "end": "2024-09-15T16:00:00.000Z", + "start": "2024-09-14T15:00:00.000Z", + "end": "2024-09-15T15:00:00.000Z", "name": "المولد النبويّ", "type": "public", "rule": "12 Rabi al-awwal", @@ -109,8 +109,8 @@ }, { "date": "2024-10-06 00:00:00", - "start": "2024-10-05T22:00:00.000Z", - "end": "2024-10-06T22:00:00.000Z", + "start": "2024-10-05T21:00:00.000Z", + "end": "2024-10-06T21:00:00.000Z", "name": "عيد القوات المسلحة", "type": "public", "rule": "10-06", diff --git a/test/fixtures/EG-2025.json b/test/fixtures/EG-2025.json index b20dcaf38..8bec39546 100644 --- a/test/fixtures/EG-2025.json +++ b/test/fixtures/EG-2025.json @@ -47,7 +47,7 @@ { "date": "2025-04-25 00:00:00", "start": "2025-04-24T22:00:00.000Z", - "end": "2025-04-25T22:00:00.000Z", + "end": "2025-04-25T21:00:00.000Z", "name": "عيد تحرير سيناء", "type": "public", "rule": "04-25", @@ -55,8 +55,8 @@ }, { "date": "2025-05-01 00:00:00", - "start": "2025-04-30T22:00:00.000Z", - "end": "2025-05-01T22:00:00.000Z", + "start": "2025-04-30T21:00:00.000Z", + "end": "2025-05-01T21:00:00.000Z", "name": "يوم العمال", "type": "public", "rule": "05-01", @@ -64,8 +64,8 @@ }, { "date": "2025-06-06 00:00:00 -0600", - "start": "2025-06-05T16:00:00.000Z", - "end": "2025-06-09T16:00:00.000Z", + "start": "2025-06-05T15:00:00.000Z", + "end": "2025-06-09T15:00:00.000Z", "name": "عيد الأضحى", "type": "public", "rule": "10 Dhu al-Hijjah P4D", @@ -73,8 +73,8 @@ }, { "date": "2025-06-26 00:00:00 -0600", - "start": "2025-06-25T16:00:00.000Z", - "end": "2025-06-26T16:00:00.000Z", + "start": "2025-06-25T15:00:00.000Z", + "end": "2025-06-26T15:00:00.000Z", "name": "رأس السنة الهجرية", "type": "public", "rule": "1 Muharram", @@ -82,8 +82,8 @@ }, { "date": "2025-06-30 00:00:00", - "start": "2025-06-29T22:00:00.000Z", - "end": "2025-06-30T22:00:00.000Z", + "start": "2025-06-29T21:00:00.000Z", + "end": "2025-06-30T21:00:00.000Z", "name": "عيد ثورة 30 يونيو", "type": "public", "rule": "06-30", @@ -91,8 +91,8 @@ }, { "date": "2025-07-23 00:00:00", - "start": "2025-07-22T22:00:00.000Z", - "end": "2025-07-23T22:00:00.000Z", + "start": "2025-07-22T21:00:00.000Z", + "end": "2025-07-23T21:00:00.000Z", "name": "يوم الثورة", "type": "public", "rule": "07-23", @@ -100,8 +100,8 @@ }, { "date": "2025-09-04 00:00:00 -0600", - "start": "2025-09-03T16:00:00.000Z", - "end": "2025-09-04T16:00:00.000Z", + "start": "2025-09-03T15:00:00.000Z", + "end": "2025-09-04T15:00:00.000Z", "name": "المولد النبويّ", "type": "public", "rule": "12 Rabi al-awwal", @@ -109,8 +109,8 @@ }, { "date": "2025-10-06 00:00:00", - "start": "2025-10-05T22:00:00.000Z", - "end": "2025-10-06T22:00:00.000Z", + "start": "2025-10-05T21:00:00.000Z", + "end": "2025-10-06T21:00:00.000Z", "name": "عيد القوات المسلحة", "type": "public", "rule": "10-06", diff --git a/test/fixtures/EG-2026.json b/test/fixtures/EG-2026.json index 06465050a..88c858657 100644 --- a/test/fixtures/EG-2026.json +++ b/test/fixtures/EG-2026.json @@ -46,8 +46,8 @@ }, { "date": "2026-04-25 00:00:00", - "start": "2026-04-24T22:00:00.000Z", - "end": "2026-04-25T22:00:00.000Z", + "start": "2026-04-24T21:00:00.000Z", + "end": "2026-04-25T21:00:00.000Z", "name": "عيد تحرير سيناء", "type": "public", "rule": "04-25", @@ -55,8 +55,8 @@ }, { "date": "2026-05-01 00:00:00", - "start": "2026-04-30T22:00:00.000Z", - "end": "2026-05-01T22:00:00.000Z", + "start": "2026-04-30T21:00:00.000Z", + "end": "2026-05-01T21:00:00.000Z", "name": "يوم العمال", "type": "public", "rule": "05-01", @@ -64,8 +64,8 @@ }, { "date": "2026-05-27 00:00:00 -0600", - "start": "2026-05-26T16:00:00.000Z", - "end": "2026-05-30T16:00:00.000Z", + "start": "2026-05-26T15:00:00.000Z", + "end": "2026-05-30T15:00:00.000Z", "name": "عيد الأضحى", "type": "public", "rule": "10 Dhu al-Hijjah P4D", @@ -73,8 +73,8 @@ }, { "date": "2026-06-16 00:00:00 -0600", - "start": "2026-06-15T16:00:00.000Z", - "end": "2026-06-16T16:00:00.000Z", + "start": "2026-06-15T15:00:00.000Z", + "end": "2026-06-16T15:00:00.000Z", "name": "رأس السنة الهجرية", "type": "public", "rule": "1 Muharram", @@ -82,8 +82,8 @@ }, { "date": "2026-06-30 00:00:00", - "start": "2026-06-29T22:00:00.000Z", - "end": "2026-06-30T22:00:00.000Z", + "start": "2026-06-29T21:00:00.000Z", + "end": "2026-06-30T21:00:00.000Z", "name": "عيد ثورة 30 يونيو", "type": "public", "rule": "06-30", @@ -91,8 +91,8 @@ }, { "date": "2026-07-23 00:00:00", - "start": "2026-07-22T22:00:00.000Z", - "end": "2026-07-23T22:00:00.000Z", + "start": "2026-07-22T21:00:00.000Z", + "end": "2026-07-23T21:00:00.000Z", "name": "يوم الثورة", "type": "public", "rule": "07-23", @@ -100,8 +100,8 @@ }, { "date": "2026-08-25 00:00:00 -0600", - "start": "2026-08-24T16:00:00.000Z", - "end": "2026-08-25T16:00:00.000Z", + "start": "2026-08-24T15:00:00.000Z", + "end": "2026-08-25T15:00:00.000Z", "name": "المولد النبويّ", "type": "public", "rule": "12 Rabi al-awwal", @@ -109,8 +109,8 @@ }, { "date": "2026-10-06 00:00:00", - "start": "2026-10-05T22:00:00.000Z", - "end": "2026-10-06T22:00:00.000Z", + "start": "2026-10-05T21:00:00.000Z", + "end": "2026-10-06T21:00:00.000Z", "name": "عيد القوات المسلحة", "type": "public", "rule": "10-06", diff --git a/test/fixtures/EG-2027.json b/test/fixtures/EG-2027.json index 13e212d4d..c19a0d448 100644 --- a/test/fixtures/EG-2027.json +++ b/test/fixtures/EG-2027.json @@ -46,8 +46,8 @@ }, { "date": "2027-05-01 00:00:00", - "start": "2027-04-30T22:00:00.000Z", - "end": "2027-05-01T22:00:00.000Z", + "start": "2027-04-30T21:00:00.000Z", + "end": "2027-05-01T21:00:00.000Z", "name": "يوم العمال", "type": "public", "rule": "05-01", @@ -55,8 +55,8 @@ }, { "date": "2027-05-03 00:00:00", - "start": "2027-05-02T22:00:00.000Z", - "end": "2027-05-03T22:00:00.000Z", + "start": "2027-05-02T21:00:00.000Z", + "end": "2027-05-03T21:00:00.000Z", "name": "شم النسيم", "type": "public", "rule": "orthodox 1", @@ -64,8 +64,8 @@ }, { "date": "2027-05-16 00:00:00 -0600", - "start": "2027-05-15T16:00:00.000Z", - "end": "2027-05-19T16:00:00.000Z", + "start": "2027-05-15T15:00:00.000Z", + "end": "2027-05-19T15:00:00.000Z", "name": "عيد الأضحى", "type": "public", "rule": "10 Dhu al-Hijjah P4D", @@ -73,8 +73,8 @@ }, { "date": "2027-06-06 00:00:00 -0600", - "start": "2027-06-05T16:00:00.000Z", - "end": "2027-06-06T16:00:00.000Z", + "start": "2027-06-05T15:00:00.000Z", + "end": "2027-06-06T15:00:00.000Z", "name": "رأس السنة الهجرية", "type": "public", "rule": "1 Muharram", @@ -82,8 +82,8 @@ }, { "date": "2027-06-30 00:00:00", - "start": "2027-06-29T22:00:00.000Z", - "end": "2027-06-30T22:00:00.000Z", + "start": "2027-06-29T21:00:00.000Z", + "end": "2027-06-30T21:00:00.000Z", "name": "عيد ثورة 30 يونيو", "type": "public", "rule": "06-30", @@ -91,8 +91,8 @@ }, { "date": "2027-07-23 00:00:00", - "start": "2027-07-22T22:00:00.000Z", - "end": "2027-07-23T22:00:00.000Z", + "start": "2027-07-22T21:00:00.000Z", + "end": "2027-07-23T21:00:00.000Z", "name": "يوم الثورة", "type": "public", "rule": "07-23", @@ -100,8 +100,8 @@ }, { "date": "2027-08-14 00:00:00 -0600", - "start": "2027-08-13T16:00:00.000Z", - "end": "2027-08-14T16:00:00.000Z", + "start": "2027-08-13T15:00:00.000Z", + "end": "2027-08-14T15:00:00.000Z", "name": "المولد النبويّ", "type": "public", "rule": "12 Rabi al-awwal", @@ -109,8 +109,8 @@ }, { "date": "2027-10-06 00:00:00", - "start": "2027-10-05T22:00:00.000Z", - "end": "2027-10-06T22:00:00.000Z", + "start": "2027-10-05T21:00:00.000Z", + "end": "2027-10-06T21:00:00.000Z", "name": "عيد القوات المسلحة", "type": "public", "rule": "10-06", diff --git a/test/fixtures/GL-2024.json b/test/fixtures/GL-2024.json index e48c310cf..4d244d6b2 100644 --- a/test/fixtures/GL-2024.json +++ b/test/fixtures/GL-2024.json @@ -37,8 +37,8 @@ }, { "date": "2024-03-31 00:00:00", - "start": "2024-03-31T02:00:00.000Z", - "end": "2024-04-01T02:00:00.000Z", + "start": "2024-03-31T01:00:00.000Z", + "end": "2024-04-01T01:00:00.000Z", "name": "poorskip-ullua", "type": "public", "rule": "easter", @@ -46,8 +46,8 @@ }, { "date": "2024-04-01 00:00:00", - "start": "2024-04-01T02:00:00.000Z", - "end": "2024-04-02T02:00:00.000Z", + "start": "2024-04-01T01:00:00.000Z", + "end": "2024-04-02T01:00:00.000Z", "name": "poorskip-aappaa", "type": "public", "rule": "easter 1", @@ -55,8 +55,8 @@ }, { "date": "2024-04-26 00:00:00", - "start": "2024-04-26T02:00:00.000Z", - "end": "2024-04-27T02:00:00.000Z", + "start": "2024-04-26T01:00:00.000Z", + "end": "2024-04-27T01:00:00.000Z", "name": "tussiarfissuaq", "type": "public", "rule": "easter 26", @@ -64,8 +64,8 @@ }, { "date": "2024-05-09 00:00:00", - "start": "2024-05-09T02:00:00.000Z", - "end": "2024-05-10T02:00:00.000Z", + "start": "2024-05-09T01:00:00.000Z", + "end": "2024-05-10T01:00:00.000Z", "name": "qilaliarfik", "type": "public", "rule": "easter 39", @@ -73,8 +73,8 @@ }, { "date": "2024-05-19 00:00:00", - "start": "2024-05-19T02:00:00.000Z", - "end": "2024-05-20T02:00:00.000Z", + "start": "2024-05-19T01:00:00.000Z", + "end": "2024-05-20T01:00:00.000Z", "name": "piinsip ullua", "type": "public", "rule": "easter 49", @@ -82,8 +82,8 @@ }, { "date": "2024-05-20 00:00:00", - "start": "2024-05-20T02:00:00.000Z", - "end": "2024-05-21T02:00:00.000Z", + "start": "2024-05-20T01:00:00.000Z", + "end": "2024-05-21T01:00:00.000Z", "name": "piinsip aappaa", "type": "public", "rule": "easter 50", @@ -91,8 +91,8 @@ }, { "date": "2024-06-21 00:00:00", - "start": "2024-06-21T02:00:00.000Z", - "end": "2024-06-22T02:00:00.000Z", + "start": "2024-06-21T01:00:00.000Z", + "end": "2024-06-22T01:00:00.000Z", "name": "ullortuneq", "type": "public", "rule": "06-21", diff --git a/test/fixtures/GL-2025.json b/test/fixtures/GL-2025.json index 5d6968880..6764c384d 100644 --- a/test/fixtures/GL-2025.json +++ b/test/fixtures/GL-2025.json @@ -19,8 +19,8 @@ }, { "date": "2025-04-17 00:00:00", - "start": "2025-04-17T02:00:00.000Z", - "end": "2025-04-18T02:00:00.000Z", + "start": "2025-04-17T01:00:00.000Z", + "end": "2025-04-18T01:00:00.000Z", "name": "sisamanngortoq illernartoq", "type": "public", "rule": "easter -3", @@ -28,8 +28,8 @@ }, { "date": "2025-04-18 00:00:00", - "start": "2025-04-18T02:00:00.000Z", - "end": "2025-04-19T02:00:00.000Z", + "start": "2025-04-18T01:00:00.000Z", + "end": "2025-04-19T01:00:00.000Z", "name": "tallimanngornersuaq", "type": "public", "rule": "easter -2", @@ -37,8 +37,8 @@ }, { "date": "2025-04-20 00:00:00", - "start": "2025-04-20T02:00:00.000Z", - "end": "2025-04-21T02:00:00.000Z", + "start": "2025-04-20T01:00:00.000Z", + "end": "2025-04-21T01:00:00.000Z", "name": "poorskip-ullua", "type": "public", "rule": "easter", @@ -46,8 +46,8 @@ }, { "date": "2025-04-21 00:00:00", - "start": "2025-04-21T02:00:00.000Z", - "end": "2025-04-22T02:00:00.000Z", + "start": "2025-04-21T01:00:00.000Z", + "end": "2025-04-22T01:00:00.000Z", "name": "poorskip-aappaa", "type": "public", "rule": "easter 1", @@ -55,8 +55,8 @@ }, { "date": "2025-05-16 00:00:00", - "start": "2025-05-16T02:00:00.000Z", - "end": "2025-05-17T02:00:00.000Z", + "start": "2025-05-16T01:00:00.000Z", + "end": "2025-05-17T01:00:00.000Z", "name": "tussiarfissuaq", "type": "public", "rule": "easter 26", @@ -64,8 +64,8 @@ }, { "date": "2025-05-29 00:00:00", - "start": "2025-05-29T02:00:00.000Z", - "end": "2025-05-30T02:00:00.000Z", + "start": "2025-05-29T01:00:00.000Z", + "end": "2025-05-30T01:00:00.000Z", "name": "qilaliarfik", "type": "public", "rule": "easter 39", @@ -73,8 +73,8 @@ }, { "date": "2025-06-08 00:00:00", - "start": "2025-06-08T02:00:00.000Z", - "end": "2025-06-09T02:00:00.000Z", + "start": "2025-06-08T01:00:00.000Z", + "end": "2025-06-09T01:00:00.000Z", "name": "piinsip ullua", "type": "public", "rule": "easter 49", @@ -82,8 +82,8 @@ }, { "date": "2025-06-09 00:00:00", - "start": "2025-06-09T02:00:00.000Z", - "end": "2025-06-10T02:00:00.000Z", + "start": "2025-06-09T01:00:00.000Z", + "end": "2025-06-10T01:00:00.000Z", "name": "piinsip aappaa", "type": "public", "rule": "easter 50", @@ -91,8 +91,8 @@ }, { "date": "2025-06-21 00:00:00", - "start": "2025-06-21T02:00:00.000Z", - "end": "2025-06-22T02:00:00.000Z", + "start": "2025-06-21T01:00:00.000Z", + "end": "2025-06-22T01:00:00.000Z", "name": "ullortuneq", "type": "public", "rule": "06-21", diff --git a/test/fixtures/GL-2026.json b/test/fixtures/GL-2026.json index b28f835b4..4e6ce6b2f 100644 --- a/test/fixtures/GL-2026.json +++ b/test/fixtures/GL-2026.json @@ -19,8 +19,8 @@ }, { "date": "2026-04-02 00:00:00", - "start": "2026-04-02T02:00:00.000Z", - "end": "2026-04-03T02:00:00.000Z", + "start": "2026-04-02T01:00:00.000Z", + "end": "2026-04-03T01:00:00.000Z", "name": "sisamanngortoq illernartoq", "type": "public", "rule": "easter -3", @@ -28,8 +28,8 @@ }, { "date": "2026-04-03 00:00:00", - "start": "2026-04-03T02:00:00.000Z", - "end": "2026-04-04T02:00:00.000Z", + "start": "2026-04-03T01:00:00.000Z", + "end": "2026-04-04T01:00:00.000Z", "name": "tallimanngornersuaq", "type": "public", "rule": "easter -2", @@ -37,8 +37,8 @@ }, { "date": "2026-04-05 00:00:00", - "start": "2026-04-05T02:00:00.000Z", - "end": "2026-04-06T02:00:00.000Z", + "start": "2026-04-05T01:00:00.000Z", + "end": "2026-04-06T01:00:00.000Z", "name": "poorskip-ullua", "type": "public", "rule": "easter", @@ -46,8 +46,8 @@ }, { "date": "2026-04-06 00:00:00", - "start": "2026-04-06T02:00:00.000Z", - "end": "2026-04-07T02:00:00.000Z", + "start": "2026-04-06T01:00:00.000Z", + "end": "2026-04-07T01:00:00.000Z", "name": "poorskip-aappaa", "type": "public", "rule": "easter 1", @@ -55,8 +55,8 @@ }, { "date": "2026-05-01 00:00:00", - "start": "2026-05-01T02:00:00.000Z", - "end": "2026-05-02T02:00:00.000Z", + "start": "2026-05-01T01:00:00.000Z", + "end": "2026-05-02T01:00:00.000Z", "name": "tussiarfissuaq", "type": "public", "rule": "easter 26", @@ -64,8 +64,8 @@ }, { "date": "2026-05-14 00:00:00", - "start": "2026-05-14T02:00:00.000Z", - "end": "2026-05-15T02:00:00.000Z", + "start": "2026-05-14T01:00:00.000Z", + "end": "2026-05-15T01:00:00.000Z", "name": "qilaliarfik", "type": "public", "rule": "easter 39", @@ -73,8 +73,8 @@ }, { "date": "2026-05-24 00:00:00", - "start": "2026-05-24T02:00:00.000Z", - "end": "2026-05-25T02:00:00.000Z", + "start": "2026-05-24T01:00:00.000Z", + "end": "2026-05-25T01:00:00.000Z", "name": "piinsip ullua", "type": "public", "rule": "easter 49", @@ -82,8 +82,8 @@ }, { "date": "2026-05-25 00:00:00", - "start": "2026-05-25T02:00:00.000Z", - "end": "2026-05-26T02:00:00.000Z", + "start": "2026-05-25T01:00:00.000Z", + "end": "2026-05-26T01:00:00.000Z", "name": "piinsip aappaa", "type": "public", "rule": "easter 50", @@ -91,8 +91,8 @@ }, { "date": "2026-06-21 00:00:00", - "start": "2026-06-21T02:00:00.000Z", - "end": "2026-06-22T02:00:00.000Z", + "start": "2026-06-21T01:00:00.000Z", + "end": "2026-06-22T01:00:00.000Z", "name": "ullortuneq", "type": "public", "rule": "06-21", diff --git a/test/fixtures/GL-2027.json b/test/fixtures/GL-2027.json index 2b468a068..a91441f48 100644 --- a/test/fixtures/GL-2027.json +++ b/test/fixtures/GL-2027.json @@ -37,8 +37,8 @@ }, { "date": "2027-03-28 00:00:00", - "start": "2027-03-28T02:00:00.000Z", - "end": "2027-03-29T02:00:00.000Z", + "start": "2027-03-28T01:00:00.000Z", + "end": "2027-03-29T01:00:00.000Z", "name": "poorskip-ullua", "type": "public", "rule": "easter", @@ -46,8 +46,8 @@ }, { "date": "2027-03-29 00:00:00", - "start": "2027-03-29T02:00:00.000Z", - "end": "2027-03-30T02:00:00.000Z", + "start": "2027-03-29T01:00:00.000Z", + "end": "2027-03-30T01:00:00.000Z", "name": "poorskip-aappaa", "type": "public", "rule": "easter 1", @@ -55,8 +55,8 @@ }, { "date": "2027-04-23 00:00:00", - "start": "2027-04-23T02:00:00.000Z", - "end": "2027-04-24T02:00:00.000Z", + "start": "2027-04-23T01:00:00.000Z", + "end": "2027-04-24T01:00:00.000Z", "name": "tussiarfissuaq", "type": "public", "rule": "easter 26", @@ -64,8 +64,8 @@ }, { "date": "2027-05-06 00:00:00", - "start": "2027-05-06T02:00:00.000Z", - "end": "2027-05-07T02:00:00.000Z", + "start": "2027-05-06T01:00:00.000Z", + "end": "2027-05-07T01:00:00.000Z", "name": "qilaliarfik", "type": "public", "rule": "easter 39", @@ -73,8 +73,8 @@ }, { "date": "2027-05-16 00:00:00", - "start": "2027-05-16T02:00:00.000Z", - "end": "2027-05-17T02:00:00.000Z", + "start": "2027-05-16T01:00:00.000Z", + "end": "2027-05-17T01:00:00.000Z", "name": "piinsip ullua", "type": "public", "rule": "easter 49", @@ -82,8 +82,8 @@ }, { "date": "2027-05-17 00:00:00", - "start": "2027-05-17T02:00:00.000Z", - "end": "2027-05-18T02:00:00.000Z", + "start": "2027-05-17T01:00:00.000Z", + "end": "2027-05-18T01:00:00.000Z", "name": "piinsip aappaa", "type": "public", "rule": "easter 50", @@ -91,8 +91,8 @@ }, { "date": "2027-06-21 00:00:00", - "start": "2027-06-21T02:00:00.000Z", - "end": "2027-06-22T02:00:00.000Z", + "start": "2027-06-21T01:00:00.000Z", + "end": "2027-06-22T01:00:00.000Z", "name": "ullortuneq", "type": "public", "rule": "06-21",