fix(FJ,GY,SG): Vesak, Deepavali

commenthol · Jun 19, 2021 · 9ed3317 · 9ed3317
1 parent d4aff80
commit 9ed3317
Show file tree

Hide file tree

Showing 32 changed files with 500 additions and 34 deletions.
diff --git a/data/countries/FJ.yaml b/data/countries/FJ.yaml
@@ -24,7 +24,8 @@ holidays:
         _name: easter 1
       09-07:
         _name: Constitution Day
-      10-10:
+      10-10 and if Sunday then next Monday:
+        substitute: true
         name:
           en: Fiji Day
       12-25 if Sunday then next Monday:
@@ -33,6 +34,7 @@ holidays:
         _name: 12-26
       12 Rabi al-awwal:
         _name: 12 Rabi al-awwal
+      # Deepavali if Saturday, Sunday then next Monday
       '2014-10-22':
         _name: Deepavali
         name:
@@ -45,22 +47,32 @@ holidays:
         _name: Deepavali
         name:
           en: Diwali
-      '2017-10-18':
+      '2017-10-19':
         _name: Deepavali
         name:
           en: Diwali
-      '2018-11-06':
+      '2018-11-07':
         _name: Deepavali
         name:
           en: Diwali
       '2019-10-27':
         _name: Deepavali
         name:
           en: Diwali
+      '2019-10-28':
+        substitute: true
+        _name: Deepavali
+        name:
+          en: Diwali
       '2020-11-14':
         _name: Deepavali
         name:
           en: Diwali
+      '2020-11-16':
+        substitute: true
+        _name: Deepavali
+        name:
+          en: Diwali
       '2021-11-04':
         _name: Deepavali
         name:
@@ -73,7 +85,12 @@ holidays:
         _name: Deepavali
         name:
           en: Diwali
-      '2024-10-31':
+      '2023-11-13':
+        substitute: true
+        _name: Deepavali
+        name:
+          en: Diwali
+      '2024-11-01':
         _name: Deepavali
         name:
           en: Diwali

diff --git a/data/countries/GY.yaml b/data/countries/GY.yaml
@@ -64,23 +64,79 @@ holidays:
         enable:
           - '2015-09-24'
       # hindu holidays
-      # Holi
-      '2017-03-12':
+      # Holi substitute if Sunday then next Monday
+      '2015-03-05':
         name:
           en: Phagwah
       '2016-03-23':
         name:
           en: Phagwah
-      '2015-03-05':
+      '2017-03-12':
+        name:
+          en: Phagwah
+      '2017-03-13':
+        substitute: true
+        name:
+          en: Phagwah
+      '2018-03-02':
+        name:
+          en: Phagwah
+      '2019-03-21':
+        name:
+          en: Phagwah
+      '2020-03-10':
+        name:
+          en: Phagwah
+      '2021-03-29':
+        name:
+          en: Phagwah
+      '2022-03-18':
+        name:
+          en: Phagwah
+      '2023-03-07':
+        name:
+          en: Phagwah
+      '2024-03-25':
         name:
           en: Phagwah
       # Deepavali Day 5
+      # substitute if Sunday then next Monday
+      '2015-11-11':
+        name:
+          en: Deepavali
       '2017-10-18':
         name:
           en: Deepavali
-      '2015-11-11':
+      '2018-11-07':
+        name:
+          en: Deepavali
+      '2019-10-27':
+        name:
+          en: Deepavali
+      '2019-10-28':
+        substitute: true
+        name:
+          en: Deepavali
+      '2020-11-14':
+        name:
+          en: Deepavali
+      '2021-11-04':
+        name:
+          en: Deepavali
+      '2022-10-24':
+        name:
+          en: Deepavali
+      '2023-11-12':
+        name:
+          en: Deepavali
+      '2023-11-13':
+        substitute: true
+        name:
+          en: Deepavali
+      '2024-10-31':
         name:
           en: Deepavali
+
     # states:
       # BA:
       #   name: Barima-Waini

diff --git a/data/countries/ID.yaml b/data/countries/ID.yaml
@@ -163,3 +163,11 @@ holidays:
         _name: Vesak
       '2020-05-07':
         _name: Vesak
