From 43f7911cb06111b96689310e61db6ff55d689247 Mon Sep 17 00:00:00 2001 From: omicron Date: Tue, 13 Feb 2024 16:12:25 +0800 Subject: [PATCH 1/2] fix Singapore Hari Raya Haji date --- data/countries/SG.yaml | 4 ++++ test/fixtures/SG-2024.json | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/data/countries/SG.yaml b/data/countries/SG.yaml index 1fc0a42a2..7c38e09b3 100644 --- a/data/countries/SG.yaml +++ b/data/countries/SG.yaml @@ -70,12 +70,16 @@ holidays: en: Hari Raya Haji # Revision from SG gov # @source https://www.humanresourcesonline.net/singapore-s-revised-public-holiday-list-for-2022-new-dates-for-hari-raya-puasa-and-haji + # @source https://www.humanresourcesonline.net/singapore-s-revised-public-holiday-list-for-2022-new-dates-for-hari-raya-puasa-and-haji + # https://www.mom.gov.sg/employment-practices/public-holidays disable: - "2022-07-09" - "2023-06-28" + - "2024-06-29" enable: - "2022-07-10" - "2023-06-29" + - "2024-06-17" # @attrib https://en.wikipedia.org/wiki/Vesak # date if sunday then next monday "2001-05-07": diff --git a/test/fixtures/SG-2024.json b/test/fixtures/SG-2024.json index 41c0ca5ce..16ac9f14e 100644 --- a/test/fixtures/SG-2024.json +++ b/test/fixtures/SG-2024.json @@ -46,9 +46,9 @@ "_weekday": "Fri" }, { - "date": "2024-04-10 00:00:00 -0600", - "start": "2024-04-09T10:00:00.000Z", - "end": "2024-04-10T10:00:00.000Z", + "date": "2024-04-10 00:00:00", + "start": "2024-04-09T16:00:00.000Z", + "end": "2024-04-10T16:00:00.000Z", "name": "Hari Raya Puasa", "type": "public", "rule": "1 Shawwal", @@ -73,9 +73,9 @@ "_weekday": "Thu" }, { - "date": "2024-06-16 00:00:00 -0600", - "start": "2024-06-15T10:00:00.000Z", - "end": "2024-06-16T10:00:00.000Z", + "date": "2024-06-17 00:00:00", + "start": "2024-06-16T16:00:00.000Z", + "end": "2024-06-17T16:00:00.000Z", "name": "Hari Raya Haji", "type": "public", "rule": "10 Dhu al-Hijjah", From 8534eb473da519e4c90ca6b0fa688055942d8f5a Mon Sep 17 00:00:00 2001 From: omicron Date: Tue, 13 Feb 2024 16:14:05 +0800 Subject: [PATCH 2/2] Fix SG Hari Raya day --- test/fixtures/SG-2024.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/fixtures/SG-2024.json b/test/fixtures/SG-2024.json index 16ac9f14e..664232a9c 100644 --- a/test/fixtures/SG-2024.json +++ b/test/fixtures/SG-2024.json @@ -79,7 +79,7 @@ "name": "Hari Raya Haji", "type": "public", "rule": "10 Dhu al-Hijjah", - "_weekday": "Sun" + "_weekday": "Mon" }, { "date": "2024-08-09 00:00:00",