From 5bd5d67aad79a910108c2c02161cc40367b59e67 Mon Sep 17 00:00:00 2001 From: hweejae-shin Date: Fri, 28 Jun 2024 16:42:50 +0900 Subject: [PATCH 1/2] Change start date of Korean ThanksGiving Day --- data/countries/KR.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/countries/KR.yaml b/data/countries/KR.yaml index 07756fd27..dfb5f5239 100644 --- a/data/countries/KR.yaml +++ b/data/countries/KR.yaml @@ -40,7 +40,7 @@ holidays: name: en: Liberation Day ko: 광복절 - korean 8-0-15 P3D: + korean 8-0-14 P3D: name: en: Korean Thanksgiving ko: 추석 From 72d4ae586e781bc7cc1490b02eb0a95995ac6da8 Mon Sep 17 00:00:00 2001 From: hweejae-shin Date: Fri, 28 Jun 2024 16:43:15 +0900 Subject: [PATCH 2/2] Update the unimplemented test code --- test/fixtures/HK-2016.json | 10 +++++----- test/fixtures/HK-2022.json | 10 +++++----- test/fixtures/KR-2015.json | 10 +++++----- test/fixtures/KR-2016.json | 10 +++++----- test/fixtures/KR-2017.json | 10 +++++----- test/fixtures/KR-2018.json | 10 +++++----- test/fixtures/KR-2019.json | 10 +++++----- test/fixtures/KR-2020.json | 10 +++++----- test/fixtures/KR-2021.json | 10 +++++----- test/fixtures/KR-2022.json | 10 +++++----- test/fixtures/KR-2023.json | 10 +++++----- test/fixtures/KR-2024.json | 10 +++++----- test/fixtures/KR-2025.json | 10 +++++----- test/fixtures/KR-2026.json | 10 +++++----- test/fixtures/KR-2027.json | 10 +++++----- test/fixtures/TW-2015.json | 38 ++++++++++++++++++------------------ test/fixtures/TW-2016.json | 16 +++++++-------- test/fixtures/TW-2017.json | 16 +++++++-------- test/fixtures/TW-2018.json | 28 +++++++++++++------------- test/fixtures/TW-2019.json | 32 +++++++++++++++--------------- test/fixtures/TW-2020.json | 24 +++++++++++------------ test/fixtures/TW-2021.json | 16 +++++++-------- test/fixtures/TW-2022.json | 24 +++++++++++------------ test/fixtures/TW-2023.json | 24 +++++++++++------------ test/fixtures/TW-2024.json | 16 +++++++-------- test/fixtures/TW-2025.json | 16 +++++++-------- test/fixtures/TW-2026.json | 40 +++++++++++++++++++------------------- test/fixtures/TW-2027.json | 24 +++++++++++------------ 28 files changed, 232 insertions(+), 232 deletions(-) diff --git a/test/fixtures/HK-2016.json b/test/fixtures/HK-2016.json index d1b7ca6b2..dae9bd978 100644 --- a/test/fixtures/HK-2016.json +++ b/test/fixtures/HK-2016.json @@ -176,19 +176,19 @@ "date": "2016-12-26 00:00:00", "start": "2016-12-25T16:00:00.000Z", "end": "2016-12-26T16:00:00.000Z", - "name": "圣诞节后的第一个工作日", + "name": "聖誕節 (更换日)", "type": "public", - "rule": "12-26 and if Sunday then next Monday if Monday then next Tuesday", + "substitute": true, + "rule": "12-25 and if Sunday then next Monday", "_weekday": "Mon" }, { "date": "2016-12-26 00:00:00", "start": "2016-12-25T16:00:00.000Z", "end": "2016-12-26T16:00:00.000Z", - "name": "聖誕節 (更换日)", + "name": "圣诞节后的第一个工作日", "type": "public", - "substitute": true, - "rule": "12-25 and if Sunday then next Monday", + "rule": "12-26 and if Sunday then next Monday if Monday then next Tuesday", "_weekday": "Mon" }, { diff --git a/test/fixtures/HK-2022.json b/test/fixtures/HK-2022.json index 3da0fa5fb..0e460622a 100644 --- a/test/fixtures/HK-2022.json +++ b/test/fixtures/HK-2022.json @@ -185,19 +185,19 @@ "date": "2022-12-26 00:00:00", "start": "2022-12-25T16:00:00.000Z", "end": "2022-12-26T16:00:00.000Z", - "name": "圣诞节后的第一个工作日", + "name": "聖誕節 (更换日)", "type": "public", - "rule": "12-26 and if Sunday then next Monday if Monday then next Tuesday", + "substitute": true, + "rule": "12-25 and if Sunday then next Monday", "_weekday": "Mon" }, { "date": "2022-12-26 00:00:00", "start": "2022-12-25T16:00:00.000Z", "end": "2022-12-26T16:00:00.000Z", - "name": "聖誕節 (更换日)", + "name": "圣诞节后的第一个工作日", "type": "public", - "substitute": true, - "rule": "12-25 and if Sunday then next Monday", + "rule": "12-26 and if Sunday then next Monday if Monday then next Tuesday", "_weekday": "Mon" }, { diff --git a/test/fixtures/KR-2015.json b/test/fixtures/KR-2015.json index 6225a386b..ebfe6f8d4 100644 --- a/test/fixtures/KR-2015.json +++ b/test/fixtures/KR-2015.json @@ -72,13 +72,13 @@ "_weekday": "Sat" }, { - "date": "2015-09-27 00:00:00", - "start": "2015-09-26T15:00:00.000Z", - "end": "2015-09-29T15:00:00.000Z", + "date": "2015-09-26 00:00:00", + "start": "2015-09-25T15:00:00.000Z", + "end": "2015-09-28T15:00:00.000Z", "name": "추석", "type": "public", - "rule": "korean 8-0-15 P3D", - "_weekday": "Sun" + "rule": "korean 8-0-14 P3D", + "_weekday": "Sat" }, { "date": "2015-10-03 00:00:00", diff --git a/test/fixtures/KR-2016.json b/test/fixtures/KR-2016.json index 95e56964d..67a539c35 100644 --- a/test/fixtures/KR-2016.json +++ b/test/fixtures/KR-2016.json @@ -72,13 +72,13 @@ "_weekday": "Mon" }, { - "date": "2016-09-15 00:00:00", - "start": "2016-09-14T15:00:00.000Z", - "end": "2016-09-17T15:00:00.000Z", + "date": "2016-09-14 00:00:00", + "start": "2016-09-13T15:00:00.000Z", + "end": "2016-09-16T15:00:00.000Z", "name": "추석", "type": "public", - "rule": "korean 8-0-15 P3D", - "_weekday": "Thu" + "rule": "korean 8-0-14 P3D", + "_weekday": "Wed" }, { "date": "2016-10-03 00:00:00", diff --git a/test/fixtures/KR-2017.json b/test/fixtures/KR-2017.json index d5c575a3b..631a96356 100644 --- a/test/fixtures/KR-2017.json +++ b/test/fixtures/KR-2017.json @@ -81,13 +81,13 @@ "_weekday": "Tue" }, { - "date": "2017-10-04 00:00:00", - "start": "2017-10-03T15:00:00.000Z", - "end": "2017-10-06T15:00:00.000Z", + "date": "2017-10-03 00:00:00", + "start": "2017-10-02T15:00:00.000Z", + "end": "2017-10-05T15:00:00.000Z", "name": "추석", "type": "public", - "rule": "korean 8-0-15 P3D", - "_weekday": "Wed" + "rule": "korean 8-0-14 P3D", + "_weekday": "Tue" }, { "date": "2017-10-09 00:00:00", diff --git a/test/fixtures/KR-2018.json b/test/fixtures/KR-2018.json index e8699347e..b72c68ecf 100644 --- a/test/fixtures/KR-2018.json +++ b/test/fixtures/KR-2018.json @@ -72,13 +72,13 @@ "_weekday": "Wed" }, { - "date": "2018-09-24 00:00:00", - "start": "2018-09-23T15:00:00.000Z", - "end": "2018-09-26T15:00:00.000Z", + "date": "2018-09-23 00:00:00", + "start": "2018-09-22T15:00:00.000Z", + "end": "2018-09-25T15:00:00.000Z", "name": "추석", "type": "public", - "rule": "korean 8-0-15 P3D", - "_weekday": "Mon" + "rule": "korean 8-0-14 P3D", + "_weekday": "Sun" }, { "date": "2018-10-03 00:00:00", diff --git a/test/fixtures/KR-2019.json b/test/fixtures/KR-2019.json index 666a878e2..d5e7b4bdb 100644 --- a/test/fixtures/KR-2019.json +++ b/test/fixtures/KR-2019.json @@ -72,13 +72,13 @@ "_weekday": "Thu" }, { - "date": "2019-09-13 00:00:00", - "start": "2019-09-12T15:00:00.000Z", - "end": "2019-09-15T15:00:00.000Z", + "date": "2019-09-12 00:00:00", + "start": "2019-09-11T15:00:00.000Z", + "end": "2019-09-14T15:00:00.000Z", "name": "추석", "type": "public", - "rule": "korean 8-0-15 P3D", - "_weekday": "Fri" + "rule": "korean 8-0-14 P3D", + "_weekday": "Thu" }, { "date": "2019-10-03 00:00:00", diff --git a/test/fixtures/KR-2020.json b/test/fixtures/KR-2020.json index 2e9d86c0b..5ceee28b5 100644 --- a/test/fixtures/KR-2020.json +++ b/test/fixtures/KR-2020.json @@ -72,13 +72,13 @@ "_weekday": "Sat" }, { - "date": "2020-10-01 00:00:00", - "start": "2020-09-30T15:00:00.000Z", - "end": "2020-10-03T15:00:00.000Z", + "date": "2020-09-30 00:00:00", + "start": "2020-09-29T15:00:00.000Z", + "end": "2020-10-02T15:00:00.000Z", "name": "추석", "type": "public", - "rule": "korean 8-0-15 P3D", - "_weekday": "Thu" + "rule": "korean 8-0-14 P3D", + "_weekday": "Wed" }, { "date": "2020-10-03 00:00:00", diff --git a/test/fixtures/KR-2021.json b/test/fixtures/KR-2021.json index 8128b4c3c..db3ae73c8 100644 --- a/test/fixtures/KR-2021.json +++ b/test/fixtures/KR-2021.json @@ -72,13 +72,13 @@ "_weekday": "Sun" }, { - "date": "2021-09-21 00:00:00", - "start": "2021-09-20T15:00:00.000Z", - "end": "2021-09-23T15:00:00.000Z", + "date": "2021-09-20 00:00:00", + "start": "2021-09-19T15:00:00.000Z", + "end": "2021-09-22T15:00:00.000Z", "name": "추석", "type": "public", - "rule": "korean 8-0-15 P3D", - "_weekday": "Tue" + "rule": "korean 8-0-14 P3D", + "_weekday": "Mon" }, { "date": "2021-10-03 00:00:00", diff --git a/test/fixtures/KR-2022.json b/test/fixtures/KR-2022.json index c4d95fe26..59824d548 100644 --- a/test/fixtures/KR-2022.json +++ b/test/fixtures/KR-2022.json @@ -72,13 +72,13 @@ "_weekday": "Mon" }, { - "date": "2022-09-10 00:00:00", - "start": "2022-09-09T15:00:00.000Z", - "end": "2022-09-12T15:00:00.000Z", + "date": "2022-09-09 00:00:00", + "start": "2022-09-08T15:00:00.000Z", + "end": "2022-09-11T15:00:00.000Z", "name": "추석", "type": "public", - "rule": "korean 8-0-15 P3D", - "_weekday": "Sat" + "rule": "korean 8-0-14 P3D", + "_weekday": "Fri" }, { "date": "2022-10-03 00:00:00", diff --git a/test/fixtures/KR-2023.json b/test/fixtures/KR-2023.json index b40fb0a39..8703aed56 100644 --- a/test/fixtures/KR-2023.json +++ b/test/fixtures/KR-2023.json @@ -72,13 +72,13 @@ "_weekday": "Tue" }, { - "date": "2023-09-29 00:00:00", - "start": "2023-09-28T15:00:00.000Z", - "end": "2023-10-01T15:00:00.000Z", + "date": "2023-09-28 00:00:00", + "start": "2023-09-27T15:00:00.000Z", + "end": "2023-09-30T15:00:00.000Z", "name": "추석", "type": "public", - "rule": "korean 8-0-15 P3D", - "_weekday": "Fri" + "rule": "korean 8-0-14 P3D", + "_weekday": "Thu" }, { "date": "2023-10-03 00:00:00", diff --git a/test/fixtures/KR-2024.json b/test/fixtures/KR-2024.json index 5440c3673..ed1fe6388 100644 --- a/test/fixtures/KR-2024.json +++ b/test/fixtures/KR-2024.json @@ -72,13 +72,13 @@ "_weekday": "Thu" }, { - "date": "2024-09-17 00:00:00", - "start": "2024-09-16T15:00:00.000Z", - "end": "2024-09-19T15:00:00.000Z", + "date": "2024-09-16 00:00:00", + "start": "2024-09-15T15:00:00.000Z", + "end": "2024-09-18T15:00:00.000Z", "name": "추석", "type": "public", - "rule": "korean 8-0-15 P3D", - "_weekday": "Tue" + "rule": "korean 8-0-14 P3D", + "_weekday": "Mon" }, { "date": "2024-10-03 00:00:00", diff --git a/test/fixtures/KR-2025.json b/test/fixtures/KR-2025.json index e82002c73..86d1ed3e3 100644 --- a/test/fixtures/KR-2025.json +++ b/test/fixtures/KR-2025.json @@ -81,13 +81,13 @@ "_weekday": "Fri" }, { - "date": "2025-10-06 00:00:00", - "start": "2025-10-05T15:00:00.000Z", - "end": "2025-10-08T15:00:00.000Z", + "date": "2025-10-05 00:00:00", + "start": "2025-10-04T15:00:00.000Z", + "end": "2025-10-07T15:00:00.000Z", "name": "추석", "type": "public", - "rule": "korean 8-0-15 P3D", - "_weekday": "Mon" + "rule": "korean 8-0-14 P3D", + "_weekday": "Sun" }, { "date": "2025-10-09 00:00:00", diff --git a/test/fixtures/KR-2026.json b/test/fixtures/KR-2026.json index 85ad6c26b..fcab67a02 100644 --- a/test/fixtures/KR-2026.json +++ b/test/fixtures/KR-2026.json @@ -72,13 +72,13 @@ "_weekday": "Sat" }, { - "date": "2026-09-25 00:00:00", - "start": "2026-09-24T15:00:00.000Z", - "end": "2026-09-27T15:00:00.000Z", + "date": "2026-09-24 00:00:00", + "start": "2026-09-23T15:00:00.000Z", + "end": "2026-09-26T15:00:00.000Z", "name": "추석", "type": "public", - "rule": "korean 8-0-15 P3D", - "_weekday": "Fri" + "rule": "korean 8-0-14 P3D", + "_weekday": "Thu" }, { "date": "2026-10-03 00:00:00", diff --git a/test/fixtures/KR-2027.json b/test/fixtures/KR-2027.json index fcbc9cc5c..c611081e7 100644 --- a/test/fixtures/KR-2027.json +++ b/test/fixtures/KR-2027.json @@ -72,13 +72,13 @@ "_weekday": "Sun" }, { - "date": "2027-09-15 00:00:00", - "start": "2027-09-14T15:00:00.000Z", - "end": "2027-09-17T15:00:00.000Z", + "date": "2027-09-14 00:00:00", + "start": "2027-09-13T15:00:00.000Z", + "end": "2027-09-16T15:00:00.000Z", "name": "추석", "type": "public", - "rule": "korean 8-0-15 P3D", - "_weekday": "Wed" + "rule": "korean 8-0-14 P3D", + "_weekday": "Tue" }, { "date": "2027-10-03 00:00:00", diff --git a/test/fixtures/TW-2015.json b/test/fixtures/TW-2015.json index b7cbce221..ce8ee576e 100644 --- a/test/fixtures/TW-2015.json +++ b/test/fixtures/TW-2015.json @@ -84,18 +84,18 @@ "date": "2015-03-05 00:00:00", "start": "2015-03-04T16:00:00.000Z", "end": "2015-03-05T16:00:00.000Z", - "name": "元宵節", + "name": "觀光節", "type": "observance", - "rule": "chinese 01-0-15", + "rule": "chinese 01-0-15 #1", "_weekday": "Thu" }, { "date": "2015-03-05 00:00:00", "start": "2015-03-04T16:00:00.000Z", "end": "2015-03-05T16:00:00.000Z", - "name": "觀光節", + "name": "元宵節", "type": "observance", - "rule": "chinese 01-0-15 #1", + "rule": "chinese 01-0-15", "_weekday": "Thu" }, { @@ -248,18 +248,18 @@ "date": "2015-06-28 00:00:00", "start": "2015-06-27T16:00:00.000Z", "end": "2015-06-28T16:00:00.000Z", - "name": "城隍爺誕辰", + "name": "關公誕辰", "type": "observance", - "rule": "chinese 05-0-13 #1", + "rule": "chinese 05-0-13", "_weekday": "Sun" }, { "date": "2015-06-28 00:00:00", "start": "2015-06-27T16:00:00.000Z", "end": "2015-06-28T16:00:00.000Z", - "name": "關公誕辰", + "name": "城隍爺誕辰", "type": "observance", - "rule": "chinese 05-0-13", + "rule": "chinese 05-0-13 #1", "_weekday": "Sun" }, { @@ -320,19 +320,19 @@ "date": "2015-09-28 00:00:00", "start": "2015-09-27T16:00:00.000Z", "end": "2015-09-28T16:00:00.000Z", - "name": "中秋節 (更换日)", - "type": "public", - "substitute": true, - "rule": "chinese 08-0-15 and if Sunday then next Monday", + "name": "孔子誕辰紀念日", + "type": "observance", + "rule": "09-28", "_weekday": "Mon" }, { "date": "2015-09-28 00:00:00", "start": "2015-09-27T16:00:00.000Z", "end": "2015-09-28T16:00:00.000Z", - "name": "孔子誕辰紀念日", - "type": "observance", - "rule": "09-28", + "name": "中秋節 (更换日)", + "type": "public", + "substitute": true, + "rule": "chinese 08-0-15 and if Sunday then next Monday", "_weekday": "Mon" }, { @@ -348,18 +348,18 @@ "date": "2015-10-21 00:00:00", "start": "2015-10-20T16:00:00.000Z", "end": "2015-10-21T16:00:00.000Z", - "name": "華僑節", + "name": "重陽節", "type": "observance", - "rule": "10-21", + "rule": "chinese 09-0-09", "_weekday": "Wed" }, { "date": "2015-10-21 00:00:00", "start": "2015-10-20T16:00:00.000Z", "end": "2015-10-21T16:00:00.000Z", - "name": "重陽節", + "name": "華僑節", "type": "observance", - "rule": "chinese 09-0-09", + "rule": "10-21", "_weekday": "Wed" }, { diff --git a/test/fixtures/TW-2016.json b/test/fixtures/TW-2016.json index 224f1e67a..0ad0a0712 100644 --- a/test/fixtures/TW-2016.json +++ b/test/fixtures/TW-2016.json @@ -75,18 +75,18 @@ "date": "2016-02-22 00:00:00", "start": "2016-02-21T16:00:00.000Z", "end": "2016-02-22T16:00:00.000Z", - "name": "元宵節", + "name": "觀光節", "type": "observance", - "rule": "chinese 01-0-15", + "rule": "chinese 01-0-15 #1", "_weekday": "Mon" }, { "date": "2016-02-22 00:00:00", "start": "2016-02-21T16:00:00.000Z", "end": "2016-02-22T16:00:00.000Z", - "name": "觀光節", + "name": "元宵節", "type": "observance", - "rule": "chinese 01-0-15 #1", + "rule": "chinese 01-0-15", "_weekday": "Mon" }, { @@ -259,18 +259,18 @@ "date": "2016-06-17 00:00:00", "start": "2016-06-16T16:00:00.000Z", "end": "2016-06-17T16:00:00.000Z", - "name": "城隍爺誕辰", + "name": "關公誕辰", "type": "observance", - "rule": "chinese 05-0-13 #1", + "rule": "chinese 05-0-13", "_weekday": "Fri" }, { "date": "2016-06-17 00:00:00", "start": "2016-06-16T16:00:00.000Z", "end": "2016-06-17T16:00:00.000Z", - "name": "關公誕辰", + "name": "城隍爺誕辰", "type": "observance", - "rule": "chinese 05-0-13", + "rule": "chinese 05-0-13 #1", "_weekday": "Fri" }, { diff --git a/test/fixtures/TW-2017.json b/test/fixtures/TW-2017.json index 5818d7dbd..3ce20b820 100644 --- a/test/fixtures/TW-2017.json +++ b/test/fixtures/TW-2017.json @@ -85,18 +85,18 @@ "date": "2017-02-11 00:00:00", "start": "2017-02-10T16:00:00.000Z", "end": "2017-02-11T16:00:00.000Z", - "name": "元宵節", + "name": "觀光節", "type": "observance", - "rule": "chinese 01-0-15", + "rule": "chinese 01-0-15 #1", "_weekday": "Sat" }, { "date": "2017-02-11 00:00:00", "start": "2017-02-10T16:00:00.000Z", "end": "2017-02-11T16:00:00.000Z", - "name": "觀光節", + "name": "元宵節", "type": "observance", - "rule": "chinese 01-0-15 #1", + "rule": "chinese 01-0-15", "_weekday": "Sat" }, { @@ -248,18 +248,18 @@ "date": "2017-06-07 00:00:00", "start": "2017-06-06T16:00:00.000Z", "end": "2017-06-07T16:00:00.000Z", - "name": "城隍爺誕辰", + "name": "關公誕辰", "type": "observance", - "rule": "chinese 05-0-13 #1", + "rule": "chinese 05-0-13", "_weekday": "Wed" }, { "date": "2017-06-07 00:00:00", "start": "2017-06-06T16:00:00.000Z", "end": "2017-06-07T16:00:00.000Z", - "name": "關公誕辰", + "name": "城隍爺誕辰", "type": "observance", - "rule": "chinese 05-0-13", + "rule": "chinese 05-0-13 #1", "_weekday": "Wed" }, { diff --git a/test/fixtures/TW-2018.json b/test/fixtures/TW-2018.json index a37de433a..d2a3cc01f 100644 --- a/test/fixtures/TW-2018.json +++ b/test/fixtures/TW-2018.json @@ -84,18 +84,18 @@ "date": "2018-03-02 00:00:00", "start": "2018-03-01T16:00:00.000Z", "end": "2018-03-02T16:00:00.000Z", - "name": "元宵節", + "name": "觀光節", "type": "observance", - "rule": "chinese 01-0-15", + "rule": "chinese 01-0-15 #1", "_weekday": "Fri" }, { "date": "2018-03-02 00:00:00", "start": "2018-03-01T16:00:00.000Z", "end": "2018-03-02T16:00:00.000Z", - "name": "觀光節", + "name": "元宵節", "type": "observance", - "rule": "chinese 01-0-15 #1", + "rule": "chinese 01-0-15", "_weekday": "Fri" }, { @@ -138,18 +138,18 @@ "date": "2018-04-04 00:00:00", "start": "2018-04-03T16:00:00.000Z", "end": "2018-04-04T16:00:00.000Z", - "name": "兒童節", - "type": "public", - "rule": "04-04 and if Sunday then next Monday", + "name": "觀音誕辰", + "type": "observance", + "rule": "chinese 02-0-19", "_weekday": "Wed" }, { "date": "2018-04-04 00:00:00", "start": "2018-04-03T16:00:00.000Z", "end": "2018-04-04T16:00:00.000Z", - "name": "觀音誕辰", - "type": "observance", - "rule": "chinese 02-0-19", + "name": "兒童節", + "type": "public", + "rule": "04-04 and if Sunday then next Monday", "_weekday": "Wed" }, { @@ -238,18 +238,18 @@ "date": "2018-06-26 00:00:00", "start": "2018-06-25T16:00:00.000Z", "end": "2018-06-26T16:00:00.000Z", - "name": "城隍爺誕辰", + "name": "關公誕辰", "type": "observance", - "rule": "chinese 05-0-13 #1", + "rule": "chinese 05-0-13", "_weekday": "Tue" }, { "date": "2018-06-26 00:00:00", "start": "2018-06-25T16:00:00.000Z", "end": "2018-06-26T16:00:00.000Z", - "name": "關公誕辰", + "name": "城隍爺誕辰", "type": "observance", - "rule": "chinese 05-0-13", + "rule": "chinese 05-0-13 #1", "_weekday": "Tue" }, { diff --git a/test/fixtures/TW-2019.json b/test/fixtures/TW-2019.json index 3c94a1a5c..da1153a05 100644 --- a/test/fixtures/TW-2019.json +++ b/test/fixtures/TW-2019.json @@ -75,18 +75,18 @@ "date": "2019-02-19 00:00:00", "start": "2019-02-18T16:00:00.000Z", "end": "2019-02-19T16:00:00.000Z", - "name": "元宵節", + "name": "觀光節", "type": "observance", - "rule": "chinese 01-0-15", + "rule": "chinese 01-0-15 #1", "_weekday": "Tue" }, { "date": "2019-02-19 00:00:00", "start": "2019-02-18T16:00:00.000Z", "end": "2019-02-19T16:00:00.000Z", - "name": "觀光節", + "name": "元宵節", "type": "observance", - "rule": "chinese 01-0-15 #1", + "rule": "chinese 01-0-15", "_weekday": "Tue" }, { @@ -102,18 +102,18 @@ "date": "2019-03-08 00:00:00", "start": "2019-03-07T16:00:00.000Z", "end": "2019-03-08T16:00:00.000Z", - "name": "国际妇女节", + "name": "土地公誕辰", "type": "observance", - "rule": "03-08", + "rule": "chinese 02-0-02", "_weekday": "Fri" }, { "date": "2019-03-08 00:00:00", "start": "2019-03-07T16:00:00.000Z", "end": "2019-03-08T16:00:00.000Z", - "name": "土地公誕辰", + "name": "国际妇女节", "type": "observance", - "rule": "chinese 02-0-02", + "rule": "03-08", "_weekday": "Fri" }, { @@ -202,18 +202,18 @@ "date": "2019-05-12 00:00:00", "start": "2019-05-11T16:00:00.000Z", "end": "2019-05-12T16:00:00.000Z", - "name": "佛誕日", + "name": "母親節", "type": "observance", - "rule": "chinese 04-0-08", + "rule": "2nd Sunday in May", "_weekday": "Sun" }, { "date": "2019-05-12 00:00:00", "start": "2019-05-11T16:00:00.000Z", "end": "2019-05-12T16:00:00.000Z", - "name": "母親節", + "name": "佛誕日", "type": "observance", - "rule": "2nd Sunday in May", + "rule": "chinese 04-0-08", "_weekday": "Sun" }, { @@ -238,18 +238,18 @@ "date": "2019-06-15 00:00:00", "start": "2019-06-14T16:00:00.000Z", "end": "2019-06-15T16:00:00.000Z", - "name": "城隍爺誕辰", + "name": "關公誕辰", "type": "observance", - "rule": "chinese 05-0-13 #1", + "rule": "chinese 05-0-13", "_weekday": "Sat" }, { "date": "2019-06-15 00:00:00", "start": "2019-06-14T16:00:00.000Z", "end": "2019-06-15T16:00:00.000Z", - "name": "關公誕辰", + "name": "城隍爺誕辰", "type": "observance", - "rule": "chinese 05-0-13", + "rule": "chinese 05-0-13 #1", "_weekday": "Sat" }, { diff --git a/test/fixtures/TW-2020.json b/test/fixtures/TW-2020.json index 117e030cf..65c8052cd 100644 --- a/test/fixtures/TW-2020.json +++ b/test/fixtures/TW-2020.json @@ -75,18 +75,18 @@ "date": "2020-02-08 00:00:00", "start": "2020-02-07T16:00:00.000Z", "end": "2020-02-08T16:00:00.000Z", - "name": "元宵節", + "name": "觀光節", "type": "observance", - "rule": "chinese 01-0-15", + "rule": "chinese 01-0-15 #1", "_weekday": "Sat" }, { "date": "2020-02-08 00:00:00", "start": "2020-02-07T16:00:00.000Z", "end": "2020-02-08T16:00:00.000Z", - "name": "觀光節", + "name": "元宵節", "type": "observance", - "rule": "chinese 01-0-15 #1", + "rule": "chinese 01-0-15", "_weekday": "Sat" }, { @@ -120,18 +120,18 @@ "date": "2020-03-12 00:00:00", "start": "2020-03-11T16:00:00.000Z", "end": "2020-03-12T16:00:00.000Z", - "name": "國父逝世紀念日", + "name": "觀音誕辰", "type": "observance", - "rule": "03-12", + "rule": "chinese 02-0-19", "_weekday": "Thu" }, { "date": "2020-03-12 00:00:00", "start": "2020-03-11T16:00:00.000Z", "end": "2020-03-12T16:00:00.000Z", - "name": "觀音誕辰", + "name": "國父逝世紀念日", "type": "observance", - "rule": "chinese 02-0-19", + "rule": "03-12", "_weekday": "Thu" }, { @@ -238,18 +238,18 @@ "date": "2020-07-03 00:00:00", "start": "2020-07-02T16:00:00.000Z", "end": "2020-07-03T16:00:00.000Z", - "name": "城隍爺誕辰", + "name": "關公誕辰", "type": "observance", - "rule": "chinese 05-0-13 #1", + "rule": "chinese 05-0-13", "_weekday": "Fri" }, { "date": "2020-07-03 00:00:00", "start": "2020-07-02T16:00:00.000Z", "end": "2020-07-03T16:00:00.000Z", - "name": "關公誕辰", + "name": "城隍爺誕辰", "type": "observance", - "rule": "chinese 05-0-13", + "rule": "chinese 05-0-13 #1", "_weekday": "Fri" }, { diff --git a/test/fixtures/TW-2021.json b/test/fixtures/TW-2021.json index cb587f9e2..0fbe77d62 100644 --- a/test/fixtures/TW-2021.json +++ b/test/fixtures/TW-2021.json @@ -75,18 +75,18 @@ "date": "2021-02-26 00:00:00", "start": "2021-02-25T16:00:00.000Z", "end": "2021-02-26T16:00:00.000Z", - "name": "元宵節", + "name": "觀光節", "type": "observance", - "rule": "chinese 01-0-15", + "rule": "chinese 01-0-15 #1", "_weekday": "Fri" }, { "date": "2021-02-26 00:00:00", "start": "2021-02-25T16:00:00.000Z", "end": "2021-02-26T16:00:00.000Z", - "name": "觀光節", + "name": "元宵節", "type": "observance", - "rule": "chinese 01-0-15 #1", + "rule": "chinese 01-0-15", "_weekday": "Fri" }, { @@ -279,18 +279,18 @@ "date": "2021-06-22 00:00:00", "start": "2021-06-21T16:00:00.000Z", "end": "2021-06-22T16:00:00.000Z", - "name": "城隍爺誕辰", + "name": "關公誕辰", "type": "observance", - "rule": "chinese 05-0-13 #1", + "rule": "chinese 05-0-13", "_weekday": "Tue" }, { "date": "2021-06-22 00:00:00", "start": "2021-06-21T16:00:00.000Z", "end": "2021-06-22T16:00:00.000Z", - "name": "關公誕辰", + "name": "城隍爺誕辰", "type": "observance", - "rule": "chinese 05-0-13", + "rule": "chinese 05-0-13 #1", "_weekday": "Tue" }, { diff --git a/test/fixtures/TW-2022.json b/test/fixtures/TW-2022.json index 4c120b656..0fbb24f75 100644 --- a/test/fixtures/TW-2022.json +++ b/test/fixtures/TW-2022.json @@ -75,18 +75,18 @@ "date": "2022-02-15 00:00:00", "start": "2022-02-14T16:00:00.000Z", "end": "2022-02-15T16:00:00.000Z", - "name": "元宵節", + "name": "觀光節", "type": "observance", - "rule": "chinese 01-0-15", + "rule": "chinese 01-0-15 #1", "_weekday": "Tue" }, { "date": "2022-02-15 00:00:00", "start": "2022-02-14T16:00:00.000Z", "end": "2022-02-15T16:00:00.000Z", - "name": "觀光節", + "name": "元宵節", "type": "observance", - "rule": "chinese 01-0-15 #1", + "rule": "chinese 01-0-15", "_weekday": "Tue" }, { @@ -213,18 +213,18 @@ "date": "2022-05-08 00:00:00", "start": "2022-05-07T16:00:00.000Z", "end": "2022-05-08T16:00:00.000Z", - "name": "佛誕日", + "name": "母親節", "type": "observance", - "rule": "chinese 04-0-08", + "rule": "2nd Sunday in May", "_weekday": "Sun" }, { "date": "2022-05-08 00:00:00", "start": "2022-05-07T16:00:00.000Z", "end": "2022-05-08T16:00:00.000Z", - "name": "母親節", + "name": "佛誕日", "type": "observance", - "rule": "2nd Sunday in May", + "rule": "chinese 04-0-08", "_weekday": "Sun" }, { @@ -249,18 +249,18 @@ "date": "2022-06-11 00:00:00", "start": "2022-06-10T16:00:00.000Z", "end": "2022-06-11T16:00:00.000Z", - "name": "城隍爺誕辰", + "name": "關公誕辰", "type": "observance", - "rule": "chinese 05-0-13 #1", + "rule": "chinese 05-0-13", "_weekday": "Sat" }, { "date": "2022-06-11 00:00:00", "start": "2022-06-10T16:00:00.000Z", "end": "2022-06-11T16:00:00.000Z", - "name": "關公誕辰", + "name": "城隍爺誕辰", "type": "observance", - "rule": "chinese 05-0-13", + "rule": "chinese 05-0-13 #1", "_weekday": "Sat" }, { diff --git a/test/fixtures/TW-2023.json b/test/fixtures/TW-2023.json index 81381c803..827321da2 100644 --- a/test/fixtures/TW-2023.json +++ b/test/fixtures/TW-2023.json @@ -85,18 +85,18 @@ "date": "2023-02-05 00:00:00", "start": "2023-02-04T16:00:00.000Z", "end": "2023-02-05T16:00:00.000Z", - "name": "元宵節", + "name": "觀光節", "type": "observance", - "rule": "chinese 01-0-15", + "rule": "chinese 01-0-15 #1", "_weekday": "Sun" }, { "date": "2023-02-05 00:00:00", "start": "2023-02-04T16:00:00.000Z", "end": "2023-02-05T16:00:00.000Z", - "name": "觀光節", + "name": "元宵節", "type": "observance", - "rule": "chinese 01-0-15 #1", + "rule": "chinese 01-0-15", "_weekday": "Sun" }, { @@ -185,18 +185,18 @@ "date": "2023-05-04 00:00:00", "start": "2023-05-03T16:00:00.000Z", "end": "2023-05-04T16:00:00.000Z", - "name": "保生大帝誕辰", + "name": "文藝節", "type": "observance", - "rule": "chinese 03-0-15", + "rule": "05-04", "_weekday": "Thu" }, { "date": "2023-05-04 00:00:00", "start": "2023-05-03T16:00:00.000Z", "end": "2023-05-04T16:00:00.000Z", - "name": "文藝節", + "name": "保生大帝誕辰", "type": "observance", - "rule": "05-04", + "rule": "chinese 03-0-15", "_weekday": "Thu" }, { @@ -248,18 +248,18 @@ "date": "2023-06-30 00:00:00", "start": "2023-06-29T16:00:00.000Z", "end": "2023-06-30T16:00:00.000Z", - "name": "城隍爺誕辰", + "name": "關公誕辰", "type": "observance", - "rule": "chinese 05-0-13 #1", + "rule": "chinese 05-0-13", "_weekday": "Fri" }, { "date": "2023-06-30 00:00:00", "start": "2023-06-29T16:00:00.000Z", "end": "2023-06-30T16:00:00.000Z", - "name": "關公誕辰", + "name": "城隍爺誕辰", "type": "observance", - "rule": "chinese 05-0-13", + "rule": "chinese 05-0-13 #1", "_weekday": "Fri" }, { diff --git a/test/fixtures/TW-2024.json b/test/fixtures/TW-2024.json index 3e166d418..bcae91705 100644 --- a/test/fixtures/TW-2024.json +++ b/test/fixtures/TW-2024.json @@ -75,18 +75,18 @@ "date": "2024-02-24 00:00:00", "start": "2024-02-23T16:00:00.000Z", "end": "2024-02-24T16:00:00.000Z", - "name": "元宵節", + "name": "觀光節", "type": "observance", - "rule": "chinese 01-0-15", + "rule": "chinese 01-0-15 #1", "_weekday": "Sat" }, { "date": "2024-02-24 00:00:00", "start": "2024-02-23T16:00:00.000Z", "end": "2024-02-24T16:00:00.000Z", - "name": "觀光節", + "name": "元宵節", "type": "observance", - "rule": "chinese 01-0-15 #1", + "rule": "chinese 01-0-15", "_weekday": "Sat" }, { @@ -238,18 +238,18 @@ "date": "2024-06-18 00:00:00", "start": "2024-06-17T16:00:00.000Z", "end": "2024-06-18T16:00:00.000Z", - "name": "城隍爺誕辰", + "name": "關公誕辰", "type": "observance", - "rule": "chinese 05-0-13 #1", + "rule": "chinese 05-0-13", "_weekday": "Tue" }, { "date": "2024-06-18 00:00:00", "start": "2024-06-17T16:00:00.000Z", "end": "2024-06-18T16:00:00.000Z", - "name": "關公誕辰", + "name": "城隍爺誕辰", "type": "observance", - "rule": "chinese 05-0-13", + "rule": "chinese 05-0-13 #1", "_weekday": "Tue" }, { diff --git a/test/fixtures/TW-2025.json b/test/fixtures/TW-2025.json index fab4c9332..0b39c636c 100644 --- a/test/fixtures/TW-2025.json +++ b/test/fixtures/TW-2025.json @@ -75,18 +75,18 @@ "date": "2025-02-12 00:00:00", "start": "2025-02-11T16:00:00.000Z", "end": "2025-02-12T16:00:00.000Z", - "name": "元宵節", + "name": "觀光節", "type": "observance", - "rule": "chinese 01-0-15", + "rule": "chinese 01-0-15 #1", "_weekday": "Wed" }, { "date": "2025-02-12 00:00:00", "start": "2025-02-11T16:00:00.000Z", "end": "2025-02-12T16:00:00.000Z", - "name": "觀光節", + "name": "元宵節", "type": "observance", - "rule": "chinese 01-0-15 #1", + "rule": "chinese 01-0-15", "_weekday": "Wed" }, { @@ -238,18 +238,18 @@ "date": "2025-06-08 00:00:00", "start": "2025-06-07T16:00:00.000Z", "end": "2025-06-08T16:00:00.000Z", - "name": "城隍爺誕辰", + "name": "關公誕辰", "type": "observance", - "rule": "chinese 05-0-13 #1", + "rule": "chinese 05-0-13", "_weekday": "Sun" }, { "date": "2025-06-08 00:00:00", "start": "2025-06-07T16:00:00.000Z", "end": "2025-06-08T16:00:00.000Z", - "name": "關公誕辰", + "name": "城隍爺誕辰", "type": "observance", - "rule": "chinese 05-0-13", + "rule": "chinese 05-0-13 #1", "_weekday": "Sun" }, { diff --git a/test/fixtures/TW-2026.json b/test/fixtures/TW-2026.json index 0b6a10cfc..c7bad59f0 100644 --- a/test/fixtures/TW-2026.json +++ b/test/fixtures/TW-2026.json @@ -84,18 +84,18 @@ "date": "2026-03-03 00:00:00", "start": "2026-03-02T16:00:00.000Z", "end": "2026-03-03T16:00:00.000Z", - "name": "元宵節", + "name": "觀光節", "type": "observance", - "rule": "chinese 01-0-15", + "rule": "chinese 01-0-15 #1", "_weekday": "Tue" }, { "date": "2026-03-03 00:00:00", "start": "2026-03-02T16:00:00.000Z", "end": "2026-03-03T16:00:00.000Z", - "name": "觀光節", + "name": "元宵節", "type": "observance", - "rule": "chinese 01-0-15 #1", + "rule": "chinese 01-0-15", "_weekday": "Tue" }, { @@ -156,38 +156,38 @@ "date": "2026-04-06 00:00:00", "start": "2026-04-05T16:00:00.000Z", "end": "2026-04-06T16:00:00.000Z", - "name": "淸明節 (更换日)", - "type": "public", - "substitute": true, - "rule": "chinese 5-01 solarterm and if Sunday then next Monday", + "name": "觀音誕辰", + "type": "observance", + "rule": "chinese 02-0-19", "_weekday": "Mon" }, { "date": "2026-04-06 00:00:00", "start": "2026-04-05T16:00:00.000Z", "end": "2026-04-06T16:00:00.000Z", - "name": "觀音誕辰", - "type": "observance", - "rule": "chinese 02-0-19", + "name": "淸明節 (更换日)", + "type": "public", + "substitute": true, + "rule": "chinese 5-01 solarterm and if Sunday then next Monday", "_weekday": "Mon" }, { "date": "2026-05-01 00:00:00", "start": "2026-04-30T16:00:00.000Z", "end": "2026-05-01T16:00:00.000Z", - "name": "保生大帝誕辰", + "name": "勞動節", "type": "observance", - "rule": "chinese 03-0-15", + "note": "private sector", + "rule": "05-01 and if Saturday then previous Friday if Sunday then next Monday", "_weekday": "Fri" }, { "date": "2026-05-01 00:00:00", "start": "2026-04-30T16:00:00.000Z", "end": "2026-05-01T16:00:00.000Z", - "name": "勞動節", + "name": "保生大帝誕辰", "type": "observance", - "note": "private sector", - "rule": "05-01 and if Saturday then previous Friday if Sunday then next Monday", + "rule": "chinese 03-0-15", "_weekday": "Fri" }, { @@ -248,18 +248,18 @@ "date": "2026-06-27 00:00:00", "start": "2026-06-26T16:00:00.000Z", "end": "2026-06-27T16:00:00.000Z", - "name": "城隍爺誕辰", + "name": "關公誕辰", "type": "observance", - "rule": "chinese 05-0-13 #1", + "rule": "chinese 05-0-13", "_weekday": "Sat" }, { "date": "2026-06-27 00:00:00", "start": "2026-06-26T16:00:00.000Z", "end": "2026-06-27T16:00:00.000Z", - "name": "關公誕辰", + "name": "城隍爺誕辰", "type": "observance", - "rule": "chinese 05-0-13", + "rule": "chinese 05-0-13 #1", "_weekday": "Sat" }, { diff --git a/test/fixtures/TW-2027.json b/test/fixtures/TW-2027.json index c4198a6b7..bc5b9c238 100644 --- a/test/fixtures/TW-2027.json +++ b/test/fixtures/TW-2027.json @@ -75,18 +75,18 @@ "date": "2027-02-20 00:00:00", "start": "2027-02-19T16:00:00.000Z", "end": "2027-02-20T16:00:00.000Z", - "name": "元宵節", + "name": "觀光節", "type": "observance", - "rule": "chinese 01-0-15", + "rule": "chinese 01-0-15 #1", "_weekday": "Sat" }, { "date": "2027-02-20 00:00:00", "start": "2027-02-19T16:00:00.000Z", "end": "2027-02-20T16:00:00.000Z", - "name": "觀光節", + "name": "元宵節", "type": "observance", - "rule": "chinese 01-0-15 #1", + "rule": "chinese 01-0-15", "_weekday": "Sat" }, { @@ -269,36 +269,36 @@ "date": "2027-06-17 00:00:00", "start": "2027-06-16T16:00:00.000Z", "end": "2027-06-17T16:00:00.000Z", - "name": "城隍爺誕辰", + "name": "關公誕辰", "type": "observance", - "rule": "chinese 05-0-13 #1", + "rule": "chinese 05-0-13", "_weekday": "Thu" }, { "date": "2027-06-17 00:00:00", "start": "2027-06-16T16:00:00.000Z", "end": "2027-06-17T16:00:00.000Z", - "name": "關公誕辰", + "name": "城隍爺誕辰", "type": "observance", - "rule": "chinese 05-0-13", + "rule": "chinese 05-0-13 #1", "_weekday": "Thu" }, { "date": "2027-08-08 00:00:00", "start": "2027-08-07T16:00:00.000Z", "end": "2027-08-08T16:00:00.000Z", - "name": "七夕", + "name": "父親節", "type": "observance", - "rule": "chinese 07-0-07", + "rule": "08-08", "_weekday": "Sun" }, { "date": "2027-08-08 00:00:00", "start": "2027-08-07T16:00:00.000Z", "end": "2027-08-08T16:00:00.000Z", - "name": "父親節", + "name": "七夕", "type": "observance", - "rule": "08-08", + "rule": "chinese 07-0-07", "_weekday": "Sun" }, {