Merge pull request #557 from M4TY/patch-1

Update Slovakia's timezone and holiday observances after new consolidation

Author: commenthol

data/countries/SK.yaml

@@ -7,7 +7,7 @@ holidays:
     langs:
       - sk
     zones:
-      - Europe/Prague
+      - Europe/Bratislava
     dayoff: sunday
     days:
       01-01:
@@ -16,45 +16,77 @@ holidays:
           sk: Deň vzniku Slovenskej republiky
       01-06:
         _name: 01-06
+        type: observance
       easter -2:
         _name: easter -2
       easter:
         _name: easter
         type: observance
       easter 1:
         _name: easter 1
-      05-01:
+      05-01 since 2025:
+        _name: 05-01
+        type: observance
+      05-01 prior to 2025:
         _name: 05-01
-      05-08:
+      05-08 prior to 2025:
         name:
           sk: Deň víťazstva nad fašizmom
           en: Day of victory over fascism
+      05-08 since 2025:
+        name:
+          sk: Deň víťazstva nad fašizmom
+          en: Day of victory over fascism
+        type: observance
       2nd sunday in May:
         _name: Mothers Day
         type: observance
-      07-05:
+      07-05 prior to 2025:
         name:
           sk: Sviatok svätého Cyrila a Metoda
           en: Saints Cyril and Methodius Day
-      08-29:
+      07-05 since 2025:
+        name:
+          sk: Sviatok svätého Cyrila a Metoda
+          en: Saints Cyril and Methodius Day
+        type: observance
+      08-29 prior to 2025:
         name:
           sk: Výročie Slovenského národného povstania
           en: Slovak National Uprising anniversary
+      08-29 since 2025:
+        name:
+          sk: Výročie Slovenského národného povstania
+          en: Slovak National Uprising anniversary
+        type: observance
       09-01 since 1994 and prior to 2024:
         _name: Constitution Day
       09-01 since 2024:
         _name: Constitution Day
         type: observance
-      09-15:
+      09-15 prior to 2025:
+        name:
+          sk: Sviatok Panny Márie Sedembolestnej
+          en: Day of Our Lady of the Seven Sorrows
+      09-15 since 2025:
         name:
           sk: Sviatok Panny Márie Sedembolestnej
           en: Day of Our Lady of the Seven Sorrows
-      11-01:
+        type: observance
+      11-01 prior to 2025:
         _name: 11-01
-      11-17:
+      11-01 since 2025:
+        _name: 11-01
+        type: observance
+      11-17 prior to 2025:
+        name:
+          sk: Deň boja za slobodu a demokraciu
+          en: Struggle for Freedom and Democracy Day
+      11-17 since 2025:
         name:
           sk: Deň boja za slobodu a demokraciu
           en: Struggle for Freedom and Democracy Day
+        type: observance
       12-24:
         _name: 12-24
       12-25:

test/fixtures/SK-2015.json

@@ -13,7 +13,7 @@
     "start": "2015-01-05T23:00:00.000Z",
     "end": "2015-01-06T23:00:00.000Z",
     "name": "Zjavenie Pána",
-    "type": "public",
+    "type": "observance",
     "rule": "01-06",
     "_weekday": "Tue"
   },
@@ -50,7 +50,7 @@
     "end": "2015-05-01T22:00:00.000Z",
     "name": "Sviatok práce",
     "type": "public",
