Merge branch 'joshtronic/master'

Sazed · Sazed · commit 126c069a621a · 2016-03-14T20:24:25.000+01:00
diff --git a/data/BG.json b/data/BG.json
@@ -8,8 +8,9 @@
     { "name" : "Великден",                                              "rule" : "%EASTER + 1 days"},
     { "name" : "Международен ден на труда",                             "rule" : "May 1st" },
     { "name" : "Гергьовден, Ден на храбростта и Българската армия",     "rule" : "May 6th" },
+    { "name" : "Ден на българската просвета и култура и на славянската писменост",     "rule" : "May 24th" },
     { "name" : "Ден на независимостта на България",                     "rule" : "September 22th" },
     { "name" : "Коледа",                                                "rule" : "December 24th" },
     { "name" : "Коледа",                                                "rule" : "December 25th" },
-    { "name" : "Коледа",                                                "rule" : "December 26th" },
+    { "name" : "Коледа",                                                "rule" : "December 26th" }
 ]
diff --git a/data/CA.json b/data/CA.json
@@ -14,6 +14,9 @@
         "name": "Canada Day",
         "rule": "July 1st" 
     }, { 
+        "name": "Civic Holiday",
+        "rule": "First Monday of August" 
+    }, {
         "name": "Labor Day",
         "rule": "First Monday of September" 
     }, { 
@@ -25,5 +28,8 @@
     }, {
         "name": "Christmas",
         "rule": "December 25th" 
+    }, {
+        "name": "Boxing Day",
+        "rule": "December 26th" 
     }
 ]
diff --git a/data/CZ.json b/data/CZ.json
@@ -10,5 +10,6 @@
 	{ "name" : "Štědrý den",                                      "rule" : "December 24th"                         },
 	{ "name" : "1. svátek vánoční",                               "rule" : "December 25th"                         },
 	{ "name" : "2. svátek vánoční",                               "rule" : "December 26th"                         },
+	{ "name" : "Velký pátek",                                     "rule" : "%EASTER -2 days"                       },
 	{ "name" : "Velikonoční pondělí",                             "rule" : "%EASTER +1 days"                       }
 ]
diff --git a/data/NL.json b/data/NL.json
@@ -0,0 +1,15 @@
+[
+{ "name" : "Nieuwjaarsdag",                     "rule" : "January 1st"                    },
+{ "name" : "Eerste Paasdag",                    "rule" : "%EASTER"                        },
+{ "name" : "Tweede Paasdag",                    "rule" : "%EASTER +1 day"                 },
+{ "name" : "Goede Vrijdag",                     "rule" : "%EASTER -2 days"                },
+{ "name" : "Koningsdag",                        "rule" : "April 27th"                     },
+{ "name" : "Dodenherdenking",                   "rule" : "May 4th"                        },
+{ "name" : "Bevrijdingsdag",                    "rule" : "May 5th"                        },
+{ "name" : "Hemelvaartsdag",                    "rule" : "%EASTER +39 days"               },
+{ "name" : "Eerste Pinksterdag",                "rule" : "%EASTER +50 days"               },
+{ "name" : "Tweede Pinksterdag",                "rule" : "%EASTER +52 days"               },
+{ "name" : "Sinterklaas",                       "rule" : "December 5th"                   },
+{ "name" : "Eerste Kerstdag",                   "rule" : "December 25th"                  },
+{ "name" : "Tweede Kerstdag",                   "rule" : "December 26th"                  }
+]
diff --git a/views/home.php b/views/home.php
@@ -22,7 +22,7 @@
 
                 <div class="well">
                     <h2>Usage example</h2>
-                    <p>To retrieve a list of holidays, simply make a GET request to <a href="/v1/holidays?country=ES&amp;year=2016" target="_blank">/v1/holidays</a></p>
+                    <p>To retrieve a list of holidays, simply make a GET request to <a href="/v1/holidays?country=US&year=<?= date('Y'); ?>&month=<?= date('m'); ?>" target="_blank">/v1/holidays</a></p>
                 </div>
 
                 <div class="well">
@@ -31,7 +31,7 @@
                     <h4>Required</h4>
                     <div class="row">
                         <div class="col-xs-3"><code>country</code></div>
-                        <div class="col-xs-9"><a href="http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2" target="_blank">ISO 3166-1 alpha-2</a> format (BE, BR, CA, CZ, DE, FR, GB, GT, NO, PL, SK, SI or US)</div>
+                        <div class="col-xs-9"><a href="http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2" target="_blank">ISO 3166-1 alpha-2</a> format (BE, BG, BR, CA, CZ, DE, ES, FR, GB, GT, NL, NO, PL, SI, SK or US)</div>
                     </div>
                     <div class="row">
                         <div class="col-xs-3"><code>year</code></div>

Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,6 @@`
`10`	`10`	`{ "name" : "Štědrý den", "rule" : "December 24th" },`
`11`	`11`	`{ "name" : "1. svátek vánoční", "rule" : "December 25th" },`
`12`	`12`	`{ "name" : "2. svátek vánoční", "rule" : "December 26th" },`
	`13`	`+ { "name" : "Velký pátek", "rule" : "%EASTER -2 days" },`
`13`	`14`	`{ "name" : "Velikonoční pondělí", "rule" : "%EASTER +1 days" }`
`14`	`15`	`]`