Skip to content

Commit b7d77f6

Browse files
authored
Merge pull request #568 from commenthol/fix-se-marie-bebadelsedag
fix(SE,#565): Correct Marie Bebådelsedag and Sveriges nationaldag dates
2 parents 983a489 + 15ddbcc commit b7d77f6

File tree

18 files changed

+31
-158
lines changed

18 files changed

+31
-158
lines changed

LICENSE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,5 +218,6 @@ https://ro.wikipedia.org/wiki/Republica_Moldova
218218
https://ro.wikipedia.org/wiki/Ziua_vinului_(Republica_Moldova)
219219
https://ru.m.wikipedia.org/wiki/%D0%9F%D1%80%D0%B0%D0%B7%D0%B4%D0%BD%D0%B8%D0%BA%D0%B8_%D0%A0%D0%BE%D1%81%D1%81%D0%B8%D0%B8
220220
https://sv.wikipedia.org/wiki/Helgdagar_i_Sverige
221+
https://sv.wikipedia.org/wiki/Sveriges_nationaldag#Svenska_flaggans_dag
221222

222223
</attribution>

data/countries/SE.yaml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ holidays:
2929
name:
3030
sv: Vasaloppet
3131
type: observance
32-
03-25:
32+
# @source https://www.riksdagen.se/sv/dokument-och-lagar/dokument/svensk-forfattningssamling/lag-1989253-om-allmanna-helgdagar_sfs-1989-253/
33+
03-25 prior to 1990:
3334
name:
3435
sv: Marie Bebådelsedag
3536
en: Annunciation Day
@@ -70,10 +71,16 @@ holidays:
7071
sunday before 06-01:
7172
_name: Mothers Day
7273
type: observance
73-
06-06:
74+
# @attrib https://sv.wikipedia.org/wiki/Sveriges_nationaldag#Svenska_flaggans_dag
75+
06-06 since 2005:
7476
name:
7577
sv: Sveriges nationaldag
7678
en: National Day
79+
06-06 since 1983 prior to 2005:
80+
name:
81+
sv: Sveriges nationaldag
82+
en: National Day
83+
type: observance
7784
friday after 06-19:
7885
name:
7986
sv: Midsommarafton

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -251,15 +251,15 @@
251251
},
252252
"dependencies": {
253253
"date-holidays-parser": "^3.4.7",
254-
"js-yaml": "^4.1.0",
254+
"js-yaml": "^4.1.1",
255255
"lodash": "^4.17.21",
256256
"prepin": "^1.0.3"
257257
},
258258
"devDependencies": {
259259
"@babel/cli": "^7.28.3",
260-
"@babel/core": "^7.28.4",
260+
"@babel/core": "^7.28.5",
261261
"@babel/polyfill": "^7.12.1",
262-
"@babel/preset-env": "^7.28.3",
262+
"@babel/preset-env": "^7.28.5",
263263
"@commitlint/cli": "^18.6.1",
264264
"@commitlint/config-conventional": "^18.6.3",
265265
"@mocha/contributors": "git+https://github.com/commenthol/contributors.git#semver:1.1.0-0",
@@ -273,13 +273,13 @@
273273
"hashtree": "^0.7.0",
274274
"husky": "^9.1.7",
275275
"markedpp": "^1.4.0",
276-
"mocha": "^11.7.4",
276+
"mocha": "^11.7.5",
277277
"npm-run-all": "^4.1.5",
278-
"rimraf": "^6.0.1",
278+
"rimraf": "^6.1.2",
279279
"rollup": "^2.79.2",
280280
"tstyche": "^4.3.0",
281281
"watch-run": "^1.2.5",
282-
"webpack": "^5.102.1",
282+
"webpack": "^5.104.1",
283283
"webpack-bundle-analyzer": "^4.10.2",
284284
"webpack-cli": "^5.1.4"
285285
},