-    "rule": "05-01",
+    "rule": "05-01 prior to 2025",
     "_weekday": "Fri"
   },
   {
@@ -59,7 +59,7 @@
     "end": "2015-05-08T22:00:00.000Z",
     "name": "Deň víťazstva nad fašizmom",
     "type": "public",
-    "rule": "05-08",
+    "rule": "05-08 prior to 2025",
     "_weekday": "Fri"
   },
   {
@@ -77,7 +77,7 @@
     "end": "2015-07-05T22:00:00.000Z",
     "name": "Sviatok svätého Cyrila a Metoda",
     "type": "public",
-    "rule": "07-05",
+    "rule": "07-05 prior to 2025",
     "_weekday": "Sun"
   },
   {
@@ -86,7 +86,7 @@
     "end": "2015-08-29T22:00:00.000Z",
     "name": "Výročie Slovenského národného povstania",
     "type": "public",
-    "rule": "08-29",
+    "rule": "08-29 prior to 2025",
     "_weekday": "Sat"
   },
   {
@@ -104,7 +104,7 @@
     "end": "2015-09-15T22:00:00.000Z",
     "name": "Sviatok Panny Márie Sedembolestnej",
     "type": "public",
-    "rule": "09-15",
+    "rule": "09-15 prior to 2025",
     "_weekday": "Tue"
   },
   {
@@ -113,7 +113,7 @@
     "end": "2015-11-01T23:00:00.000Z",
     "name": "Sviatok všetkých svätých",
     "type": "public",
-    "rule": "11-01",
+    "rule": "11-01 prior to 2025",
     "_weekday": "Sun"
   },
   {
@@ -122,7 +122,7 @@
     "end": "2015-11-17T23:00:00.000Z",
     "name": "Deň boja za slobodu a demokraciu",
     "type": "public",
-    "rule": "11-17",
+    "rule": "11-17 prior to 2025",
     "_weekday": "Tue"
   },
   {

test/fixtures/SK-2016.json

@@ -13,7 +13,7 @@
     "start": "2016-01-05T23:00:00.000Z",
     "end": "2016-01-06T23:00:00.000Z",
     "name": "Zjavenie Pána",
-    "type": "public",
+    "type": "observance",
     "rule": "01-06",
     "_weekday": "Wed"
   },
@@ -50,7 +50,7 @@
     "end": "2016-05-01T22:00:00.000Z",
     "name": "Sviatok práce",
     "type": "public",
-    "rule": "05-01",
+    "rule": "05-01 prior to 2025",
     "_weekday": "Sun"
   },
   {
@@ -59,7 +59,7 @@
     "end": "2016-05-08T22:00:00.000Z",
     "name": "Deň víťazstva nad fašizmom",
     "type": "public",
-    "rule": "05-08",
+    "rule": "05-08 prior to 2025",
     "_weekday": "Sun"
   },
   {
@@ -77,7 +77,7 @@
     "end": "2016-07-05T22:00:00.000Z",
     "name": "Sviatok svätého Cyrila a Metoda",
     "type": "public",
-    "rule": "07-05",
+    "rule": "07-05 prior to 2025",
     "_weekday": "Tue"
   },
   {
@@ -86,7 +86,7 @@
     "end": "2016-08-29T22:00:00.000Z",
     "name": "Výročie Slovenského národného povstania",
     "type": "public",
-    "rule": "08-29",
+    "rule": "08-29 prior to 2025",
     "_weekday": "Mon"
   },
   {
@@ -104,7 +104,7 @@
     "end": "2016-09-15T22:00:00.000Z",
     "name": "Sviatok Panny Márie Sedembolestnej",
     "type": "public",
-    "rule": "09-15",
+    "rule": "09-15 prior to 2025",
     "_weekday": "Thu"
   },
   {
@@ -113,7 +113,7 @@
     "end": "2016-11-01T23:00:00.000Z",
     "name": "Sviatok všetkých svätých",
     "type": "public",
-    "rule": "11-01",
+    "rule": "11-01 prior to 2025",
     "_weekday": "Tue"
   },
   {
@@ -122,7 +122,7 @@
     "end": "2016-11-17T23:00:00.000Z",
     "name": "Deň boja za slobodu a demokraciu",
     "type": "public",
-    "rule": "11-17",
+    "rule": "11-17 prior to 2025",
     "_weekday": "Thu"
   },
   {

test/fixtures/SK-2017.json

@@ -13,7 +13,7 @@
     "start": "2017-01-05T23:00:00.000Z",
     "end": "2017-01-06T23:00:00.000Z",
     "name": "Zjavenie Pána",
-    "type": "public",
+    "type": "observance",
     "rule": "01-06",
     "_weekday": "Fri"
   },
@@ -50,7 +50,7 @@
     "end": "2017-05-01T22:00:00.000Z",
     "name": "Sviatok práce",
     "type": "public",