+      '2021-05-26':
+        _name: Vesak
+      '2022-05-16':
+        _name: Vesak
+      '2023-05-06':
+        _name: Vesak
+      '2024-05-23':
+        _name: Vesak
diff --git a/data/countries/SG.yaml b/data/countries/SG.yaml
@@ -57,6 +57,7 @@ holidays:
         name:
           en: Hari Raya Haji
       # @attrib https://en.wikipedia.org/wiki/Vesak
+      # date if sunday then next monday
       '2001-05-07':
         _name: Vesak
       '2002-05-27':
@@ -100,6 +101,53 @@ holidays:
         _name: Vesak
       '2020-05-07':
         _name: Vesak
+      '2021-05-26':
+        _name: Vesak
+      '2022-05-15':
+        _name: Vesak
+      '2022-05-16':
+        substitute: true
+        _name: Vesak
+      '2023-05-05':
+        _name: Vesak
+      '2024-05-23':
+        _name: Vesak
+      # Deepavali
+      # date if sunday then next monday
+      '2000-10-26':
+        _name: Deepavali
+      '2001-11-14':
+        _name: Deepavali
+      '2002-11-03':
+        _name: Deepavali
+      '2002-11-04':
+        substitute: true
+        _name: Deepavali
+      '2003-10-23':
+        _name: Deepavali
+      '2004-11-11':
+        _name: Deepavali
+      '2005-11-01':
+        _name: Deepavali
+      '2006-10-21':
+        _name: Deepavali
+      '2007-11-08':
+        _name: Deepavali
+      '2008-10-27':
+        _name: Deepavali
+      '2009-10-17':
+        _name: Deepavali
+      '2010-11-05':
+        _name: Deepavali
+      '2011-10-26':
+        _name: Deepavali
+      '2012-11-13':
+        _name: Deepavali
+      '2013-11-03':
+        _name: Deepavali
+      '2013-11-04':
+        substitute: true
+        _name: Deepavali
       '2014-10-22':
         _name: Deepavali
       '2015-11-10':
@@ -117,6 +165,27 @@ holidays:
         _name: Deepavali
       '2020-11-14':
         _name: Deepavali
+      '2021-11-04':
+        _name: Deepavali
+      '2022-10-24':
+        _name: Deepavali
+      '2023-11-13':
+        _name: Deepavali
+      '2024-10-31':
+        _name: Deepavali
+      '2025-10-20':
+        _name: Deepavali
+      '2026-11-09':
+        _name: Deepavali
+      '2027-10-28':
+        _name: Deepavali
+      '2028-11-15':
+        _name: Deepavali
+      '2029-11-05':
+        _name: Deepavali
+      '2030-10-25':
+        _name: Deepavali
+
     # states:
     #   '01':
     #     name: Central Singapore

diff --git a/test/fixtures/FJ-2015.json b/test/fixtures/FJ-2015.json
@@ -68,7 +68,7 @@
     "end": "2015-10-10T12:00:00.000Z",
     "name": "Fiji Day",
     "type": "public",
