Merge branch 'opening-hours#465' into develop

KristjanESPERANTO · Jan 1, 2025 · c265706 · c265706
2 parents 44149ce + 6671599
commit c265706
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/holidays/fi.yaml b/src/holidays/fi.yaml
@@ -13,8 +13,9 @@ 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': '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]}

diff --git 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
@@ -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',