-    "rule": "05-01",
+    "rule": "05-01 prior to 2025",
     "_weekday": "Mon"
   },
   {
@@ -59,7 +59,7 @@
     "end": "2017-05-08T22:00:00.000Z",
     "name": "Deň víťazstva nad fašizmom",
     "type": "public",
-    "rule": "05-08",
+    "rule": "05-08 prior to 2025",
     "_weekday": "Mon"
   },
   {
@@ -77,7 +77,7 @@
     "end": "2017-07-05T22:00:00.000Z",
     "name": "Sviatok svätého Cyrila a Metoda",
     "type": "public",
-    "rule": "07-05",
+    "rule": "07-05 prior to 2025",
     "_weekday": "Wed"
   },
   {
@@ -86,7 +86,7 @@
     "end": "2017-08-29T22:00:00.000Z",
     "name": "Výročie Slovenského národného povstania",
     "type": "public",
-    "rule": "08-29",
+    "rule": "08-29 prior to 2025",
     "_weekday": "Tue"
   },
   {
@@ -104,7 +104,7 @@
     "end": "2017-09-15T22:00:00.000Z",
     "name": "Sviatok Panny Márie Sedembolestnej",
     "type": "public",
-    "rule": "09-15",
+    "rule": "09-15 prior to 2025",
     "_weekday": "Fri"
   },
   {
@@ -113,7 +113,7 @@
     "end": "2017-11-01T23:00:00.000Z",
     "name": "Sviatok všetkých svätých",
     "type": "public",
-    "rule": "11-01",
+    "rule": "11-01 prior to 2025",
     "_weekday": "Wed"
   },
   {
@@ -122,7 +122,7 @@
     "end": "2017-11-17T23:00:00.000Z",
     "name": "Deň boja za slobodu a demokraciu",
     "type": "public",
-    "rule": "11-17",
+    "rule": "11-17 prior to 2025",
     "_weekday": "Fri"
   },
   {

test/fixtures/SK-2018.json

@@ -13,7 +13,7 @@
     "start": "2018-01-05T23:00:00.000Z",
     "end": "2018-01-06T23:00:00.000Z",
     "name": "Zjavenie Pána",
-    "type": "public",
+    "type": "observance",
     "rule": "01-06",
     "_weekday": "Sat"
   },
@@ -50,7 +50,7 @@
     "end": "2018-05-01T22:00:00.000Z",
     "name": "Sviatok práce",
     "type": "public",
-    "rule": "05-01",
+    "rule": "05-01 prior to 2025",
     "_weekday": "Tue"
   },
   {
@@ -59,7 +59,7 @@
     "end": "2018-05-08T22:00:00.000Z",
     "name": "Deň víťazstva nad fašizmom",
     "type": "public",
-    "rule": "05-08",
+    "rule": "05-08 prior to 2025",
     "_weekday": "Tue"
   },
   {
@@ -77,7 +77,7 @@
     "end": "2018-07-05T22:00:00.000Z",
     "name": "Sviatok svätého Cyrila a Metoda",
     "type": "public",
-    "rule": "07-05",
+    "rule": "07-05 prior to 2025",
     "_weekday": "Thu"
   },
   {
@@ -86,7 +86,7 @@
     "end": "2018-08-29T22:00:00.000Z",
     "name": "Výročie Slovenského národného povstania",
     "type": "public",
-    "rule": "08-29",
+    "rule": "08-29 prior to 2025",
     "_weekday": "Wed"
   },
   {
@@ -104,7 +104,7 @@
     "end": "2018-09-15T22:00:00.000Z",
     "name": "Sviatok Panny Márie Sedembolestnej",
     "type": "public",
-    "rule": "09-15",
+    "rule": "09-15 prior to 2025",
     "_weekday": "Sat"
   },
   {
@@ -113,7 +113,7 @@
     "end": "2018-11-01T23:00:00.000Z",
     "name": "Sviatok všetkých svätých",
     "type": "public",
-    "rule": "11-01",
+    "rule": "11-01 prior to 2025",
     "_weekday": "Thu"
   },
   {
@@ -122,7 +122,7 @@
     "end": "2018-11-17T23:00:00.000Z",
     "name": "Deň boja za slobodu a demokraciu",
     "type": "public",
-    "rule": "11-17",
+    "rule": "11-17 prior to 2025",
     "_weekday": "Sat"
   },
   {