-    "rule": "10-10",
+    "rule": "10-10 and if Sunday then next Monday",
     "_weekday": "Sat"
   },
   {

diff --git a/test/fixtures/FJ-2016.json b/test/fixtures/FJ-2016.json
@@ -59,7 +59,7 @@
     "end": "2016-10-10T12:00:00.000Z",
     "name": "Fiji Day",
     "type": "public",
-    "rule": "10-10",
+    "rule": "10-10 and if Sunday then next Monday",
     "_weekday": "Mon"
   },
   {

diff --git a/test/fixtures/FJ-2017.json b/test/fixtures/FJ-2017.json
@@ -59,17 +59,17 @@
     "end": "2017-10-10T12:00:00.000Z",
     "name": "Fiji Day",
     "type": "public",
-    "rule": "10-10",
+    "rule": "10-10 and if Sunday then next Monday",
     "_weekday": "Tue"
   },
   {
-    "date": "2017-10-18 00:00:00",
-    "start": "2017-10-17T12:00:00.000Z",
-    "end": "2017-10-18T12:00:00.000Z",
+    "date": "2017-10-19 00:00:00",
+    "start": "2017-10-18T12:00:00.000Z",
+    "end": "2017-10-19T12:00:00.000Z",
     "name": "Diwali",
     "type": "public",
-    "rule": "2017-10-18",
-    "_weekday": "Wed"
+    "rule": "2017-10-19",
+    "_weekday": "Thu"
   },
   {
     "date": "2017-11-30 00:00:00 -0600",

diff --git a/test/fixtures/FJ-2018.json b/test/fixtures/FJ-2018.json
@@ -59,17 +59,17 @@
     "end": "2018-10-10T12:00:00.000Z",
     "name": "Fiji Day",
     "type": "public",
-    "rule": "10-10",
+    "rule": "10-10 and if Sunday then next Monday",
     "_weekday": "Wed"
   },
   {
-    "date": "2018-11-06 00:00:00",
-    "start": "2018-11-05T11:00:00.000Z",
-    "end": "2018-11-06T11:00:00.000Z",
+    "date": "2018-11-07 00:00:00",
+    "start": "2018-11-06T11:00:00.000Z",
+    "end": "2018-11-07T11:00:00.000Z",
     "name": "Diwali",
     "type": "public",
-    "rule": "2018-11-06",
-    "_weekday": "Tue"
+    "rule": "2018-11-07",
+    "_weekday": "Wed"
   },
   {
     "date": "2018-11-20 00:00:00 -0600",

diff --git a/test/fixtures/FJ-2019.json b/test/fixtures/FJ-2019.json
@@ -59,7 +59,7 @@
     "end": "2019-10-10T12:00:00.000Z",
     "name": "Fiji Day",
     "type": "public",
-    "rule": "10-10",
+    "rule": "10-10 and if Sunday then next Monday",
     "_weekday": "Thu"
   },
   {
@@ -71,6 +71,15 @@
     "rule": "2019-10-27",
     "_weekday": "Sun"
   },
+  {
+    "date": "2019-10-28 00:00:00",
+    "start": "2019-10-27T12:00:00.000Z",
+    "end": "2019-10-28T12:00:00.000Z",
+    "name": "Diwali",
+    "type": "public",
+    "rule": "2019-10-28",
+    "_weekday": "Mon"
+  },
   {
     "date": "2019-11-09 00:00:00 -0600",
     "start": "2019-11-08T06:00:00.000Z",

diff --git a/test/fixtures/FJ-2020.json b/test/fixtures/FJ-2020.json
@@ -59,7 +59,7 @@
     "end": "2020-10-10T12:00:00.000Z",
     "name": "Fiji Day",
     "type": "public",
-    "rule": "10-10",
+    "rule": "10-10 and if Sunday then next Monday",
     "_weekday": "Sat"
   },
   {
@@ -80,6 +80,15 @@
     "rule": "2020-11-14",
     "_weekday": "Sat"
   },
+  {
+    "date": "2020-11-16 00:00:00",
+    "start": "2020-11-15T12:00:00.000Z",
+    "end": "2020-11-16T12:00:00.000Z",
+    "name": "Diwali",
+    "type": "public",
+    "rule": "2020-11-16",
+    "_weekday": "Mon"
+  },
   {
     "date": "2020-12-25 00:00:00",
     "start": "2020-12-24T11:00:00.000Z",

diff --git a/test/fixtures/FJ-2021.json b/test/fixtures/FJ-2021.json
@@ -59,9 +59,19 @@
     "end": "2021-10-10T12:00:00.000Z",
     "name": "Fiji Day",
     "type": "public",
-    "rule": "10-10",
+    "rule": "10-10 and if Sunday then next Monday",
     "_weekday": "Sun"
   },
+  {
+    "date": "2021-10-11 00:00:00",
+    "start": "2021-10-10T12:00:00.000Z",
+    "end": "2021-10-11T12:00:00.000Z",
+    "name": "Fiji Day (substitute day)",
+    "type": "public",
+    "substitute": true,
+    "rule": "10-10 and if Sunday then next Monday",
+    "_weekday": "Mon"
+  },
   {
     "date": "2021-10-18 00:00:00 -0600",
     "start": "2021-10-17T06:00:00.000Z",

diff --git a/test/fixtures/FJ-2022.json b/test/fixtures/FJ-2022.json
@@ -68,7 +68,7 @@
     "end": "2022-10-10T12:00:00.000Z",
     "name": "Fiji Day",
     "type": "public",
-    "rule": "10-10",
+    "rule": "10-10 and if Sunday then next Monday",
     "_weekday": "Mon"
   },
   {