From ec9779f118b43ba38499fb2fc60e55d737db17c7 Mon Sep 17 00:00:00 2001 From: Knut Ahlers Date: Sat, 24 Sep 2016 14:19:01 +0200 Subject: [PATCH] Update lib in cmd --- cmd/holiday-api/Godeps/Godeps.json | 2 +- .../vendor/github.com/Luzifer/go-holidays/holiday.go | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/holiday-api/Godeps/Godeps.json b/cmd/holiday-api/Godeps/Godeps.json index 3dde0c7..a397b6d 100644 --- a/cmd/holiday-api/Godeps/Godeps.json +++ b/cmd/holiday-api/Godeps/Godeps.json @@ -5,7 +5,7 @@ "Deps": [ { "ImportPath": "github.com/Luzifer/go-holidays", - "Rev": "afcc02270571047f0ef852f49d7abf0096fcf085" + "Rev": "7cac4348d52c138f43b3e182e1d87e88a75b893a" }, { "ImportPath": "github.com/Luzifer/rconfig", diff --git a/cmd/holiday-api/vendor/github.com/Luzifer/go-holidays/holiday.go b/cmd/holiday-api/vendor/github.com/Luzifer/go-holidays/holiday.go index 3a23b36..824b7d9 100644 --- a/cmd/holiday-api/vendor/github.com/Luzifer/go-holidays/holiday.go +++ b/cmd/holiday-api/vendor/github.com/Luzifer/go-holidays/holiday.go @@ -18,11 +18,11 @@ var HolidayDataNotFoundError = errors.New("Holiday data not found for requested // Holiday contains information about an holiday type Holiday struct { // Name contains the english representation of the holidays name - Name string + Name string `json:"name"` // LocalizedName contains a map of localizations of the name, key is a ISO 3166-2 country code without subdivision - LocalizedName map[string]string - // Date contains the date with time.Local zone - Date time.Time + LocalizedName map[string]string `json:"localized_name"` + // Date contains the date in YYYY-MM-DD notation + Date string `json:"date"` } type holidays []Holiday @@ -50,7 +50,7 @@ func GetHolidays(countryCode string, year int) ([]Holiday, error) { result = append(result, Holiday{ Name: h.Name, LocalizedName: h.LocalizedName, - Date: time.Date(year, time.Month(h.Month), h.Day, 0, 0, 0, 0, time.Local), + Date: time.Date(year, time.Month(h.Month), h.Day, 0, 0, 0, 0, time.Local).Format("2006-01-02"), }) } @@ -58,7 +58,7 @@ func GetHolidays(countryCode string, year int) ([]Holiday, error) { result = append(result, Holiday{ Name: h.Name, LocalizedName: h.LocalizedName, - Date: easter.Add(time.Duration(h.Difference) * 24 * time.Hour), + Date: easter.Add(time.Duration(h.Difference) * 24 * time.Hour).Format("2006-01-02"), }) }