Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix sundays in advent norway #441

Merged
merged 2 commits into from
Dec 10, 2023
Merged

Fix sundays in advent norway #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86f0f5a
fixed sundays fixed sundays in advent for norway
havardnyboe Dec 3, 2023
73d7838
Generated and ran test files
havardnyboe Dec 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions data/countries/NO.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
28 changes: 14 additions & 14 deletions test/fixtures/EG-2023.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,62 +55,62 @@
},
{
"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",
"_weekday": "Mon"
},
{
"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",
"_weekday": "Wed"
},
{
"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",
"_weekday": "Fri"
},
{
"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",
"_weekday": "Wed"
},
{
"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",
"_weekday": "Sun"
},
{
"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",
"_weekday": "Wed"
},
{
"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",
Expand Down
32 changes: 16 additions & 16 deletions test/fixtures/EG-2024.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,71 +46,71 @@
},
{
"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",
"_weekday": "Wed"
},
{
"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",
"_weekday": "Mon"
},
{
"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",
"_weekday": "Sun"
},
{
"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",
"_weekday": "Sun"
},
{
"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",
"_weekday": "Sun"
},
{
"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",
"_weekday": "Tue"
},
{
"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",
"_weekday": "Sun"
},
{
"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",
Expand Down
30 changes: 15 additions & 15 deletions test/fixtures/EG-2025.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,70 +47,70 @@
{
"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",
"_weekday": "Fri"
},
{
"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",
"_weekday": "Thu"
},
{
"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",
"_weekday": "Fri"
},
{
"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",
"_weekday": "Thu"
},
{
"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",
"_weekday": "Mon"
},
{
"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",
"_weekday": "Wed"
},
{
"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",
"_weekday": "Thu"
},
{
"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",
Expand Down
32 changes: 16 additions & 16 deletions test/fixtures/EG-2026.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,71 +46,71 @@
},
{
"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",
"_weekday": "Sat"
},
{
"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",
"_weekday": "Fri"
},
{
"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",
"_weekday": "Wed"
},
{
"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",
"_weekday": "Tue"
},
{
"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",
"_weekday": "Tue"
},
{
"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",
"_weekday": "Thu"
},
{
"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",
"_weekday": "Tue"
},
{
"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",
Expand Down
Loading
Loading