Skip to content

Commit

Permalink
Merge pull request #439 from TransitApp/fix-january-2nd-in-sct
Browse files Browse the repository at this point in the history 
fix: add missing `y` to January 2nd holiday
  • Loading branch information
@commenthol
commenthol authored Nov 25, 2023
2 parents dbb6b8c + c304127 commit 12e76c6
Show file tree
Hide file tree
Showing 23 changed files with 161 additions and 161 deletions.
6 changes: 3 additions & 3 deletions data/countries/GB.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -460,15 +460,15 @@ holidays:
_name: 01-01
01-02:
name:
en: Januar 2nd
en: January 2nd
substitutes 01-02 if saturday then next monday:
substitute: true
name:
en: Januar 2nd
en: January 2nd
substitutes 01-02 if sunday then next monday:
substitute: true
name:
en: Januar 2nd
en: January 2nd
easter 1:
_name: easter 1
1st monday in August:
Expand Down
28 changes: 14 additions & 14 deletions test/fixtures/EG-2023.json
View file
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
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
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
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

0 comments on commit 12e76c6

Please sign in to comment.