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 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" }, {