From 92b85e6e85ede097fe01f60fe4a990e57963ce0e Mon Sep 17 00:00:00 2001 From: August Wikerfors Date: Tue, 16 Jul 2024 00:16:12 +0200 Subject: [PATCH 1/2] add Ascension Day for Sweden and Finland --- src/holidays/fi.yaml | 1 + src/holidays/se.yaml | 1 + test/test.js | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/holidays/fi.yaml b/src/holidays/fi.yaml index 5e7f9dca..a637dd3b 100644 --- a/src/holidays/fi.yaml +++ b/src/holidays/fi.yaml @@ -13,6 +13,7 @@ PH: - {'name': 'pääsiäispäivä - påskdagen', 'variable_date': easter} - {'name': 'toinen pääsiäispäivä - annandag påsk', 'variable_date': easter, 'offset': 1} - {'name': 'vappu - första maj', 'fixed_date': [5, 1]} + - {'name': 'helatorstai - Kristi himmelsfärdsdag', 'variable_date': easter, 'offset': 39} - {'name': 'helluntai - pingst', 'variable_date': easter, 'offset': 49} - {'name': 'juhannuspäivä - midsommarafton', 'variable_date': nextSaturday20Jun} - {'name': 'pyhäinpäivä - alla helgons dag', 'variable_date': nextSaturday31Oct} diff --git a/src/holidays/se.yaml b/src/holidays/se.yaml index 92634651..b9829d09 100644 --- a/src/holidays/se.yaml +++ b/src/holidays/se.yaml @@ -11,6 +11,7 @@ PH: - {'name': 'påskdagen', 'variable_date': easter} - {'name': 'annandag påsk', 'variable_date': easter, 'offset': 1} - {'name': 'första maj', 'fixed_date': [5, 1]} + - {'name': 'Kristi himmelsfärdsdag', 'variable_date': easter, 'offset': 39} - {'name': 'pingstdagen', 'variable_date': easter, 'offset': 49} - {'name': 'nationaldagen', 'fixed_date': [6, 6]} - {'name': 'midsommardagen', 'variable_date': nextSaturday20Jun} diff --git a/test/test.js b/test/test.js index a9390db9..b527a71e 100755 --- a/test/test.js +++ b/test/test.js @@ -2460,13 +2460,14 @@ test.addTest('Variable days: Swedish public holidays.', [ [ '2015-04-05 00:00', '2015-04-06 00:00', false, 'påskdagen' ], [ '2015-04-06 00:00', '2015-04-07 00:00', false, 'annandag påsk' ], [ '2015-05-01 00:00', '2015-05-02 00:00', false, 'första maj' ], + [ '2015-05-14 00:00', '2015-05-15 00:00', false, 'Kristi himmelsfärdsdag' ], [ '2015-05-24 00:00', '2015-05-25 00:00', false, 'pingstdagen' ], [ '2015-06-06 00:00', '2015-06-07 00:00', false, 'nationaldagen' ], [ '2015-06-20 00:00', '2015-06-21 00:00', false, 'midsommardagen' ], [ '2015-10-31 00:00', '2015-11-01 00:00', false, 'alla helgons dag' ], [ '2015-12-25 00:00', '2015-12-26 00:00', false, 'juldagen' ], [ '2015-12-26 00:00', '2015-12-27 00:00', false, 'annandag jul' ], -], 1000 * 60 * 60 * 24 * 12, 0, false, nominatim_by_loc.se, 'not last test'); +], 1000 * 60 * 60 * 24 * 13, 0, false, nominatim_by_loc.se, 'not last test'); test.addTest('Variable days: Weekday in given week.', [ 'PH', From 6671599f233107f9f32610ce952ebef3e8f6c953 Mon Sep 17 00:00:00 2001 From: August Wikerfors Date: Tue, 16 Jul 2024 00:17:15 +0200 Subject: [PATCH 2/2] fix Swedish name of Midsummer Day for Finland --- src/holidays/fi.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/holidays/fi.yaml b/src/holidays/fi.yaml index a637dd3b..764abf79 100644 --- a/src/holidays/fi.yaml +++ b/src/holidays/fi.yaml @@ -15,7 +15,7 @@ PH: - {'name': 'vappu - första maj', 'fixed_date': [5, 1]} - {'name': 'helatorstai - Kristi himmelsfärdsdag', 'variable_date': easter, 'offset': 39} - {'name': 'helluntai - pingst', 'variable_date': easter, 'offset': 49} - - {'name': 'juhannuspäivä - midsommarafton', 'variable_date': nextSaturday20Jun} + - {'name': 'juhannuspäivä - midsommardagen', 'variable_date': nextSaturday20Jun} - {'name': 'pyhäinpäivä - alla helgons dag', 'variable_date': nextSaturday31Oct} - {'name': 'itsenäisyyspäivä - självständighetsdagen', 'fixed_date': [12, 6]} - {'name': 'joulupäivä - juldagen', 'fixed_date': [12, 25]}