test/fixtures/SE-2015.json

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,6 @@
4444
"rule": "1st sunday in March",
4545
"_weekday": "Sun"
4646
},
47-
{
48-
"date": "2015-03-25 00:00:00",
49-
"start": "2015-03-24T23:00:00.000Z",
50-
"end": "2015-03-25T23:00:00.000Z",
51-
"name": "Marie Bebådelsedag",
52-
"type": "observance",
53-
"rule": "03-25",
54-
"_weekday": "Wed"
55-
},
5647
{
5748
"date": "2015-04-02 00:00:00",
5849
"start": "2015-04-01T22:00:00.000Z",
@@ -167,7 +158,7 @@
167158
"end": "2015-06-06T22:00:00.000Z",
168159
"name": "Sveriges nationaldag",
169160
"type": "public",
170-
"rule": "06-06",
161+
"rule": "06-06 since 2005",
171162
"_weekday": "Sat"
172163
},
173164
{

test/fixtures/SE-2016.json

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,6 @@
6262
"rule": "easter -2",
6363
"_weekday": "Fri"
6464
},
65-
{
66-
"date": "2016-03-25 00:00:00",
67-
"start": "2016-03-24T23:00:00.000Z",
68-
"end": "2016-03-25T23:00:00.000Z",
69-
"name": "Marie Bebådelsedag",
70-
"type": "observance",
71-
"rule": "03-25",
72-
"_weekday": "Fri"
73-
},
7465
{
7566
"date": "2016-03-26 00:00:00",
7667
"start": "2016-03-25T23:00:00.000Z",
@@ -167,7 +158,7 @@
167158
"end": "2016-06-06T22:00:00.000Z",
168159
"name": "Sveriges nationaldag",
169160
"type": "public",
170-
"rule": "06-06",
161+
"rule": "06-06 since 2005",
171162
"_weekday": "Mon"
172163
},
173164
{

test/fixtures/SE-2017.json

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,6 @@
4444
"rule": "1st sunday in March",
4545
"_weekday": "Sun"
4646
},
47-
{
48-
"date": "2017-03-25 00:00:00",
49-
"start": "2017-03-24T23:00:00.000Z",
50-
"end": "2017-03-25T23:00:00.000Z",
51-
"name": "Marie Bebådelsedag",
52-
"type": "observance",
53-
"rule": "03-25",
54-
"_weekday": "Sat"
55-
},
5647
{
5748
"date": "2017-04-13 00:00:00",
5849
"start": "2017-04-12T22:00:00.000Z",
@@ -167,7 +158,7 @@
167158
"end": "2017-06-06T22:00:00.000Z",
168159
"name": "Sveriges nationaldag",
169160
"type": "public",
170-
"rule": "06-06",
161+
"rule": "06-06 since 2005",
171162
"_weekday": "Tue"
172163
},
173164
{

test/fixtures/SE-2018.json

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,6 @@
4444
"rule": "1st sunday in March",
4545
"_weekday": "Sun"
4646
},
47-
{
48-
"date": "2018-03-25 00:00:00",
49-
"start": "2018-03-24T23:00:00.000Z",
50-
"end": "2018-03-25T22:00:00.000Z",
51-
"name": "Marie Bebådelsedag",
52-
"type": "observance",
53-
"rule": "03-25",
54-
"_weekday": "Sun"
55-
},
5647
{
5748
"date": "2018-03-29 00:00:00",
5849
"start": "2018-03-28T22:00:00.000Z",
@@ -167,7 +158,7 @@
167158
"end": "2018-06-06T22:00:00.000Z",
168159
"name": "Sveriges nationaldag",
169160
"type": "public",
170-
"rule": "06-06",
161+
"rule": "06-06 since 2005",
171162
"_weekday": "Wed"
172163
},
173164
{

test/fixtures/SE-2019.json

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,6 @@
4444
"rule": "1st sunday in March",
4545
"_weekday": "Sun"
4646
},
47-
{
48-
"date": "2019-03-25 00:00:00",
49-
"start": "2019-03-24T23:00:00.000Z",
50-
"end": "2019-03-25T23:00:00.000Z",
51-
"name": "Marie Bebådelsedag",
52-
"type": "observance",
53-
"rule": "03-25",
54-
"_weekday": "Mon"
55-
},
5647
{
5748
"date": "2019-04-18 00:00:00",
5849
"start": "2019-04-17T22:00:00.000Z",
@@ -140,7 +131,7 @@
140131
"end": "2019-06-06T22:00:00.000Z",
141132
"name": "Sveriges nationaldag",
142133
"type": "public",
143-
"rule": "06-06",
134+
"rule": "06-06 since 2005",
144135
"_weekday": "Thu"
145136
},
146137
{

test/fixtures/SE-2020.json

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,6 @@
4444
"rule": "1st sunday in March",
4545
"_weekday": "Sun"
4646
},
47-
{
48-
"date": "2020-03-25 00:00:00",
49-
"start": "2020-03-24T23:00:00.000Z",
50-
"end": "2020-03-25T23:00:00.000Z",
51-
"name": "Marie Bebådelsedag",
52-
"type": "observance",
53-
"rule": "03-25",
54-
"_weekday": "Wed"
55-
},
5647
{
5748
"date": "2020-04-09 00:00:00",
5849
"start": "2020-04-08T22:00:00.000Z",
@@ -167,7 +158,7 @@
167158
"end": "2020-06-06T22:00:00.000Z",
168159
"name": "Sveriges nationaldag",
169160
"type": "public",
170-
"rule": "06-06",
161+
"rule": "06-06 since 2005",
171162
"_weekday": "Sat"
172163
},
173164
{

test/fixtures/SE-2021.json

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,6 @@
4444
"rule": "1st sunday in March",
4545
"_weekday": "Sun"
4646
},
47-
{
48-
"date": "2021-03-25 00:00:00",
49-
"start": "2021-03-24T23:00:00.000Z",
50-
"end": "2021-03-25T23:00:00.000Z",
51-
"name": "Marie Bebådelsedag",
52-
"type": "observance",
53-
"rule": "03-25",
54-
"_weekday": "Thu"
55-
},
5647
{
5748
"date": "2021-04-01 00:00:00",
5849
"start": "2021-03-31T22:00:00.000Z",
@@ -167,7 +158,7 @@
167158
"end": "2021-06-06T22:00:00.000Z",
168159
"name": "Sveriges nationaldag",
169160
"type": "public",
170-
"rule": "06-06",
161+
"rule": "06-06 since 2005",
171162
"_weekday": "Sun"
172163
},
173164
{

0 commit comments

Comments
 (0)