From 7d556cf092350786d88898506d97721fd705844a Mon Sep 17 00:00:00 2001 From: nnsnodnb Date: Tue, 17 Oct 2023 19:36:55 +0900 Subject: [PATCH 1/4] Update submodule tag version to v0.12.2 --- holiday_jp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/holiday_jp b/holiday_jp index cca1d08..231865e 160000 --- a/holiday_jp +++ b/holiday_jp @@ -1 +1 @@ -Subproject commit cca1d0803ebf4b30153175ae6805676f05a13f54 +Subproject commit 231865e2ba56c501ce76d156a63ad797d632811d From 54d6e47d3b4e2e5099944b35f9d69c9c24df6146 Mon Sep 17 00:00:00 2001 From: nnsnodnb Date: Tue, 17 Oct 2023 20:20:08 +0900 Subject: [PATCH 2/4] Fix generate.rb --- scripts/generate.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/generate.rb b/scripts/generate.rb index 7aa29f0..3c14fac 100755 --- a/scripts/generate.rb +++ b/scripts/generate.rb @@ -4,7 +4,11 @@ require 'yaml' -holidays_detailed = YAML.load_file('./holiday_jp/holidays_detailed.yml') +if YAML.respond_to?(:unsafe_load_file) + holidays_detailed = YAML.unsafe_load_file('./holiday_jp/holidays_detailed.yml') +else + holidays_detailed = YAML.load_file('./holiday_jp/holidays_detailed.yml') +end holidays = holidays_detailed.values.sort_by {|v| v['date'] } output_path = File.join('./Sources/HolidayJp/Holidays.generated.swift') From 96d09a332c8a0b5d63e3c911d38389825f8d5af0 Mon Sep 17 00:00:00 2001 From: nnsnodnb Date: Tue, 17 Oct 2023 20:21:41 +0900 Subject: [PATCH 3/4] Update holidays definitions by used generate.rb --- Sources/HolidayJp/Holidays.generated.swift | 283 +++++++++++---------- 1 file changed, 144 insertions(+), 139 deletions(-) diff --git a/Sources/HolidayJp/Holidays.generated.swift b/Sources/HolidayJp/Holidays.generated.swift index 3a47cc1..67694da 100644 --- a/Sources/HolidayJp/Holidays.generated.swift +++ b/Sources/HolidayJp/Holidays.generated.swift @@ -51,12 +51,12 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["1973-02-11"] = Holiday(ymd: "1973-02-11", week: "日", weekEn: "Sunday", name: "建国記念の日", nameEn: "National Foundation Day") holidays["1973-03-21"] = Holiday(ymd: "1973-03-21", week: "水", weekEn: "Wednesday", name: "春分の日", nameEn: "Vernal Equinox Day") holidays["1973-04-29"] = Holiday(ymd: "1973-04-29", week: "日", weekEn: "Sunday", name: "天皇誕生日", nameEn: "Emperor's Birthday") - holidays["1973-04-30"] = Holiday(ymd: "1973-04-30", week: "月", weekEn: "Monday", name: "天皇誕生日 振替休日", nameEn: "Holiday in lieu") + holidays["1973-04-30"] = Holiday(ymd: "1973-04-30", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1973-05-03"] = Holiday(ymd: "1973-05-03", week: "木", weekEn: "Thursday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["1973-05-05"] = Holiday(ymd: "1973-05-05", week: "土", weekEn: "Saturday", name: "こどもの日", nameEn: "Children's Day") holidays["1973-09-15"] = Holiday(ymd: "1973-09-15", week: "土", weekEn: "Saturday", name: "敬老の日", nameEn: "Respect for the Aged Day") holidays["1973-09-23"] = Holiday(ymd: "1973-09-23", week: "日", weekEn: "Sunday", name: "秋分の日", nameEn: "Autumnal Equinox Day") - holidays["1973-09-24"] = Holiday(ymd: "1973-09-24", week: "月", weekEn: "Monday", name: "秋分の日 振替休日", nameEn: "Holiday in lieu") + holidays["1973-09-24"] = Holiday(ymd: "1973-09-24", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1973-10-10"] = Holiday(ymd: "1973-10-10", week: "水", weekEn: "Wednesday", name: "体育の日", nameEn: "Health and Sports Day") holidays["1973-11-03"] = Holiday(ymd: "1973-11-03", week: "土", weekEn: "Saturday", name: "文化の日", nameEn: "National Culture Day") holidays["1973-11-23"] = Holiday(ymd: "1973-11-23", week: "金", weekEn: "Friday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") @@ -67,13 +67,13 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["1974-04-29"] = Holiday(ymd: "1974-04-29", week: "月", weekEn: "Monday", name: "天皇誕生日", nameEn: "Emperor's Birthday") holidays["1974-05-03"] = Holiday(ymd: "1974-05-03", week: "金", weekEn: "Friday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["1974-05-05"] = Holiday(ymd: "1974-05-05", week: "日", weekEn: "Sunday", name: "こどもの日", nameEn: "Children's Day") - holidays["1974-05-06"] = Holiday(ymd: "1974-05-06", week: "月", weekEn: "Monday", name: "こどもの日 振替休日", nameEn: "Holiday in lieu") + holidays["1974-05-06"] = Holiday(ymd: "1974-05-06", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1974-09-15"] = Holiday(ymd: "1974-09-15", week: "日", weekEn: "Sunday", name: "敬老の日", nameEn: "Respect for the Aged Day") - holidays["1974-09-16"] = Holiday(ymd: "1974-09-16", week: "月", weekEn: "Monday", name: "敬老の日 振替休日", nameEn: "Holiday in lieu") + holidays["1974-09-16"] = Holiday(ymd: "1974-09-16", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1974-09-23"] = Holiday(ymd: "1974-09-23", week: "月", weekEn: "Monday", name: "秋分の日", nameEn: "Autumnal Equinox Day") holidays["1974-10-10"] = Holiday(ymd: "1974-10-10", week: "木", weekEn: "Thursday", name: "体育の日", nameEn: "Health and Sports Day") holidays["1974-11-03"] = Holiday(ymd: "1974-11-03", week: "日", weekEn: "Sunday", name: "文化の日", nameEn: "National Culture Day") - holidays["1974-11-04"] = Holiday(ymd: "1974-11-04", week: "月", weekEn: "Monday", name: "文化の日 振替休日", nameEn: "Holiday in lieu") + holidays["1974-11-04"] = Holiday(ymd: "1974-11-04", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1974-11-23"] = Holiday(ymd: "1974-11-23", week: "土", weekEn: "Saturday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") holidays["1975-01-01"] = Holiday(ymd: "1975-01-01", week: "水", weekEn: "Wednesday", name: "元日", nameEn: "New Year's Day") holidays["1975-01-15"] = Holiday(ymd: "1975-01-15", week: "水", weekEn: "Wednesday", name: "成人の日", nameEn: "Coming of Age Day") @@ -87,7 +87,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["1975-10-10"] = Holiday(ymd: "1975-10-10", week: "金", weekEn: "Friday", name: "体育の日", nameEn: "Health and Sports Day") holidays["1975-11-03"] = Holiday(ymd: "1975-11-03", week: "月", weekEn: "Monday", name: "文化の日", nameEn: "National Culture Day") holidays["1975-11-23"] = Holiday(ymd: "1975-11-23", week: "日", weekEn: "Sunday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") - holidays["1975-11-24"] = Holiday(ymd: "1975-11-24", week: "月", weekEn: "Monday", name: "勤労感謝の日 振替休日", nameEn: "Holiday in lieu") + holidays["1975-11-24"] = Holiday(ymd: "1975-11-24", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1976-01-01"] = Holiday(ymd: "1976-01-01", week: "木", weekEn: "Thursday", name: "元日", nameEn: "New Year's Day") holidays["1976-01-15"] = Holiday(ymd: "1976-01-15", week: "木", weekEn: "Thursday", name: "成人の日", nameEn: "Coming of Age Day") holidays["1976-02-11"] = Holiday(ymd: "1976-02-11", week: "水", weekEn: "Wednesday", name: "建国記念の日", nameEn: "National Foundation Day") @@ -98,7 +98,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["1976-09-15"] = Holiday(ymd: "1976-09-15", week: "水", weekEn: "Wednesday", name: "敬老の日", nameEn: "Respect for the Aged Day") holidays["1976-09-23"] = Holiday(ymd: "1976-09-23", week: "木", weekEn: "Thursday", name: "秋分の日", nameEn: "Autumnal Equinox Day") holidays["1976-10-10"] = Holiday(ymd: "1976-10-10", week: "日", weekEn: "Sunday", name: "体育の日", nameEn: "Health and Sports Day") - holidays["1976-10-11"] = Holiday(ymd: "1976-10-11", week: "月", weekEn: "Monday", name: "体育の日 振替休日", nameEn: "Holiday in lieu") + holidays["1976-10-11"] = Holiday(ymd: "1976-10-11", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1976-11-03"] = Holiday(ymd: "1976-11-03", week: "水", weekEn: "Wednesday", name: "文化の日", nameEn: "National Culture Day") holidays["1976-11-23"] = Holiday(ymd: "1976-11-23", week: "火", weekEn: "Tuesday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") holidays["1977-01-01"] = Holiday(ymd: "1977-01-01", week: "土", weekEn: "Saturday", name: "元日", nameEn: "New Year's Day") @@ -114,9 +114,9 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["1977-11-03"] = Holiday(ymd: "1977-11-03", week: "木", weekEn: "Thursday", name: "文化の日", nameEn: "National Culture Day") holidays["1977-11-23"] = Holiday(ymd: "1977-11-23", week: "水", weekEn: "Wednesday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") holidays["1978-01-01"] = Holiday(ymd: "1978-01-01", week: "日", weekEn: "Sunday", name: "元日", nameEn: "New Year's Day") - holidays["1978-01-02"] = Holiday(ymd: "1978-01-02", week: "月", weekEn: "Monday", name: "元日 振替休日", nameEn: "Holiday in lieu") + holidays["1978-01-02"] = Holiday(ymd: "1978-01-02", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1978-01-15"] = Holiday(ymd: "1978-01-15", week: "日", weekEn: "Sunday", name: "成人の日", nameEn: "Coming of Age Day") - holidays["1978-01-16"] = Holiday(ymd: "1978-01-16", week: "月", weekEn: "Monday", name: "成人の日 振替休日", nameEn: "Holiday in lieu") + holidays["1978-01-16"] = Holiday(ymd: "1978-01-16", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1978-02-11"] = Holiday(ymd: "1978-02-11", week: "土", weekEn: "Saturday", name: "建国記念の日", nameEn: "National Foundation Day") holidays["1978-03-21"] = Holiday(ymd: "1978-03-21", week: "火", weekEn: "Tuesday", name: "春分の日", nameEn: "Vernal Equinox Day") holidays["1978-04-29"] = Holiday(ymd: "1978-04-29", week: "土", weekEn: "Saturday", name: "天皇誕生日", nameEn: "Emperor's Birthday") @@ -130,10 +130,10 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["1979-01-01"] = Holiday(ymd: "1979-01-01", week: "月", weekEn: "Monday", name: "元日", nameEn: "New Year's Day") holidays["1979-01-15"] = Holiday(ymd: "1979-01-15", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["1979-02-11"] = Holiday(ymd: "1979-02-11", week: "日", weekEn: "Sunday", name: "建国記念の日", nameEn: "National Foundation Day") - holidays["1979-02-12"] = Holiday(ymd: "1979-02-12", week: "月", weekEn: "Monday", name: "建国記念の日 振替休日", nameEn: "Holiday in lieu") + holidays["1979-02-12"] = Holiday(ymd: "1979-02-12", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1979-03-21"] = Holiday(ymd: "1979-03-21", week: "水", weekEn: "Wednesday", name: "春分の日", nameEn: "Vernal Equinox Day") holidays["1979-04-29"] = Holiday(ymd: "1979-04-29", week: "日", weekEn: "Sunday", name: "天皇誕生日", nameEn: "Emperor's Birthday") - holidays["1979-04-30"] = Holiday(ymd: "1979-04-30", week: "月", weekEn: "Monday", name: "天皇誕生日 振替休日", nameEn: "Holiday in lieu") + holidays["1979-04-30"] = Holiday(ymd: "1979-04-30", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1979-05-03"] = Holiday(ymd: "1979-05-03", week: "木", weekEn: "Thursday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["1979-05-05"] = Holiday(ymd: "1979-05-05", week: "土", weekEn: "Saturday", name: "こどもの日", nameEn: "Children's Day") holidays["1979-09-15"] = Holiday(ymd: "1979-09-15", week: "土", weekEn: "Saturday", name: "敬老の日", nameEn: "Respect for the Aged Day") @@ -153,14 +153,14 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["1980-10-10"] = Holiday(ymd: "1980-10-10", week: "金", weekEn: "Friday", name: "体育の日", nameEn: "Health and Sports Day") holidays["1980-11-03"] = Holiday(ymd: "1980-11-03", week: "月", weekEn: "Monday", name: "文化の日", nameEn: "National Culture Day") holidays["1980-11-23"] = Holiday(ymd: "1980-11-23", week: "日", weekEn: "Sunday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") - holidays["1980-11-24"] = Holiday(ymd: "1980-11-24", week: "月", weekEn: "Monday", name: "勤労感謝の日 振替休日", nameEn: "Holiday in lieu") + holidays["1980-11-24"] = Holiday(ymd: "1980-11-24", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1981-01-01"] = Holiday(ymd: "1981-01-01", week: "木", weekEn: "Thursday", name: "元日", nameEn: "New Year's Day") holidays["1981-01-15"] = Holiday(ymd: "1981-01-15", week: "木", weekEn: "Thursday", name: "成人の日", nameEn: "Coming of Age Day") holidays["1981-02-11"] = Holiday(ymd: "1981-02-11", week: "水", weekEn: "Wednesday", name: "建国記念の日", nameEn: "National Foundation Day") holidays["1981-03-21"] = Holiday(ymd: "1981-03-21", week: "土", weekEn: "Saturday", name: "春分の日", nameEn: "Vernal Equinox Day") holidays["1981-04-29"] = Holiday(ymd: "1981-04-29", week: "水", weekEn: "Wednesday", name: "天皇誕生日", nameEn: "Emperor's Birthday") holidays["1981-05-03"] = Holiday(ymd: "1981-05-03", week: "日", weekEn: "Sunday", name: "憲法記念日", nameEn: "Constitution Memorial Day") - holidays["1981-05-04"] = Holiday(ymd: "1981-05-04", week: "月", weekEn: "Monday", name: "憲法記念日 振替休日", nameEn: "Holiday in lieu") + holidays["1981-05-04"] = Holiday(ymd: "1981-05-04", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1981-05-05"] = Holiday(ymd: "1981-05-05", week: "火", weekEn: "Tuesday", name: "こどもの日", nameEn: "Children's Day") holidays["1981-09-15"] = Holiday(ymd: "1981-09-15", week: "火", weekEn: "Tuesday", name: "敬老の日", nameEn: "Respect for the Aged Day") holidays["1981-09-23"] = Holiday(ymd: "1981-09-23", week: "水", weekEn: "Wednesday", name: "秋分の日", nameEn: "Autumnal Equinox Day") @@ -171,14 +171,14 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["1982-01-15"] = Holiday(ymd: "1982-01-15", week: "金", weekEn: "Friday", name: "成人の日", nameEn: "Coming of Age Day") holidays["1982-02-11"] = Holiday(ymd: "1982-02-11", week: "木", weekEn: "Thursday", name: "建国記念の日", nameEn: "National Foundation Day") holidays["1982-03-21"] = Holiday(ymd: "1982-03-21", week: "日", weekEn: "Sunday", name: "春分の日", nameEn: "Vernal Equinox Day") - holidays["1982-03-22"] = Holiday(ymd: "1982-03-22", week: "月", weekEn: "Monday", name: "春分の日 振替休日", nameEn: "Holiday in lieu") + holidays["1982-03-22"] = Holiday(ymd: "1982-03-22", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1982-04-29"] = Holiday(ymd: "1982-04-29", week: "木", weekEn: "Thursday", name: "天皇誕生日", nameEn: "Emperor's Birthday") holidays["1982-05-03"] = Holiday(ymd: "1982-05-03", week: "月", weekEn: "Monday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["1982-05-05"] = Holiday(ymd: "1982-05-05", week: "水", weekEn: "Wednesday", name: "こどもの日", nameEn: "Children's Day") holidays["1982-09-15"] = Holiday(ymd: "1982-09-15", week: "水", weekEn: "Wednesday", name: "敬老の日", nameEn: "Respect for the Aged Day") holidays["1982-09-23"] = Holiday(ymd: "1982-09-23", week: "木", weekEn: "Thursday", name: "秋分の日", nameEn: "Autumnal Equinox Day") holidays["1982-10-10"] = Holiday(ymd: "1982-10-10", week: "日", weekEn: "Sunday", name: "体育の日", nameEn: "Health and Sports Day") - holidays["1982-10-11"] = Holiday(ymd: "1982-10-11", week: "月", weekEn: "Monday", name: "体育の日 振替休日", nameEn: "Holiday in lieu") + holidays["1982-10-11"] = Holiday(ymd: "1982-10-11", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1982-11-03"] = Holiday(ymd: "1982-11-03", week: "水", weekEn: "Wednesday", name: "文化の日", nameEn: "National Culture Day") holidays["1982-11-23"] = Holiday(ymd: "1982-11-23", week: "火", weekEn: "Tuesday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") holidays["1983-01-01"] = Holiday(ymd: "1983-01-01", week: "土", weekEn: "Saturday", name: "元日", nameEn: "New Year's Day") @@ -194,18 +194,18 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["1983-11-03"] = Holiday(ymd: "1983-11-03", week: "木", weekEn: "Thursday", name: "文化の日", nameEn: "National Culture Day") holidays["1983-11-23"] = Holiday(ymd: "1983-11-23", week: "水", weekEn: "Wednesday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") holidays["1984-01-01"] = Holiday(ymd: "1984-01-01", week: "日", weekEn: "Sunday", name: "元日", nameEn: "New Year's Day") - holidays["1984-01-02"] = Holiday(ymd: "1984-01-02", week: "月", weekEn: "Monday", name: "元日 振替休日", nameEn: "Holiday in lieu") + holidays["1984-01-02"] = Holiday(ymd: "1984-01-02", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1984-01-15"] = Holiday(ymd: "1984-01-15", week: "日", weekEn: "Sunday", name: "成人の日", nameEn: "Coming of Age Day") - holidays["1984-01-16"] = Holiday(ymd: "1984-01-16", week: "月", weekEn: "Monday", name: "成人の日 振替休日", nameEn: "Holiday in lieu") + holidays["1984-01-16"] = Holiday(ymd: "1984-01-16", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1984-02-11"] = Holiday(ymd: "1984-02-11", week: "土", weekEn: "Saturday", name: "建国記念の日", nameEn: "National Foundation Day") holidays["1984-03-20"] = Holiday(ymd: "1984-03-20", week: "火", weekEn: "Tuesday", name: "春分の日", nameEn: "Vernal Equinox Day") holidays["1984-04-29"] = Holiday(ymd: "1984-04-29", week: "日", weekEn: "Sunday", name: "天皇誕生日", nameEn: "Emperor's Birthday") - holidays["1984-04-30"] = Holiday(ymd: "1984-04-30", week: "月", weekEn: "Monday", name: "天皇誕生日 振替休日", nameEn: "Holiday in lieu") + holidays["1984-04-30"] = Holiday(ymd: "1984-04-30", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1984-05-03"] = Holiday(ymd: "1984-05-03", week: "木", weekEn: "Thursday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["1984-05-05"] = Holiday(ymd: "1984-05-05", week: "土", weekEn: "Saturday", name: "こどもの日", nameEn: "Children's Day") holidays["1984-09-15"] = Holiday(ymd: "1984-09-15", week: "土", weekEn: "Saturday", name: "敬老の日", nameEn: "Respect for the Aged Day") holidays["1984-09-23"] = Holiday(ymd: "1984-09-23", week: "日", weekEn: "Sunday", name: "秋分の日", nameEn: "Autumnal Equinox Day") - holidays["1984-09-24"] = Holiday(ymd: "1984-09-24", week: "月", weekEn: "Monday", name: "秋分の日 振替休日", nameEn: "Holiday in lieu") + holidays["1984-09-24"] = Holiday(ymd: "1984-09-24", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1984-10-10"] = Holiday(ymd: "1984-10-10", week: "水", weekEn: "Wednesday", name: "体育の日", nameEn: "Health and Sports Day") holidays["1984-11-03"] = Holiday(ymd: "1984-11-03", week: "土", weekEn: "Saturday", name: "文化の日", nameEn: "National Culture Day") holidays["1984-11-23"] = Holiday(ymd: "1984-11-23", week: "金", weekEn: "Friday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") @@ -216,13 +216,13 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["1985-04-29"] = Holiday(ymd: "1985-04-29", week: "月", weekEn: "Monday", name: "天皇誕生日", nameEn: "Emperor's Birthday") holidays["1985-05-03"] = Holiday(ymd: "1985-05-03", week: "金", weekEn: "Friday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["1985-05-05"] = Holiday(ymd: "1985-05-05", week: "日", weekEn: "Sunday", name: "こどもの日", nameEn: "Children's Day") - holidays["1985-05-06"] = Holiday(ymd: "1985-05-06", week: "月", weekEn: "Monday", name: "こどもの日 振替休日", nameEn: "Holiday in lieu") + holidays["1985-05-06"] = Holiday(ymd: "1985-05-06", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1985-09-15"] = Holiday(ymd: "1985-09-15", week: "日", weekEn: "Sunday", name: "敬老の日", nameEn: "Respect for the Aged Day") - holidays["1985-09-16"] = Holiday(ymd: "1985-09-16", week: "月", weekEn: "Monday", name: "敬老の日 振替休日", nameEn: "Holiday in lieu") + holidays["1985-09-16"] = Holiday(ymd: "1985-09-16", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1985-09-23"] = Holiday(ymd: "1985-09-23", week: "月", weekEn: "Monday", name: "秋分の日", nameEn: "Autumnal Equinox Day") holidays["1985-10-10"] = Holiday(ymd: "1985-10-10", week: "木", weekEn: "Thursday", name: "体育の日", nameEn: "Health and Sports Day") holidays["1985-11-03"] = Holiday(ymd: "1985-11-03", week: "日", weekEn: "Sunday", name: "文化の日", nameEn: "National Culture Day") - holidays["1985-11-04"] = Holiday(ymd: "1985-11-04", week: "月", weekEn: "Monday", name: "文化の日 振替休日", nameEn: "Holiday in lieu") + holidays["1985-11-04"] = Holiday(ymd: "1985-11-04", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1985-11-23"] = Holiday(ymd: "1985-11-23", week: "土", weekEn: "Saturday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") holidays["1986-01-01"] = Holiday(ymd: "1986-01-01", week: "水", weekEn: "Wednesday", name: "元日", nameEn: "New Year's Day") holidays["1986-01-15"] = Holiday(ymd: "1986-01-15", week: "水", weekEn: "Wednesday", name: "成人の日", nameEn: "Coming of Age Day") @@ -236,14 +236,14 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["1986-10-10"] = Holiday(ymd: "1986-10-10", week: "金", weekEn: "Friday", name: "体育の日", nameEn: "Health and Sports Day") holidays["1986-11-03"] = Holiday(ymd: "1986-11-03", week: "月", weekEn: "Monday", name: "文化の日", nameEn: "National Culture Day") holidays["1986-11-23"] = Holiday(ymd: "1986-11-23", week: "日", weekEn: "Sunday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") - holidays["1986-11-24"] = Holiday(ymd: "1986-11-24", week: "月", weekEn: "Monday", name: "勤労感謝の日 振替休日", nameEn: "Holiday in lieu") + holidays["1986-11-24"] = Holiday(ymd: "1986-11-24", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1987-01-01"] = Holiday(ymd: "1987-01-01", week: "木", weekEn: "Thursday", name: "元日", nameEn: "New Year's Day") holidays["1987-01-15"] = Holiday(ymd: "1987-01-15", week: "木", weekEn: "Thursday", name: "成人の日", nameEn: "Coming of Age Day") holidays["1987-02-11"] = Holiday(ymd: "1987-02-11", week: "水", weekEn: "Wednesday", name: "建国記念の日", nameEn: "National Foundation Day") holidays["1987-03-21"] = Holiday(ymd: "1987-03-21", week: "土", weekEn: "Saturday", name: "春分の日", nameEn: "Vernal Equinox Day") holidays["1987-04-29"] = Holiday(ymd: "1987-04-29", week: "水", weekEn: "Wednesday", name: "天皇誕生日", nameEn: "Emperor's Birthday") holidays["1987-05-03"] = Holiday(ymd: "1987-05-03", week: "日", weekEn: "Sunday", name: "憲法記念日", nameEn: "Constitution Memorial Day") - holidays["1987-05-04"] = Holiday(ymd: "1987-05-04", week: "月", weekEn: "Monday", name: "憲法記念日 振替休日", nameEn: "Holiday in lieu") + holidays["1987-05-04"] = Holiday(ymd: "1987-05-04", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1987-05-05"] = Holiday(ymd: "1987-05-05", week: "火", weekEn: "Tuesday", name: "こどもの日", nameEn: "Children's Day") holidays["1987-09-15"] = Holiday(ymd: "1987-09-15", week: "火", weekEn: "Tuesday", name: "敬老の日", nameEn: "Respect for the Aged Day") holidays["1987-09-23"] = Holiday(ymd: "1987-09-23", week: "水", weekEn: "Wednesday", name: "秋分の日", nameEn: "Autumnal Equinox Day") @@ -254,7 +254,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["1988-01-15"] = Holiday(ymd: "1988-01-15", week: "金", weekEn: "Friday", name: "成人の日", nameEn: "Coming of Age Day") holidays["1988-02-11"] = Holiday(ymd: "1988-02-11", week: "木", weekEn: "Thursday", name: "建国記念の日", nameEn: "National Foundation Day") holidays["1988-03-20"] = Holiday(ymd: "1988-03-20", week: "日", weekEn: "Sunday", name: "春分の日", nameEn: "Vernal Equinox Day") - holidays["1988-03-21"] = Holiday(ymd: "1988-03-21", week: "月", weekEn: "Monday", name: "春分の日 振替休日", nameEn: "Holiday in lieu") + holidays["1988-03-21"] = Holiday(ymd: "1988-03-21", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1988-04-29"] = Holiday(ymd: "1988-04-29", week: "金", weekEn: "Friday", name: "天皇誕生日", nameEn: "Emperor's Birthday") holidays["1988-05-03"] = Holiday(ymd: "1988-05-03", week: "火", weekEn: "Tuesday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["1988-05-04"] = Holiday(ymd: "1988-05-04", week: "水", weekEn: "Wednesday", name: "国民の休日", nameEn: "Citizen's Holiday") @@ -265,11 +265,11 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["1988-11-03"] = Holiday(ymd: "1988-11-03", week: "木", weekEn: "Thursday", name: "文化の日", nameEn: "National Culture Day") holidays["1988-11-23"] = Holiday(ymd: "1988-11-23", week: "水", weekEn: "Wednesday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") holidays["1989-01-01"] = Holiday(ymd: "1989-01-01", week: "日", weekEn: "Sunday", name: "元日", nameEn: "New Year's Day") - holidays["1989-01-02"] = Holiday(ymd: "1989-01-02", week: "月", weekEn: "Monday", name: "元日 振替休日", nameEn: "Holiday in lieu") + holidays["1989-01-02"] = Holiday(ymd: "1989-01-02", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1989-01-15"] = Holiday(ymd: "1989-01-15", week: "日", weekEn: "Sunday", name: "成人の日", nameEn: "Coming of Age Day") - holidays["1989-01-16"] = Holiday(ymd: "1989-01-16", week: "月", weekEn: "Monday", name: "成人の日 振替休日", nameEn: "Holiday in lieu") + holidays["1989-01-16"] = Holiday(ymd: "1989-01-16", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1989-02-11"] = Holiday(ymd: "1989-02-11", week: "土", weekEn: "Saturday", name: "建国記念の日", nameEn: "National Foundation Day") - holidays["1989-02-24"] = Holiday(ymd: "1989-02-24", week: "金", weekEn: "Friday", name: "昭和天皇の大喪の礼", nameEn: "The Funeral Ceremony of Emperor Showa.") + holidays["1989-02-24"] = Holiday(ymd: "1989-02-24", week: "金", weekEn: "Friday", name: "大喪の礼", nameEn: "The Funeral Ceremony of Emperor Showa.") holidays["1989-03-21"] = Holiday(ymd: "1989-03-21", week: "火", weekEn: "Tuesday", name: "春分の日", nameEn: "Vernal Equinox Day") holidays["1989-04-29"] = Holiday(ymd: "1989-04-29", week: "土", weekEn: "Saturday", name: "みどりの日", nameEn: "Greenery Day") holidays["1989-05-03"] = Holiday(ymd: "1989-05-03", week: "水", weekEn: "Wednesday", name: "憲法記念日", nameEn: "Constitution Memorial Day") @@ -284,22 +284,22 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["1990-01-01"] = Holiday(ymd: "1990-01-01", week: "月", weekEn: "Monday", name: "元日", nameEn: "New Year's Day") holidays["1990-01-15"] = Holiday(ymd: "1990-01-15", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["1990-02-11"] = Holiday(ymd: "1990-02-11", week: "日", weekEn: "Sunday", name: "建国記念の日", nameEn: "National Foundation Day") - holidays["1990-02-12"] = Holiday(ymd: "1990-02-12", week: "月", weekEn: "Monday", name: "建国記念の日 振替休日", nameEn: "Holiday in lieu") + holidays["1990-02-12"] = Holiday(ymd: "1990-02-12", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1990-03-21"] = Holiday(ymd: "1990-03-21", week: "水", weekEn: "Wednesday", name: "春分の日", nameEn: "Vernal Equinox Day") holidays["1990-04-29"] = Holiday(ymd: "1990-04-29", week: "日", weekEn: "Sunday", name: "みどりの日", nameEn: "Greenery Day") - holidays["1990-04-30"] = Holiday(ymd: "1990-04-30", week: "月", weekEn: "Monday", name: "みどりの日 振替休日", nameEn: "Holiday in lieu") + holidays["1990-04-30"] = Holiday(ymd: "1990-04-30", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1990-05-03"] = Holiday(ymd: "1990-05-03", week: "木", weekEn: "Thursday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["1990-05-04"] = Holiday(ymd: "1990-05-04", week: "金", weekEn: "Friday", name: "国民の休日", nameEn: "Citizen's Holiday") holidays["1990-05-05"] = Holiday(ymd: "1990-05-05", week: "土", weekEn: "Saturday", name: "こどもの日", nameEn: "Children's Day") holidays["1990-09-15"] = Holiday(ymd: "1990-09-15", week: "土", weekEn: "Saturday", name: "敬老の日", nameEn: "Respect for the Aged Day") holidays["1990-09-23"] = Holiday(ymd: "1990-09-23", week: "日", weekEn: "Sunday", name: "秋分の日", nameEn: "Autumnal Equinox Day") - holidays["1990-09-24"] = Holiday(ymd: "1990-09-24", week: "月", weekEn: "Monday", name: "秋分の日 振替休日", nameEn: "Holiday in lieu") + holidays["1990-09-24"] = Holiday(ymd: "1990-09-24", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1990-10-10"] = Holiday(ymd: "1990-10-10", week: "水", weekEn: "Wednesday", name: "体育の日", nameEn: "Health and Sports Day") holidays["1990-11-03"] = Holiday(ymd: "1990-11-03", week: "土", weekEn: "Saturday", name: "文化の日", nameEn: "National Culture Day") - holidays["1990-11-12"] = Holiday(ymd: "1990-11-12", week: "月", weekEn: "Monday", name: "即位礼正殿の儀", nameEn: "The Ceremony of the Enthronement of His Majesty th Emperor (at the Seiden)") + holidays["1990-11-12"] = Holiday(ymd: "1990-11-12", week: "月", weekEn: "Monday", name: "即位礼正殿の儀", nameEn: "The Ceremony of the Enthronement of His Majesty the Emperor (at the Seiden)") holidays["1990-11-23"] = Holiday(ymd: "1990-11-23", week: "金", weekEn: "Friday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") holidays["1990-12-23"] = Holiday(ymd: "1990-12-23", week: "日", weekEn: "Sunday", name: "天皇誕生日", nameEn: "Emperor's Birthday") - holidays["1990-12-24"] = Holiday(ymd: "1990-12-24", week: "月", weekEn: "Monday", name: "天皇誕生日 振替休日", nameEn: "Holiday in lieu") + holidays["1990-12-24"] = Holiday(ymd: "1990-12-24", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1991-01-01"] = Holiday(ymd: "1991-01-01", week: "火", weekEn: "Tuesday", name: "元日", nameEn: "New Year's Day") holidays["1991-01-15"] = Holiday(ymd: "1991-01-15", week: "火", weekEn: "Tuesday", name: "成人の日", nameEn: "Coming of Age Day") holidays["1991-02-11"] = Holiday(ymd: "1991-02-11", week: "月", weekEn: "Monday", name: "建国記念の日", nameEn: "National Foundation Day") @@ -308,13 +308,13 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["1991-05-03"] = Holiday(ymd: "1991-05-03", week: "金", weekEn: "Friday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["1991-05-04"] = Holiday(ymd: "1991-05-04", week: "土", weekEn: "Saturday", name: "国民の休日", nameEn: "Citizen's Holiday") holidays["1991-05-05"] = Holiday(ymd: "1991-05-05", week: "日", weekEn: "Sunday", name: "こどもの日", nameEn: "Children's Day") - holidays["1991-05-06"] = Holiday(ymd: "1991-05-06", week: "月", weekEn: "Monday", name: "こどもの日 振替休日", nameEn: "Holiday in lieu") + holidays["1991-05-06"] = Holiday(ymd: "1991-05-06", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1991-09-15"] = Holiday(ymd: "1991-09-15", week: "日", weekEn: "Sunday", name: "敬老の日", nameEn: "Respect for the Aged Day") - holidays["1991-09-16"] = Holiday(ymd: "1991-09-16", week: "月", weekEn: "Monday", name: "敬老の日 振替休日", nameEn: "Holiday in lieu") + holidays["1991-09-16"] = Holiday(ymd: "1991-09-16", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1991-09-23"] = Holiday(ymd: "1991-09-23", week: "月", weekEn: "Monday", name: "秋分の日", nameEn: "Autumnal Equinox Day") holidays["1991-10-10"] = Holiday(ymd: "1991-10-10", week: "木", weekEn: "Thursday", name: "体育の日", nameEn: "Health and Sports Day") holidays["1991-11-03"] = Holiday(ymd: "1991-11-03", week: "日", weekEn: "Sunday", name: "文化の日", nameEn: "National Culture Day") - holidays["1991-11-04"] = Holiday(ymd: "1991-11-04", week: "月", weekEn: "Monday", name: "文化の日 振替休日", nameEn: "Holiday in lieu") + holidays["1991-11-04"] = Holiday(ymd: "1991-11-04", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1991-11-23"] = Holiday(ymd: "1991-11-23", week: "土", weekEn: "Saturday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") holidays["1991-12-23"] = Holiday(ymd: "1991-12-23", week: "月", weekEn: "Monday", name: "天皇誕生日", nameEn: "Emperor's Birthday") holidays["1992-01-01"] = Holiday(ymd: "1992-01-01", week: "水", weekEn: "Wednesday", name: "元日", nameEn: "New Year's Day") @@ -323,7 +323,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["1992-03-20"] = Holiday(ymd: "1992-03-20", week: "金", weekEn: "Friday", name: "春分の日", nameEn: "Vernal Equinox Day") holidays["1992-04-29"] = Holiday(ymd: "1992-04-29", week: "水", weekEn: "Wednesday", name: "みどりの日", nameEn: "Greenery Day") holidays["1992-05-03"] = Holiday(ymd: "1992-05-03", week: "日", weekEn: "Sunday", name: "憲法記念日", nameEn: "Constitution Memorial Day") - holidays["1992-05-04"] = Holiday(ymd: "1992-05-04", week: "月", weekEn: "Monday", name: "憲法記念日 振替休日", nameEn: "Holiday in lieu") + holidays["1992-05-04"] = Holiday(ymd: "1992-05-04", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1992-05-05"] = Holiday(ymd: "1992-05-05", week: "火", weekEn: "Tuesday", name: "こどもの日", nameEn: "Children's Day") holidays["1992-09-15"] = Holiday(ymd: "1992-09-15", week: "火", weekEn: "Tuesday", name: "敬老の日", nameEn: "Respect for the Aged Day") holidays["1992-09-23"] = Holiday(ymd: "1992-09-23", week: "水", weekEn: "Wednesday", name: "秋分の日", nameEn: "Autumnal Equinox Day") @@ -339,11 +339,11 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["1993-05-03"] = Holiday(ymd: "1993-05-03", week: "月", weekEn: "Monday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["1993-05-04"] = Holiday(ymd: "1993-05-04", week: "火", weekEn: "Tuesday", name: "国民の休日", nameEn: "Citizen's Holiday") holidays["1993-05-05"] = Holiday(ymd: "1993-05-05", week: "水", weekEn: "Wednesday", name: "こどもの日", nameEn: "Children's Day") - holidays["1993-06-09"] = Holiday(ymd: "1993-06-09", week: "水", weekEn: "Wednesday", name: "皇太子徳仁親王の結婚の儀", nameEn: "The Rite of Wedding of HIH Crown Prince Naruhito") + holidays["1993-06-09"] = Holiday(ymd: "1993-06-09", week: "水", weekEn: "Wednesday", name: "結婚の儀", nameEn: "The Rite of Wedding of HIH Crown Prince Naruhito") holidays["1993-09-15"] = Holiday(ymd: "1993-09-15", week: "水", weekEn: "Wednesday", name: "敬老の日", nameEn: "Respect for the Aged Day") holidays["1993-09-23"] = Holiday(ymd: "1993-09-23", week: "木", weekEn: "Thursday", name: "秋分の日", nameEn: "Autumnal Equinox Day") holidays["1993-10-10"] = Holiday(ymd: "1993-10-10", week: "日", weekEn: "Sunday", name: "体育の日", nameEn: "Health and Sports Day") - holidays["1993-10-11"] = Holiday(ymd: "1993-10-11", week: "月", weekEn: "Monday", name: "体育の日 振替休日", nameEn: "Holiday in lieu") + holidays["1993-10-11"] = Holiday(ymd: "1993-10-11", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1993-11-03"] = Holiday(ymd: "1993-11-03", week: "水", weekEn: "Wednesday", name: "文化の日", nameEn: "National Culture Day") holidays["1993-11-23"] = Holiday(ymd: "1993-11-23", week: "火", weekEn: "Tuesday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") holidays["1993-12-23"] = Holiday(ymd: "1993-12-23", week: "木", weekEn: "Thursday", name: "天皇誕生日", nameEn: "Emperor's Birthday") @@ -362,9 +362,9 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["1994-11-23"] = Holiday(ymd: "1994-11-23", week: "水", weekEn: "Wednesday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") holidays["1994-12-23"] = Holiday(ymd: "1994-12-23", week: "金", weekEn: "Friday", name: "天皇誕生日", nameEn: "Emperor's Birthday") holidays["1995-01-01"] = Holiday(ymd: "1995-01-01", week: "日", weekEn: "Sunday", name: "元日", nameEn: "New Year's Day") - holidays["1995-01-02"] = Holiday(ymd: "1995-01-02", week: "月", weekEn: "Monday", name: "元日 振替休日", nameEn: "Holiday in lieu") + holidays["1995-01-02"] = Holiday(ymd: "1995-01-02", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1995-01-15"] = Holiday(ymd: "1995-01-15", week: "日", weekEn: "Sunday", name: "成人の日", nameEn: "Coming of Age Day") - holidays["1995-01-16"] = Holiday(ymd: "1995-01-16", week: "月", weekEn: "Monday", name: "成人の日 振替休日", nameEn: "Holiday in lieu") + holidays["1995-01-16"] = Holiday(ymd: "1995-01-16", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1995-02-11"] = Holiday(ymd: "1995-02-11", week: "土", weekEn: "Saturday", name: "建国記念の日", nameEn: "National Foundation Day") holidays["1995-03-21"] = Holiday(ymd: "1995-03-21", week: "火", weekEn: "Tuesday", name: "春分の日", nameEn: "Vernal Equinox Day") holidays["1995-04-29"] = Holiday(ymd: "1995-04-29", week: "土", weekEn: "Saturday", name: "みどりの日", nameEn: "Greenery Day") @@ -380,20 +380,20 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["1996-01-01"] = Holiday(ymd: "1996-01-01", week: "月", weekEn: "Monday", name: "元日", nameEn: "New Year's Day") holidays["1996-01-15"] = Holiday(ymd: "1996-01-15", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["1996-02-11"] = Holiday(ymd: "1996-02-11", week: "日", weekEn: "Sunday", name: "建国記念の日", nameEn: "National Foundation Day") - holidays["1996-02-12"] = Holiday(ymd: "1996-02-12", week: "月", weekEn: "Monday", name: "建国記念の日 振替休日", nameEn: "Holiday in lieu") + holidays["1996-02-12"] = Holiday(ymd: "1996-02-12", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1996-03-20"] = Holiday(ymd: "1996-03-20", week: "水", weekEn: "Wednesday", name: "春分の日", nameEn: "Vernal Equinox Day") holidays["1996-04-29"] = Holiday(ymd: "1996-04-29", week: "月", weekEn: "Monday", name: "みどりの日", nameEn: "Greenery Day") holidays["1996-05-03"] = Holiday(ymd: "1996-05-03", week: "金", weekEn: "Friday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["1996-05-04"] = Holiday(ymd: "1996-05-04", week: "土", weekEn: "Saturday", name: "国民の休日", nameEn: "Citizen's Holiday") holidays["1996-05-05"] = Holiday(ymd: "1996-05-05", week: "日", weekEn: "Sunday", name: "こどもの日", nameEn: "Children's Day") - holidays["1996-05-06"] = Holiday(ymd: "1996-05-06", week: "月", weekEn: "Monday", name: "こどもの日 振替休日", nameEn: "Holiday in lieu") + holidays["1996-05-06"] = Holiday(ymd: "1996-05-06", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1996-07-20"] = Holiday(ymd: "1996-07-20", week: "土", weekEn: "Saturday", name: "海の日", nameEn: "Marine Day") holidays["1996-09-15"] = Holiday(ymd: "1996-09-15", week: "日", weekEn: "Sunday", name: "敬老の日", nameEn: "Respect for the Aged Day") - holidays["1996-09-16"] = Holiday(ymd: "1996-09-16", week: "月", weekEn: "Monday", name: "敬老の日 振替休日", nameEn: "Holiday in lieu") + holidays["1996-09-16"] = Holiday(ymd: "1996-09-16", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1996-09-23"] = Holiday(ymd: "1996-09-23", week: "月", weekEn: "Monday", name: "秋分の日", nameEn: "Autumnal Equinox Day") holidays["1996-10-10"] = Holiday(ymd: "1996-10-10", week: "木", weekEn: "Thursday", name: "体育の日", nameEn: "Health and Sports Day") holidays["1996-11-03"] = Holiday(ymd: "1996-11-03", week: "日", weekEn: "Sunday", name: "文化の日", nameEn: "National Culture Day") - holidays["1996-11-04"] = Holiday(ymd: "1996-11-04", week: "月", weekEn: "Monday", name: "文化の日 振替休日", nameEn: "Holiday in lieu") + holidays["1996-11-04"] = Holiday(ymd: "1996-11-04", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1996-11-23"] = Holiday(ymd: "1996-11-23", week: "土", weekEn: "Saturday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") holidays["1996-12-23"] = Holiday(ymd: "1996-12-23", week: "月", weekEn: "Monday", name: "天皇誕生日", nameEn: "Emperor's Birthday") holidays["1997-01-01"] = Holiday(ymd: "1997-01-01", week: "水", weekEn: "Wednesday", name: "元日", nameEn: "New Year's Day") @@ -404,13 +404,13 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["1997-05-03"] = Holiday(ymd: "1997-05-03", week: "土", weekEn: "Saturday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["1997-05-05"] = Holiday(ymd: "1997-05-05", week: "月", weekEn: "Monday", name: "こどもの日", nameEn: "Children's Day") holidays["1997-07-20"] = Holiday(ymd: "1997-07-20", week: "日", weekEn: "Sunday", name: "海の日", nameEn: "Marine Day") - holidays["1997-07-21"] = Holiday(ymd: "1997-07-21", week: "月", weekEn: "Monday", name: "海の日 振替休日", nameEn: "Holiday in lieu") + holidays["1997-07-21"] = Holiday(ymd: "1997-07-21", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1997-09-15"] = Holiday(ymd: "1997-09-15", week: "月", weekEn: "Monday", name: "敬老の日", nameEn: "Respect for the Aged Day") holidays["1997-09-23"] = Holiday(ymd: "1997-09-23", week: "火", weekEn: "Tuesday", name: "秋分の日", nameEn: "Autumnal Equinox Day") holidays["1997-10-10"] = Holiday(ymd: "1997-10-10", week: "金", weekEn: "Friday", name: "体育の日", nameEn: "Health and Sports Day") holidays["1997-11-03"] = Holiday(ymd: "1997-11-03", week: "月", weekEn: "Monday", name: "文化の日", nameEn: "National Culture Day") holidays["1997-11-23"] = Holiday(ymd: "1997-11-23", week: "日", weekEn: "Sunday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") - holidays["1997-11-24"] = Holiday(ymd: "1997-11-24", week: "月", weekEn: "Monday", name: "勤労感謝の日 振替休日", nameEn: "Holiday in lieu") + holidays["1997-11-24"] = Holiday(ymd: "1997-11-24", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1997-12-23"] = Holiday(ymd: "1997-12-23", week: "火", weekEn: "Tuesday", name: "天皇誕生日", nameEn: "Emperor's Birthday") holidays["1998-01-01"] = Holiday(ymd: "1998-01-01", week: "木", weekEn: "Thursday", name: "元日", nameEn: "New Year's Day") holidays["1998-01-15"] = Holiday(ymd: "1998-01-15", week: "木", weekEn: "Thursday", name: "成人の日", nameEn: "Coming of Age Day") @@ -418,7 +418,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["1998-03-21"] = Holiday(ymd: "1998-03-21", week: "土", weekEn: "Saturday", name: "春分の日", nameEn: "Vernal Equinox Day") holidays["1998-04-29"] = Holiday(ymd: "1998-04-29", week: "水", weekEn: "Wednesday", name: "みどりの日", nameEn: "Greenery Day") holidays["1998-05-03"] = Holiday(ymd: "1998-05-03", week: "日", weekEn: "Sunday", name: "憲法記念日", nameEn: "Constitution Memorial Day") - holidays["1998-05-04"] = Holiday(ymd: "1998-05-04", week: "月", weekEn: "Monday", name: "憲法記念日 振替休日", nameEn: "Holiday in lieu") + holidays["1998-05-04"] = Holiday(ymd: "1998-05-04", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1998-05-05"] = Holiday(ymd: "1998-05-05", week: "火", weekEn: "Tuesday", name: "こどもの日", nameEn: "Children's Day") holidays["1998-07-20"] = Holiday(ymd: "1998-07-20", week: "月", weekEn: "Monday", name: "海の日", nameEn: "Marine Day") holidays["1998-09-15"] = Holiday(ymd: "1998-09-15", week: "火", weekEn: "Tuesday", name: "敬老の日", nameEn: "Respect for the Aged Day") @@ -431,7 +431,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["1999-01-15"] = Holiday(ymd: "1999-01-15", week: "金", weekEn: "Friday", name: "成人の日", nameEn: "Coming of Age Day") holidays["1999-02-11"] = Holiday(ymd: "1999-02-11", week: "木", weekEn: "Thursday", name: "建国記念の日", nameEn: "National Foundation Day") holidays["1999-03-21"] = Holiday(ymd: "1999-03-21", week: "日", weekEn: "Sunday", name: "春分の日", nameEn: "Vernal Equinox Day") - holidays["1999-03-22"] = Holiday(ymd: "1999-03-22", week: "月", weekEn: "Monday", name: "春分の日 振替休日", nameEn: "Holiday in lieu") + holidays["1999-03-22"] = Holiday(ymd: "1999-03-22", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1999-04-29"] = Holiday(ymd: "1999-04-29", week: "木", weekEn: "Thursday", name: "みどりの日", nameEn: "Greenery Day") holidays["1999-05-03"] = Holiday(ymd: "1999-05-03", week: "月", weekEn: "Monday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["1999-05-04"] = Holiday(ymd: "1999-05-04", week: "火", weekEn: "Tuesday", name: "国民の休日", nameEn: "Citizen's Holiday") @@ -440,7 +440,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["1999-09-15"] = Holiday(ymd: "1999-09-15", week: "水", weekEn: "Wednesday", name: "敬老の日", nameEn: "Respect for the Aged Day") holidays["1999-09-23"] = Holiday(ymd: "1999-09-23", week: "木", weekEn: "Thursday", name: "秋分の日", nameEn: "Autumnal Equinox Day") holidays["1999-10-10"] = Holiday(ymd: "1999-10-10", week: "日", weekEn: "Sunday", name: "体育の日", nameEn: "Health and Sports Day") - holidays["1999-10-11"] = Holiday(ymd: "1999-10-11", week: "月", weekEn: "Monday", name: "体育の日 振替休日", nameEn: "Holiday in lieu") + holidays["1999-10-11"] = Holiday(ymd: "1999-10-11", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["1999-11-03"] = Holiday(ymd: "1999-11-03", week: "水", weekEn: "Wednesday", name: "文化の日", nameEn: "National Culture Day") holidays["1999-11-23"] = Holiday(ymd: "1999-11-23", week: "火", weekEn: "Tuesday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") holidays["1999-12-23"] = Holiday(ymd: "1999-12-23", week: "木", weekEn: "Thursday", name: "天皇誕生日", nameEn: "Emperor's Birthday") @@ -462,22 +462,22 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2001-01-01"] = Holiday(ymd: "2001-01-01", week: "月", weekEn: "Monday", name: "元日", nameEn: "New Year's Day") holidays["2001-01-08"] = Holiday(ymd: "2001-01-08", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["2001-02-11"] = Holiday(ymd: "2001-02-11", week: "日", weekEn: "Sunday", name: "建国記念の日", nameEn: "National Foundation Day") - holidays["2001-02-12"] = Holiday(ymd: "2001-02-12", week: "月", weekEn: "Monday", name: "建国記念の日 振替休日", nameEn: "Holiday in lieu") + holidays["2001-02-12"] = Holiday(ymd: "2001-02-12", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2001-03-20"] = Holiday(ymd: "2001-03-20", week: "火", weekEn: "Tuesday", name: "春分の日", nameEn: "Vernal Equinox Day") holidays["2001-04-29"] = Holiday(ymd: "2001-04-29", week: "日", weekEn: "Sunday", name: "みどりの日", nameEn: "Greenery Day") - holidays["2001-04-30"] = Holiday(ymd: "2001-04-30", week: "月", weekEn: "Monday", name: "みどりの日 振替休日", nameEn: "Holiday in lieu") + holidays["2001-04-30"] = Holiday(ymd: "2001-04-30", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2001-05-03"] = Holiday(ymd: "2001-05-03", week: "木", weekEn: "Thursday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2001-05-04"] = Holiday(ymd: "2001-05-04", week: "金", weekEn: "Friday", name: "国民の休日", nameEn: "Citizen's Holiday") holidays["2001-05-05"] = Holiday(ymd: "2001-05-05", week: "土", weekEn: "Saturday", name: "こどもの日", nameEn: "Children's Day") holidays["2001-07-20"] = Holiday(ymd: "2001-07-20", week: "金", weekEn: "Friday", name: "海の日", nameEn: "Marine Day") holidays["2001-09-15"] = Holiday(ymd: "2001-09-15", week: "土", weekEn: "Saturday", name: "敬老の日", nameEn: "Respect for the Aged Day") holidays["2001-09-23"] = Holiday(ymd: "2001-09-23", week: "日", weekEn: "Sunday", name: "秋分の日", nameEn: "Autumnal Equinox Day") - holidays["2001-09-24"] = Holiday(ymd: "2001-09-24", week: "月", weekEn: "Monday", name: "秋分の日 振替休日", nameEn: "Holiday in lieu") + holidays["2001-09-24"] = Holiday(ymd: "2001-09-24", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2001-10-08"] = Holiday(ymd: "2001-10-08", week: "月", weekEn: "Monday", name: "体育の日", nameEn: "Health and Sports Day") holidays["2001-11-03"] = Holiday(ymd: "2001-11-03", week: "土", weekEn: "Saturday", name: "文化の日", nameEn: "National Culture Day") holidays["2001-11-23"] = Holiday(ymd: "2001-11-23", week: "金", weekEn: "Friday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") holidays["2001-12-23"] = Holiday(ymd: "2001-12-23", week: "日", weekEn: "Sunday", name: "天皇誕生日", nameEn: "Emperor's Birthday") - holidays["2001-12-24"] = Holiday(ymd: "2001-12-24", week: "月", weekEn: "Monday", name: "天皇誕生日 振替休日", nameEn: "Holiday in lieu") + holidays["2001-12-24"] = Holiday(ymd: "2001-12-24", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2002-01-01"] = Holiday(ymd: "2002-01-01", week: "火", weekEn: "Tuesday", name: "元日", nameEn: "New Year's Day") holidays["2002-01-14"] = Holiday(ymd: "2002-01-14", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["2002-02-11"] = Holiday(ymd: "2002-02-11", week: "月", weekEn: "Monday", name: "建国記念の日", nameEn: "National Foundation Day") @@ -486,14 +486,14 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2002-05-03"] = Holiday(ymd: "2002-05-03", week: "金", weekEn: "Friday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2002-05-04"] = Holiday(ymd: "2002-05-04", week: "土", weekEn: "Saturday", name: "国民の休日", nameEn: "Citizen's Holiday") holidays["2002-05-05"] = Holiday(ymd: "2002-05-05", week: "日", weekEn: "Sunday", name: "こどもの日", nameEn: "Children's Day") - holidays["2002-05-06"] = Holiday(ymd: "2002-05-06", week: "月", weekEn: "Monday", name: "こどもの日 振替休日", nameEn: "Holiday in lieu") + holidays["2002-05-06"] = Holiday(ymd: "2002-05-06", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2002-07-20"] = Holiday(ymd: "2002-07-20", week: "土", weekEn: "Saturday", name: "海の日", nameEn: "Marine Day") holidays["2002-09-15"] = Holiday(ymd: "2002-09-15", week: "日", weekEn: "Sunday", name: "敬老の日", nameEn: "Respect for the Aged Day") - holidays["2002-09-16"] = Holiday(ymd: "2002-09-16", week: "月", weekEn: "Monday", name: "敬老の日 振替休日", nameEn: "Holiday in lieu") + holidays["2002-09-16"] = Holiday(ymd: "2002-09-16", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2002-09-23"] = Holiday(ymd: "2002-09-23", week: "月", weekEn: "Monday", name: "秋分の日", nameEn: "Autumnal Equinox Day") holidays["2002-10-14"] = Holiday(ymd: "2002-10-14", week: "月", weekEn: "Monday", name: "体育の日", nameEn: "Health and Sports Day") holidays["2002-11-03"] = Holiday(ymd: "2002-11-03", week: "日", weekEn: "Sunday", name: "文化の日", nameEn: "National Culture Day") - holidays["2002-11-04"] = Holiday(ymd: "2002-11-04", week: "月", weekEn: "Monday", name: "文化の日 振替休日", nameEn: "Holiday in lieu") + holidays["2002-11-04"] = Holiday(ymd: "2002-11-04", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2002-11-23"] = Holiday(ymd: "2002-11-23", week: "土", weekEn: "Saturday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") holidays["2002-12-23"] = Holiday(ymd: "2002-12-23", week: "月", weekEn: "Monday", name: "天皇誕生日", nameEn: "Emperor's Birthday") holidays["2003-01-01"] = Holiday(ymd: "2003-01-01", week: "水", weekEn: "Wednesday", name: "元日", nameEn: "New Year's Day") @@ -509,7 +509,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2003-10-13"] = Holiday(ymd: "2003-10-13", week: "月", weekEn: "Monday", name: "体育の日", nameEn: "Health and Sports Day") holidays["2003-11-03"] = Holiday(ymd: "2003-11-03", week: "月", weekEn: "Monday", name: "文化の日", nameEn: "National Culture Day") holidays["2003-11-23"] = Holiday(ymd: "2003-11-23", week: "日", weekEn: "Sunday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") - holidays["2003-11-24"] = Holiday(ymd: "2003-11-24", week: "月", weekEn: "Monday", name: "勤労感謝の日 振替休日", nameEn: "Holiday in lieu") + holidays["2003-11-24"] = Holiday(ymd: "2003-11-24", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2003-12-23"] = Holiday(ymd: "2003-12-23", week: "火", weekEn: "Tuesday", name: "天皇誕生日", nameEn: "Emperor's Birthday") holidays["2004-01-01"] = Holiday(ymd: "2004-01-01", week: "木", weekEn: "Thursday", name: "元日", nameEn: "New Year's Day") holidays["2004-01-12"] = Holiday(ymd: "2004-01-12", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") @@ -530,7 +530,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2005-01-10"] = Holiday(ymd: "2005-01-10", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["2005-02-11"] = Holiday(ymd: "2005-02-11", week: "金", weekEn: "Friday", name: "建国記念の日", nameEn: "National Foundation Day") holidays["2005-03-20"] = Holiday(ymd: "2005-03-20", week: "日", weekEn: "Sunday", name: "春分の日", nameEn: "Vernal Equinox Day") - holidays["2005-03-21"] = Holiday(ymd: "2005-03-21", week: "月", weekEn: "Monday", name: "春分の日 振替休日", nameEn: "Holiday in lieu") + holidays["2005-03-21"] = Holiday(ymd: "2005-03-21", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2005-04-29"] = Holiday(ymd: "2005-04-29", week: "金", weekEn: "Friday", name: "みどりの日", nameEn: "Greenery Day") holidays["2005-05-03"] = Holiday(ymd: "2005-05-03", week: "火", weekEn: "Tuesday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2005-05-04"] = Holiday(ymd: "2005-05-04", week: "水", weekEn: "Wednesday", name: "国民の休日", nameEn: "Citizen's Holiday") @@ -543,7 +543,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2005-11-23"] = Holiday(ymd: "2005-11-23", week: "水", weekEn: "Wednesday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") holidays["2005-12-23"] = Holiday(ymd: "2005-12-23", week: "金", weekEn: "Friday", name: "天皇誕生日", nameEn: "Emperor's Birthday") holidays["2006-01-01"] = Holiday(ymd: "2006-01-01", week: "日", weekEn: "Sunday", name: "元日", nameEn: "New Year's Day") - holidays["2006-01-02"] = Holiday(ymd: "2006-01-02", week: "月", weekEn: "Monday", name: "元日 振替休日", nameEn: "Holiday in lieu") + holidays["2006-01-02"] = Holiday(ymd: "2006-01-02", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2006-01-09"] = Holiday(ymd: "2006-01-09", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["2006-02-11"] = Holiday(ymd: "2006-02-11", week: "土", weekEn: "Saturday", name: "建国記念の日", nameEn: "National Foundation Day") holidays["2006-03-21"] = Holiday(ymd: "2006-03-21", week: "火", weekEn: "Tuesday", name: "春分の日", nameEn: "Vernal Equinox Day") @@ -561,22 +561,22 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2007-01-01"] = Holiday(ymd: "2007-01-01", week: "月", weekEn: "Monday", name: "元日", nameEn: "New Year's Day") holidays["2007-01-08"] = Holiday(ymd: "2007-01-08", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["2007-02-11"] = Holiday(ymd: "2007-02-11", week: "日", weekEn: "Sunday", name: "建国記念の日", nameEn: "National Foundation Day") - holidays["2007-02-12"] = Holiday(ymd: "2007-02-12", week: "月", weekEn: "Monday", name: "建国記念の日 振替休日", nameEn: "Holiday in lieu") + holidays["2007-02-12"] = Holiday(ymd: "2007-02-12", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2007-03-21"] = Holiday(ymd: "2007-03-21", week: "水", weekEn: "Wednesday", name: "春分の日", nameEn: "Vernal Equinox Day") holidays["2007-04-29"] = Holiday(ymd: "2007-04-29", week: "日", weekEn: "Sunday", name: "昭和の日", nameEn: "Showa Day") - holidays["2007-04-30"] = Holiday(ymd: "2007-04-30", week: "月", weekEn: "Monday", name: "昭和の日 振替休日", nameEn: "Holiday in lieu") + holidays["2007-04-30"] = Holiday(ymd: "2007-04-30", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2007-05-03"] = Holiday(ymd: "2007-05-03", week: "木", weekEn: "Thursday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2007-05-04"] = Holiday(ymd: "2007-05-04", week: "金", weekEn: "Friday", name: "みどりの日", nameEn: "Greenery Day") holidays["2007-05-05"] = Holiday(ymd: "2007-05-05", week: "土", weekEn: "Saturday", name: "こどもの日", nameEn: "Children's Day") holidays["2007-07-16"] = Holiday(ymd: "2007-07-16", week: "月", weekEn: "Monday", name: "海の日", nameEn: "Marine Day") holidays["2007-09-17"] = Holiday(ymd: "2007-09-17", week: "月", weekEn: "Monday", name: "敬老の日", nameEn: "Respect for the Aged Day") holidays["2007-09-23"] = Holiday(ymd: "2007-09-23", week: "日", weekEn: "Sunday", name: "秋分の日", nameEn: "Autumnal Equinox Day") - holidays["2007-09-24"] = Holiday(ymd: "2007-09-24", week: "月", weekEn: "Monday", name: "秋分の日 振替休日", nameEn: "Holiday in lieu") + holidays["2007-09-24"] = Holiday(ymd: "2007-09-24", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2007-10-08"] = Holiday(ymd: "2007-10-08", week: "月", weekEn: "Monday", name: "体育の日", nameEn: "Health and Sports Day") holidays["2007-11-03"] = Holiday(ymd: "2007-11-03", week: "土", weekEn: "Saturday", name: "文化の日", nameEn: "National Culture Day") holidays["2007-11-23"] = Holiday(ymd: "2007-11-23", week: "金", weekEn: "Friday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") holidays["2007-12-23"] = Holiday(ymd: "2007-12-23", week: "日", weekEn: "Sunday", name: "天皇誕生日", nameEn: "Emperor's Birthday") - holidays["2007-12-24"] = Holiday(ymd: "2007-12-24", week: "月", weekEn: "Monday", name: "天皇誕生日 振替休日", nameEn: "Holiday in lieu") + holidays["2007-12-24"] = Holiday(ymd: "2007-12-24", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2008-01-01"] = Holiday(ymd: "2008-01-01", week: "火", weekEn: "Tuesday", name: "元日", nameEn: "New Year's Day") holidays["2008-01-14"] = Holiday(ymd: "2008-01-14", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["2008-02-11"] = Holiday(ymd: "2008-02-11", week: "月", weekEn: "Monday", name: "建国記念の日", nameEn: "National Foundation Day") @@ -585,14 +585,14 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2008-05-03"] = Holiday(ymd: "2008-05-03", week: "土", weekEn: "Saturday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2008-05-04"] = Holiday(ymd: "2008-05-04", week: "日", weekEn: "Sunday", name: "みどりの日", nameEn: "Greenery Day") holidays["2008-05-05"] = Holiday(ymd: "2008-05-05", week: "月", weekEn: "Monday", name: "こどもの日", nameEn: "Children's Day") - holidays["2008-05-06"] = Holiday(ymd: "2008-05-06", week: "火", weekEn: "Tuesday", name: "こどもの日 振替休日", nameEn: "Holiday in lieu") + holidays["2008-05-06"] = Holiday(ymd: "2008-05-06", week: "火", weekEn: "Tuesday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2008-07-21"] = Holiday(ymd: "2008-07-21", week: "月", weekEn: "Monday", name: "海の日", nameEn: "Marine Day") holidays["2008-09-15"] = Holiday(ymd: "2008-09-15", week: "月", weekEn: "Monday", name: "敬老の日", nameEn: "Respect for the Aged Day") holidays["2008-09-23"] = Holiday(ymd: "2008-09-23", week: "火", weekEn: "Tuesday", name: "秋分の日", nameEn: "Autumnal Equinox Day") holidays["2008-10-13"] = Holiday(ymd: "2008-10-13", week: "月", weekEn: "Monday", name: "体育の日", nameEn: "Health and Sports Day") holidays["2008-11-03"] = Holiday(ymd: "2008-11-03", week: "月", weekEn: "Monday", name: "文化の日", nameEn: "National Culture Day") holidays["2008-11-23"] = Holiday(ymd: "2008-11-23", week: "日", weekEn: "Sunday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") - holidays["2008-11-24"] = Holiday(ymd: "2008-11-24", week: "月", weekEn: "Monday", name: "勤労感謝の日 振替休日", nameEn: "Holiday in lieu") + holidays["2008-11-24"] = Holiday(ymd: "2008-11-24", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2008-12-23"] = Holiday(ymd: "2008-12-23", week: "火", weekEn: "Tuesday", name: "天皇誕生日", nameEn: "Emperor's Birthday") holidays["2009-01-01"] = Holiday(ymd: "2009-01-01", week: "木", weekEn: "Thursday", name: "元日", nameEn: "New Year's Day") holidays["2009-01-12"] = Holiday(ymd: "2009-01-12", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") @@ -602,7 +602,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2009-05-03"] = Holiday(ymd: "2009-05-03", week: "日", weekEn: "Sunday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2009-05-04"] = Holiday(ymd: "2009-05-04", week: "月", weekEn: "Monday", name: "みどりの日", nameEn: "Greenery Day") holidays["2009-05-05"] = Holiday(ymd: "2009-05-05", week: "火", weekEn: "Tuesday", name: "こどもの日", nameEn: "Children's Day") - holidays["2009-05-06"] = Holiday(ymd: "2009-05-06", week: "水", weekEn: "Wednesday", name: "こどもの日 振替休日", nameEn: "Holiday in lieu") + holidays["2009-05-06"] = Holiday(ymd: "2009-05-06", week: "水", weekEn: "Wednesday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2009-07-20"] = Holiday(ymd: "2009-07-20", week: "月", weekEn: "Monday", name: "海の日", nameEn: "Marine Day") holidays["2009-09-21"] = Holiday(ymd: "2009-09-21", week: "月", weekEn: "Monday", name: "敬老の日", nameEn: "Respect for the Aged Day") holidays["2009-09-22"] = Holiday(ymd: "2009-09-22", week: "火", weekEn: "Tuesday", name: "国民の休日", nameEn: "Citizen's Holiday") @@ -615,7 +615,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2010-01-11"] = Holiday(ymd: "2010-01-11", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["2010-02-11"] = Holiday(ymd: "2010-02-11", week: "木", weekEn: "Thursday", name: "建国記念の日", nameEn: "National Foundation Day") holidays["2010-03-21"] = Holiday(ymd: "2010-03-21", week: "日", weekEn: "Sunday", name: "春分の日", nameEn: "Vernal Equinox Day") - holidays["2010-03-22"] = Holiday(ymd: "2010-03-22", week: "月", weekEn: "Monday", name: "春分の日 振替休日", nameEn: "Holiday in lieu") + holidays["2010-03-22"] = Holiday(ymd: "2010-03-22", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2010-04-29"] = Holiday(ymd: "2010-04-29", week: "木", weekEn: "Thursday", name: "昭和の日", nameEn: "Showa Day") holidays["2010-05-03"] = Holiday(ymd: "2010-05-03", week: "月", weekEn: "Monday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2010-05-04"] = Holiday(ymd: "2010-05-04", week: "火", weekEn: "Tuesday", name: "みどりの日", nameEn: "Greenery Day") @@ -643,12 +643,12 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2011-11-23"] = Holiday(ymd: "2011-11-23", week: "水", weekEn: "Wednesday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") holidays["2011-12-23"] = Holiday(ymd: "2011-12-23", week: "金", weekEn: "Friday", name: "天皇誕生日", nameEn: "Emperor's Birthday") holidays["2012-01-01"] = Holiday(ymd: "2012-01-01", week: "日", weekEn: "Sunday", name: "元日", nameEn: "New Year's Day") - holidays["2012-01-02"] = Holiday(ymd: "2012-01-02", week: "月", weekEn: "Monday", name: "元日 振替休日", nameEn: "Holiday in lieu") + holidays["2012-01-02"] = Holiday(ymd: "2012-01-02", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2012-01-09"] = Holiday(ymd: "2012-01-09", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["2012-02-11"] = Holiday(ymd: "2012-02-11", week: "土", weekEn: "Saturday", name: "建国記念の日", nameEn: "National Foundation Day") holidays["2012-03-20"] = Holiday(ymd: "2012-03-20", week: "火", weekEn: "Tuesday", name: "春分の日", nameEn: "Vernal Equinox Day") holidays["2012-04-29"] = Holiday(ymd: "2012-04-29", week: "日", weekEn: "Sunday", name: "昭和の日", nameEn: "Showa Day") - holidays["2012-04-30"] = Holiday(ymd: "2012-04-30", week: "月", weekEn: "Monday", name: "昭和の日 振替休日", nameEn: "Holiday in lieu") + holidays["2012-04-30"] = Holiday(ymd: "2012-04-30", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2012-05-03"] = Holiday(ymd: "2012-05-03", week: "木", weekEn: "Thursday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2012-05-04"] = Holiday(ymd: "2012-05-04", week: "金", weekEn: "Friday", name: "みどりの日", nameEn: "Greenery Day") holidays["2012-05-05"] = Holiday(ymd: "2012-05-05", week: "土", weekEn: "Saturday", name: "こどもの日", nameEn: "Children's Day") @@ -659,7 +659,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2012-11-03"] = Holiday(ymd: "2012-11-03", week: "土", weekEn: "Saturday", name: "文化の日", nameEn: "National Culture Day") holidays["2012-11-23"] = Holiday(ymd: "2012-11-23", week: "金", weekEn: "Friday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") holidays["2012-12-23"] = Holiday(ymd: "2012-12-23", week: "日", weekEn: "Sunday", name: "天皇誕生日", nameEn: "Emperor's Birthday") - holidays["2012-12-24"] = Holiday(ymd: "2012-12-24", week: "月", weekEn: "Monday", name: "天皇誕生日 振替休日", nameEn: "Holiday in lieu") + holidays["2012-12-24"] = Holiday(ymd: "2012-12-24", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2013-01-01"] = Holiday(ymd: "2013-01-01", week: "火", weekEn: "Tuesday", name: "元日", nameEn: "New Year's Day") holidays["2013-01-14"] = Holiday(ymd: "2013-01-14", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["2013-02-11"] = Holiday(ymd: "2013-02-11", week: "月", weekEn: "Monday", name: "建国記念の日", nameEn: "National Foundation Day") @@ -668,13 +668,13 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2013-05-03"] = Holiday(ymd: "2013-05-03", week: "金", weekEn: "Friday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2013-05-04"] = Holiday(ymd: "2013-05-04", week: "土", weekEn: "Saturday", name: "みどりの日", nameEn: "Greenery Day") holidays["2013-05-05"] = Holiday(ymd: "2013-05-05", week: "日", weekEn: "Sunday", name: "こどもの日", nameEn: "Children's Day") - holidays["2013-05-06"] = Holiday(ymd: "2013-05-06", week: "月", weekEn: "Monday", name: "こどもの日 振替休日", nameEn: "Holiday in lieu") + holidays["2013-05-06"] = Holiday(ymd: "2013-05-06", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2013-07-15"] = Holiday(ymd: "2013-07-15", week: "月", weekEn: "Monday", name: "海の日", nameEn: "Marine Day") holidays["2013-09-16"] = Holiday(ymd: "2013-09-16", week: "月", weekEn: "Monday", name: "敬老の日", nameEn: "Respect for the Aged Day") holidays["2013-09-23"] = Holiday(ymd: "2013-09-23", week: "月", weekEn: "Monday", name: "秋分の日", nameEn: "Autumnal Equinox Day") holidays["2013-10-14"] = Holiday(ymd: "2013-10-14", week: "月", weekEn: "Monday", name: "体育の日", nameEn: "Health and Sports Day") holidays["2013-11-03"] = Holiday(ymd: "2013-11-03", week: "日", weekEn: "Sunday", name: "文化の日", nameEn: "National Culture Day") - holidays["2013-11-04"] = Holiday(ymd: "2013-11-04", week: "月", weekEn: "Monday", name: "文化の日 振替休日", nameEn: "Holiday in lieu") + holidays["2013-11-04"] = Holiday(ymd: "2013-11-04", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2013-11-23"] = Holiday(ymd: "2013-11-23", week: "土", weekEn: "Saturday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") holidays["2013-12-23"] = Holiday(ymd: "2013-12-23", week: "月", weekEn: "Monday", name: "天皇誕生日", nameEn: "Emperor's Birthday") holidays["2014-01-01"] = Holiday(ymd: "2014-01-01", week: "水", weekEn: "Wednesday", name: "元日", nameEn: "New Year's Day") @@ -685,14 +685,14 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2014-05-03"] = Holiday(ymd: "2014-05-03", week: "土", weekEn: "Saturday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2014-05-04"] = Holiday(ymd: "2014-05-04", week: "日", weekEn: "Sunday", name: "みどりの日", nameEn: "Greenery Day") holidays["2014-05-05"] = Holiday(ymd: "2014-05-05", week: "月", weekEn: "Monday", name: "こどもの日", nameEn: "Children's Day") - holidays["2014-05-06"] = Holiday(ymd: "2014-05-06", week: "火", weekEn: "Tuesday", name: "こどもの日 振替休日", nameEn: "Holiday in lieu") + holidays["2014-05-06"] = Holiday(ymd: "2014-05-06", week: "火", weekEn: "Tuesday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2014-07-21"] = Holiday(ymd: "2014-07-21", week: "月", weekEn: "Monday", name: "海の日", nameEn: "Marine Day") holidays["2014-09-15"] = Holiday(ymd: "2014-09-15", week: "月", weekEn: "Monday", name: "敬老の日", nameEn: "Respect for the Aged Day") holidays["2014-09-23"] = Holiday(ymd: "2014-09-23", week: "火", weekEn: "Tuesday", name: "秋分の日", nameEn: "Autumnal Equinox Day") holidays["2014-10-13"] = Holiday(ymd: "2014-10-13", week: "月", weekEn: "Monday", name: "体育の日", nameEn: "Health and Sports Day") holidays["2014-11-03"] = Holiday(ymd: "2014-11-03", week: "月", weekEn: "Monday", name: "文化の日", nameEn: "National Culture Day") holidays["2014-11-23"] = Holiday(ymd: "2014-11-23", week: "日", weekEn: "Sunday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") - holidays["2014-11-24"] = Holiday(ymd: "2014-11-24", week: "月", weekEn: "Monday", name: "勤労感謝の日 振替休日", nameEn: "Holiday in lieu") + holidays["2014-11-24"] = Holiday(ymd: "2014-11-24", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2014-12-23"] = Holiday(ymd: "2014-12-23", week: "火", weekEn: "Tuesday", name: "天皇誕生日", nameEn: "Emperor's Birthday") holidays["2015-01-01"] = Holiday(ymd: "2015-01-01", week: "木", weekEn: "Thursday", name: "元日", nameEn: "New Year's Day") holidays["2015-01-12"] = Holiday(ymd: "2015-01-12", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") @@ -702,7 +702,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2015-05-03"] = Holiday(ymd: "2015-05-03", week: "日", weekEn: "Sunday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2015-05-04"] = Holiday(ymd: "2015-05-04", week: "月", weekEn: "Monday", name: "みどりの日", nameEn: "Greenery Day") holidays["2015-05-05"] = Holiday(ymd: "2015-05-05", week: "火", weekEn: "Tuesday", name: "こどもの日", nameEn: "Children's Day") - holidays["2015-05-06"] = Holiday(ymd: "2015-05-06", week: "水", weekEn: "Wednesday", name: "こどもの日 振替休日", nameEn: "Holiday in lieu") + holidays["2015-05-06"] = Holiday(ymd: "2015-05-06", week: "水", weekEn: "Wednesday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2015-07-20"] = Holiday(ymd: "2015-07-20", week: "月", weekEn: "Monday", name: "海の日", nameEn: "Marine Day") holidays["2015-09-21"] = Holiday(ymd: "2015-09-21", week: "月", weekEn: "Monday", name: "敬老の日", nameEn: "Respect for the Aged Day") holidays["2015-09-22"] = Holiday(ymd: "2015-09-22", week: "火", weekEn: "Tuesday", name: "国民の休日", nameEn: "Citizen's Holiday") @@ -715,7 +715,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2016-01-11"] = Holiday(ymd: "2016-01-11", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["2016-02-11"] = Holiday(ymd: "2016-02-11", week: "木", weekEn: "Thursday", name: "建国記念の日", nameEn: "National Foundation Day") holidays["2016-03-20"] = Holiday(ymd: "2016-03-20", week: "日", weekEn: "Sunday", name: "春分の日", nameEn: "Vernal Equinox Day") - holidays["2016-03-21"] = Holiday(ymd: "2016-03-21", week: "月", weekEn: "Monday", name: "春分の日 振替休日", nameEn: "Holiday in lieu") + holidays["2016-03-21"] = Holiday(ymd: "2016-03-21", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2016-04-29"] = Holiday(ymd: "2016-04-29", week: "金", weekEn: "Friday", name: "昭和の日", nameEn: "Showa Day") holidays["2016-05-03"] = Holiday(ymd: "2016-05-03", week: "火", weekEn: "Tuesday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2016-05-04"] = Holiday(ymd: "2016-05-04", week: "水", weekEn: "Wednesday", name: "みどりの日", nameEn: "Greenery Day") @@ -729,7 +729,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2016-11-23"] = Holiday(ymd: "2016-11-23", week: "水", weekEn: "Wednesday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") holidays["2016-12-23"] = Holiday(ymd: "2016-12-23", week: "金", weekEn: "Friday", name: "天皇誕生日", nameEn: "Emperor's Birthday") holidays["2017-01-01"] = Holiday(ymd: "2017-01-01", week: "日", weekEn: "Sunday", name: "元日", nameEn: "New Year's Day") - holidays["2017-01-02"] = Holiday(ymd: "2017-01-02", week: "月", weekEn: "Monday", name: "元日 振替休日", nameEn: "Holiday in lieu") + holidays["2017-01-02"] = Holiday(ymd: "2017-01-02", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2017-01-09"] = Holiday(ymd: "2017-01-09", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["2017-02-11"] = Holiday(ymd: "2017-02-11", week: "土", weekEn: "Saturday", name: "建国記念の日", nameEn: "National Foundation Day") holidays["2017-03-20"] = Holiday(ymd: "2017-03-20", week: "月", weekEn: "Monday", name: "春分の日", nameEn: "Vernal Equinox Day") @@ -748,10 +748,10 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2018-01-01"] = Holiday(ymd: "2018-01-01", week: "月", weekEn: "Monday", name: "元日", nameEn: "New Year's Day") holidays["2018-01-08"] = Holiday(ymd: "2018-01-08", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["2018-02-11"] = Holiday(ymd: "2018-02-11", week: "日", weekEn: "Sunday", name: "建国記念の日", nameEn: "National Foundation Day") - holidays["2018-02-12"] = Holiday(ymd: "2018-02-12", week: "月", weekEn: "Monday", name: "建国記念の日 振替休日", nameEn: "Holiday in lieu") + holidays["2018-02-12"] = Holiday(ymd: "2018-02-12", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2018-03-21"] = Holiday(ymd: "2018-03-21", week: "水", weekEn: "Wednesday", name: "春分の日", nameEn: "Vernal Equinox Day") holidays["2018-04-29"] = Holiday(ymd: "2018-04-29", week: "日", weekEn: "Sunday", name: "昭和の日", nameEn: "Showa Day") - holidays["2018-04-30"] = Holiday(ymd: "2018-04-30", week: "月", weekEn: "Monday", name: "昭和の日 振替休日", nameEn: "Holiday in lieu") + holidays["2018-04-30"] = Holiday(ymd: "2018-04-30", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2018-05-03"] = Holiday(ymd: "2018-05-03", week: "木", weekEn: "Thursday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2018-05-04"] = Holiday(ymd: "2018-05-04", week: "金", weekEn: "Friday", name: "みどりの日", nameEn: "Greenery Day") holidays["2018-05-05"] = Holiday(ymd: "2018-05-05", week: "土", weekEn: "Saturday", name: "こどもの日", nameEn: "Children's Day") @@ -759,41 +759,45 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2018-08-11"] = Holiday(ymd: "2018-08-11", week: "土", weekEn: "Saturday", name: "山の日", nameEn: "Mountain Day") holidays["2018-09-17"] = Holiday(ymd: "2018-09-17", week: "月", weekEn: "Monday", name: "敬老の日", nameEn: "Respect for the Aged Day") holidays["2018-09-23"] = Holiday(ymd: "2018-09-23", week: "日", weekEn: "Sunday", name: "秋分の日", nameEn: "Autumnal Equinox Day") - holidays["2018-09-24"] = Holiday(ymd: "2018-09-24", week: "月", weekEn: "Monday", name: "秋分の日 振替休日", nameEn: "Holiday in lieu") + holidays["2018-09-24"] = Holiday(ymd: "2018-09-24", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2018-10-08"] = Holiday(ymd: "2018-10-08", week: "月", weekEn: "Monday", name: "体育の日", nameEn: "Health and Sports Day") holidays["2018-11-03"] = Holiday(ymd: "2018-11-03", week: "土", weekEn: "Saturday", name: "文化の日", nameEn: "National Culture Day") holidays["2018-11-23"] = Holiday(ymd: "2018-11-23", week: "金", weekEn: "Friday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") holidays["2018-12-23"] = Holiday(ymd: "2018-12-23", week: "日", weekEn: "Sunday", name: "天皇誕生日", nameEn: "Emperor's Birthday") - holidays["2018-12-24"] = Holiday(ymd: "2018-12-24", week: "月", weekEn: "Monday", name: "天皇誕生日 振替休日", nameEn: "Holiday in lieu") + holidays["2018-12-24"] = Holiday(ymd: "2018-12-24", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2019-01-01"] = Holiday(ymd: "2019-01-01", week: "火", weekEn: "Tuesday", name: "元日", nameEn: "New Year's Day") holidays["2019-01-14"] = Holiday(ymd: "2019-01-14", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["2019-02-11"] = Holiday(ymd: "2019-02-11", week: "月", weekEn: "Monday", name: "建国記念の日", nameEn: "National Foundation Day") holidays["2019-03-21"] = Holiday(ymd: "2019-03-21", week: "木", weekEn: "Thursday", name: "春分の日", nameEn: "Vernal Equinox Day") holidays["2019-04-29"] = Holiday(ymd: "2019-04-29", week: "月", weekEn: "Monday", name: "昭和の日", nameEn: "Showa Day") + holidays["2019-04-30"] = Holiday(ymd: "2019-04-30", week: "火", weekEn: "Tuesday", name: "国民の休日", nameEn: "Holiday") + holidays["2019-05-01"] = Holiday(ymd: "2019-05-01", week: "水", weekEn: "Wednesday", name: "休日（祝日扱い）", nameEn: "Holiday") + holidays["2019-05-02"] = Holiday(ymd: "2019-05-02", week: "木", weekEn: "Thursday", name: "国民の休日", nameEn: "Holiday") holidays["2019-05-03"] = Holiday(ymd: "2019-05-03", week: "金", weekEn: "Friday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2019-05-04"] = Holiday(ymd: "2019-05-04", week: "土", weekEn: "Saturday", name: "みどりの日", nameEn: "Greenery Day") holidays["2019-05-05"] = Holiday(ymd: "2019-05-05", week: "日", weekEn: "Sunday", name: "こどもの日", nameEn: "Children's Day") - holidays["2019-05-06"] = Holiday(ymd: "2019-05-06", week: "月", weekEn: "Monday", name: "こどもの日 振替休日", nameEn: "Holiday in lieu") + holidays["2019-05-06"] = Holiday(ymd: "2019-05-06", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2019-07-15"] = Holiday(ymd: "2019-07-15", week: "月", weekEn: "Monday", name: "海の日", nameEn: "Marine Day") holidays["2019-08-11"] = Holiday(ymd: "2019-08-11", week: "日", weekEn: "Sunday", name: "山の日", nameEn: "Mountain Day") - holidays["2019-08-12"] = Holiday(ymd: "2019-08-12", week: "月", weekEn: "Monday", name: "山の日 振替休日", nameEn: "Holiday in lieu") + holidays["2019-08-12"] = Holiday(ymd: "2019-08-12", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2019-09-16"] = Holiday(ymd: "2019-09-16", week: "月", weekEn: "Monday", name: "敬老の日", nameEn: "Respect for the Aged Day") holidays["2019-09-23"] = Holiday(ymd: "2019-09-23", week: "月", weekEn: "Monday", name: "秋分の日", nameEn: "Autumnal Equinox Day") - holidays["2019-10-14"] = Holiday(ymd: "2019-10-14", week: "月", weekEn: "Monday", name: "体育の日", nameEn: "Health and Sports Day") + holidays["2019-10-14"] = Holiday(ymd: "2019-10-14", week: "月", weekEn: "Monday", name: "体育の日（スポーツの日）", nameEn: "Health and Sports Day") + holidays["2019-10-22"] = Holiday(ymd: "2019-10-22", week: "火", weekEn: "Tuesday", name: "休日（祝日扱い）", nameEn: "Holiday") holidays["2019-11-03"] = Holiday(ymd: "2019-11-03", week: "日", weekEn: "Sunday", name: "文化の日", nameEn: "National Culture Day") - holidays["2019-11-04"] = Holiday(ymd: "2019-11-04", week: "月", weekEn: "Monday", name: "文化の日 振替休日", nameEn: "Holiday in lieu") + holidays["2019-11-04"] = Holiday(ymd: "2019-11-04", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2019-11-23"] = Holiday(ymd: "2019-11-23", week: "土", weekEn: "Saturday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") holidays["2020-01-01"] = Holiday(ymd: "2020-01-01", week: "水", weekEn: "Wednesday", name: "元日", nameEn: "New Year's Day") holidays["2020-01-13"] = Holiday(ymd: "2020-01-13", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["2020-02-11"] = Holiday(ymd: "2020-02-11", week: "火", weekEn: "Tuesday", name: "建国記念の日", nameEn: "National Foundation Day") holidays["2020-02-23"] = Holiday(ymd: "2020-02-23", week: "日", weekEn: "Sunday", name: "天皇誕生日", nameEn: "Emperor's Birthday") - holidays["2020-02-24"] = Holiday(ymd: "2020-02-24", week: "月", weekEn: "Monday", name: "天皇誕生日 振替休日", nameEn: "Holiday in lieu") + holidays["2020-02-24"] = Holiday(ymd: "2020-02-24", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2020-03-20"] = Holiday(ymd: "2020-03-20", week: "金", weekEn: "Friday", name: "春分の日", nameEn: "Vernal Equinox Day") holidays["2020-04-29"] = Holiday(ymd: "2020-04-29", week: "水", weekEn: "Wednesday", name: "昭和の日", nameEn: "Showa Day") holidays["2020-05-03"] = Holiday(ymd: "2020-05-03", week: "日", weekEn: "Sunday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2020-05-04"] = Holiday(ymd: "2020-05-04", week: "月", weekEn: "Monday", name: "みどりの日", nameEn: "Greenery Day") holidays["2020-05-05"] = Holiday(ymd: "2020-05-05", week: "火", weekEn: "Tuesday", name: "こどもの日", nameEn: "Children's Day") - holidays["2020-05-06"] = Holiday(ymd: "2020-05-06", week: "水", weekEn: "Wednesday", name: "こどもの日 振替休日", nameEn: "Holiday in lieu") + holidays["2020-05-06"] = Holiday(ymd: "2020-05-06", week: "水", weekEn: "Wednesday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2020-07-23"] = Holiday(ymd: "2020-07-23", week: "木", weekEn: "Thursday", name: "海の日", nameEn: "Marine Day") holidays["2020-07-24"] = Holiday(ymd: "2020-07-24", week: "金", weekEn: "Friday", name: "スポーツの日", nameEn: "Health and Sports Day") holidays["2020-08-10"] = Holiday(ymd: "2020-08-10", week: "月", weekEn: "Monday", name: "山の日", nameEn: "Mountain Day") @@ -810,11 +814,12 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2021-05-03"] = Holiday(ymd: "2021-05-03", week: "月", weekEn: "Monday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2021-05-04"] = Holiday(ymd: "2021-05-04", week: "火", weekEn: "Tuesday", name: "みどりの日", nameEn: "Greenery Day") holidays["2021-05-05"] = Holiday(ymd: "2021-05-05", week: "水", weekEn: "Wednesday", name: "こどもの日", nameEn: "Children's Day") - holidays["2021-07-19"] = Holiday(ymd: "2021-07-19", week: "月", weekEn: "Monday", name: "海の日", nameEn: "Marine Day") - holidays["2021-08-11"] = Holiday(ymd: "2021-08-11", week: "水", weekEn: "Wednesday", name: "山の日", nameEn: "Mountain Day") + holidays["2021-07-22"] = Holiday(ymd: "2021-07-22", week: "木", weekEn: "Thursday", name: "海の日", nameEn: "Marine Day") + holidays["2021-07-23"] = Holiday(ymd: "2021-07-23", week: "金", weekEn: "Friday", name: "スポーツの日", nameEn: "Health and Sports Day") + holidays["2021-08-08"] = Holiday(ymd: "2021-08-08", week: "日", weekEn: "Sunday", name: "山の日", nameEn: "Mountain Day") + holidays["2021-08-09"] = Holiday(ymd: "2021-08-09", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2021-09-20"] = Holiday(ymd: "2021-09-20", week: "月", weekEn: "Monday", name: "敬老の日", nameEn: "Respect for the Aged Day") holidays["2021-09-23"] = Holiday(ymd: "2021-09-23", week: "木", weekEn: "Thursday", name: "秋分の日", nameEn: "Autumnal Equinox Day") - holidays["2021-10-11"] = Holiday(ymd: "2021-10-11", week: "月", weekEn: "Monday", name: "スポーツの日", nameEn: "Health and Sports Day") holidays["2021-11-03"] = Holiday(ymd: "2021-11-03", week: "水", weekEn: "Wednesday", name: "文化の日", nameEn: "National Culture Day") holidays["2021-11-23"] = Holiday(ymd: "2021-11-23", week: "火", weekEn: "Tuesday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") holidays["2022-01-01"] = Holiday(ymd: "2022-01-01", week: "土", weekEn: "Saturday", name: "元日", nameEn: "New Year's Day") @@ -834,7 +839,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2022-11-03"] = Holiday(ymd: "2022-11-03", week: "木", weekEn: "Thursday", name: "文化の日", nameEn: "National Culture Day") holidays["2022-11-23"] = Holiday(ymd: "2022-11-23", week: "水", weekEn: "Wednesday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") holidays["2023-01-01"] = Holiday(ymd: "2023-01-01", week: "日", weekEn: "Sunday", name: "元日", nameEn: "New Year's Day") - holidays["2023-01-02"] = Holiday(ymd: "2023-01-02", week: "月", weekEn: "Monday", name: "元日 振替休日", nameEn: "Holiday in lieu") + holidays["2023-01-02"] = Holiday(ymd: "2023-01-02", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2023-01-09"] = Holiday(ymd: "2023-01-09", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["2023-02-11"] = Holiday(ymd: "2023-02-11", week: "土", weekEn: "Saturday", name: "建国記念の日", nameEn: "National Foundation Day") holidays["2023-02-23"] = Holiday(ymd: "2023-02-23", week: "木", weekEn: "Thursday", name: "天皇誕生日", nameEn: "Emperor's Birthday") @@ -853,35 +858,35 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2024-01-01"] = Holiday(ymd: "2024-01-01", week: "月", weekEn: "Monday", name: "元日", nameEn: "New Year's Day") holidays["2024-01-08"] = Holiday(ymd: "2024-01-08", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["2024-02-11"] = Holiday(ymd: "2024-02-11", week: "日", weekEn: "Sunday", name: "建国記念の日", nameEn: "National Foundation Day") - holidays["2024-02-12"] = Holiday(ymd: "2024-02-12", week: "月", weekEn: "Monday", name: "建国記念の日 振替休日", nameEn: "Holiday in lieu") + holidays["2024-02-12"] = Holiday(ymd: "2024-02-12", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2024-02-23"] = Holiday(ymd: "2024-02-23", week: "金", weekEn: "Friday", name: "天皇誕生日", nameEn: "Emperor's Birthday") holidays["2024-03-20"] = Holiday(ymd: "2024-03-20", week: "水", weekEn: "Wednesday", name: "春分の日", nameEn: "Vernal Equinox Day") holidays["2024-04-29"] = Holiday(ymd: "2024-04-29", week: "月", weekEn: "Monday", name: "昭和の日", nameEn: "Showa Day") holidays["2024-05-03"] = Holiday(ymd: "2024-05-03", week: "金", weekEn: "Friday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2024-05-04"] = Holiday(ymd: "2024-05-04", week: "土", weekEn: "Saturday", name: "みどりの日", nameEn: "Greenery Day") holidays["2024-05-05"] = Holiday(ymd: "2024-05-05", week: "日", weekEn: "Sunday", name: "こどもの日", nameEn: "Children's Day") - holidays["2024-05-06"] = Holiday(ymd: "2024-05-06", week: "月", weekEn: "Monday", name: "こどもの日 振替休日", nameEn: "Holiday in lieu") + holidays["2024-05-06"] = Holiday(ymd: "2024-05-06", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2024-07-15"] = Holiday(ymd: "2024-07-15", week: "月", weekEn: "Monday", name: "海の日", nameEn: "Marine Day") holidays["2024-08-11"] = Holiday(ymd: "2024-08-11", week: "日", weekEn: "Sunday", name: "山の日", nameEn: "Mountain Day") - holidays["2024-08-12"] = Holiday(ymd: "2024-08-12", week: "月", weekEn: "Monday", name: "山の日 振替休日", nameEn: "Holiday in lieu") + holidays["2024-08-12"] = Holiday(ymd: "2024-08-12", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2024-09-16"] = Holiday(ymd: "2024-09-16", week: "月", weekEn: "Monday", name: "敬老の日", nameEn: "Respect for the Aged Day") holidays["2024-09-22"] = Holiday(ymd: "2024-09-22", week: "日", weekEn: "Sunday", name: "秋分の日", nameEn: "Autumnal Equinox Day") - holidays["2024-09-23"] = Holiday(ymd: "2024-09-23", week: "月", weekEn: "Monday", name: "秋分の日 振替休日", nameEn: "Holiday in lieu") + holidays["2024-09-23"] = Holiday(ymd: "2024-09-23", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2024-10-14"] = Holiday(ymd: "2024-10-14", week: "月", weekEn: "Monday", name: "スポーツの日", nameEn: "Health and Sports Day") holidays["2024-11-03"] = Holiday(ymd: "2024-11-03", week: "日", weekEn: "Sunday", name: "文化の日", nameEn: "National Culture Day") - holidays["2024-11-04"] = Holiday(ymd: "2024-11-04", week: "月", weekEn: "Monday", name: "文化の日 振替休日", nameEn: "Holiday in lieu") + holidays["2024-11-04"] = Holiday(ymd: "2024-11-04", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2024-11-23"] = Holiday(ymd: "2024-11-23", week: "土", weekEn: "Saturday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") holidays["2025-01-01"] = Holiday(ymd: "2025-01-01", week: "水", weekEn: "Wednesday", name: "元日", nameEn: "New Year's Day") holidays["2025-01-13"] = Holiday(ymd: "2025-01-13", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["2025-02-11"] = Holiday(ymd: "2025-02-11", week: "火", weekEn: "Tuesday", name: "建国記念の日", nameEn: "National Foundation Day") holidays["2025-02-23"] = Holiday(ymd: "2025-02-23", week: "日", weekEn: "Sunday", name: "天皇誕生日", nameEn: "Emperor's Birthday") - holidays["2025-02-24"] = Holiday(ymd: "2025-02-24", week: "月", weekEn: "Monday", name: "天皇誕生日 振替休日", nameEn: "Holiday in lieu") + holidays["2025-02-24"] = Holiday(ymd: "2025-02-24", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2025-03-20"] = Holiday(ymd: "2025-03-20", week: "木", weekEn: "Thursday", name: "春分の日", nameEn: "Vernal Equinox Day") holidays["2025-04-29"] = Holiday(ymd: "2025-04-29", week: "火", weekEn: "Tuesday", name: "昭和の日", nameEn: "Showa Day") holidays["2025-05-03"] = Holiday(ymd: "2025-05-03", week: "土", weekEn: "Saturday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2025-05-04"] = Holiday(ymd: "2025-05-04", week: "日", weekEn: "Sunday", name: "みどりの日", nameEn: "Greenery Day") holidays["2025-05-05"] = Holiday(ymd: "2025-05-05", week: "月", weekEn: "Monday", name: "こどもの日", nameEn: "Children's Day") - holidays["2025-05-06"] = Holiday(ymd: "2025-05-06", week: "火", weekEn: "Tuesday", name: "こどもの日 振替休日", nameEn: "Holiday in lieu") + holidays["2025-05-06"] = Holiday(ymd: "2025-05-06", week: "火", weekEn: "Tuesday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2025-07-21"] = Holiday(ymd: "2025-07-21", week: "月", weekEn: "Monday", name: "海の日", nameEn: "Marine Day") holidays["2025-08-11"] = Holiday(ymd: "2025-08-11", week: "月", weekEn: "Monday", name: "山の日", nameEn: "Mountain Day") holidays["2025-09-15"] = Holiday(ymd: "2025-09-15", week: "月", weekEn: "Monday", name: "敬老の日", nameEn: "Respect for the Aged Day") @@ -889,7 +894,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2025-10-13"] = Holiday(ymd: "2025-10-13", week: "月", weekEn: "Monday", name: "スポーツの日", nameEn: "Health and Sports Day") holidays["2025-11-03"] = Holiday(ymd: "2025-11-03", week: "月", weekEn: "Monday", name: "文化の日", nameEn: "National Culture Day") holidays["2025-11-23"] = Holiday(ymd: "2025-11-23", week: "日", weekEn: "Sunday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") - holidays["2025-11-24"] = Holiday(ymd: "2025-11-24", week: "月", weekEn: "Monday", name: "勤労感謝の日 振替休日", nameEn: "Holiday in lieu") + holidays["2025-11-24"] = Holiday(ymd: "2025-11-24", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2026-01-01"] = Holiday(ymd: "2026-01-01", week: "木", weekEn: "Thursday", name: "元日", nameEn: "New Year's Day") holidays["2026-01-12"] = Holiday(ymd: "2026-01-12", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["2026-02-11"] = Holiday(ymd: "2026-02-11", week: "水", weekEn: "Wednesday", name: "建国記念の日", nameEn: "National Foundation Day") @@ -899,7 +904,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2026-05-03"] = Holiday(ymd: "2026-05-03", week: "日", weekEn: "Sunday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2026-05-04"] = Holiday(ymd: "2026-05-04", week: "月", weekEn: "Monday", name: "みどりの日", nameEn: "Greenery Day") holidays["2026-05-05"] = Holiday(ymd: "2026-05-05", week: "火", weekEn: "Tuesday", name: "こどもの日", nameEn: "Children's Day") - holidays["2026-05-06"] = Holiday(ymd: "2026-05-06", week: "水", weekEn: "Wednesday", name: "こどもの日 振替休日", nameEn: "Holiday in lieu") + holidays["2026-05-06"] = Holiday(ymd: "2026-05-06", week: "水", weekEn: "Wednesday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2026-07-20"] = Holiday(ymd: "2026-07-20", week: "月", weekEn: "Monday", name: "海の日", nameEn: "Marine Day") holidays["2026-08-11"] = Holiday(ymd: "2026-08-11", week: "火", weekEn: "Tuesday", name: "山の日", nameEn: "Mountain Day") holidays["2026-09-21"] = Holiday(ymd: "2026-09-21", week: "月", weekEn: "Monday", name: "敬老の日", nameEn: "Respect for the Aged Day") @@ -913,7 +918,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2027-02-11"] = Holiday(ymd: "2027-02-11", week: "木", weekEn: "Thursday", name: "建国記念の日", nameEn: "National Foundation Day") holidays["2027-02-23"] = Holiday(ymd: "2027-02-23", week: "火", weekEn: "Tuesday", name: "天皇誕生日", nameEn: "Emperor's Birthday") holidays["2027-03-21"] = Holiday(ymd: "2027-03-21", week: "日", weekEn: "Sunday", name: "春分の日", nameEn: "Vernal Equinox Day") - holidays["2027-03-22"] = Holiday(ymd: "2027-03-22", week: "月", weekEn: "Monday", name: "春分の日 振替休日", nameEn: "Holiday in lieu") + holidays["2027-03-22"] = Holiday(ymd: "2027-03-22", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2027-04-29"] = Holiday(ymd: "2027-04-29", week: "木", weekEn: "Thursday", name: "昭和の日", nameEn: "Showa Day") holidays["2027-05-03"] = Holiday(ymd: "2027-05-03", week: "月", weekEn: "Monday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2027-05-04"] = Holiday(ymd: "2027-05-04", week: "火", weekEn: "Tuesday", name: "みどりの日", nameEn: "Greenery Day") @@ -944,11 +949,11 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2029-01-01"] = Holiday(ymd: "2029-01-01", week: "月", weekEn: "Monday", name: "元日", nameEn: "New Year's Day") holidays["2029-01-08"] = Holiday(ymd: "2029-01-08", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["2029-02-11"] = Holiday(ymd: "2029-02-11", week: "日", weekEn: "Sunday", name: "建国記念の日", nameEn: "National Foundation Day") - holidays["2029-02-12"] = Holiday(ymd: "2029-02-12", week: "月", weekEn: "Monday", name: "建国記念の日 振替休日", nameEn: "Holiday in lieu") + holidays["2029-02-12"] = Holiday(ymd: "2029-02-12", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2029-02-23"] = Holiday(ymd: "2029-02-23", week: "金", weekEn: "Friday", name: "天皇誕生日", nameEn: "Emperor's Birthday") holidays["2029-03-20"] = Holiday(ymd: "2029-03-20", week: "火", weekEn: "Tuesday", name: "春分の日", nameEn: "Vernal Equinox Day") holidays["2029-04-29"] = Holiday(ymd: "2029-04-29", week: "日", weekEn: "Sunday", name: "昭和の日", nameEn: "Showa Day") - holidays["2029-04-30"] = Holiday(ymd: "2029-04-30", week: "月", weekEn: "Monday", name: "昭和の日 振替休日", nameEn: "Holiday in lieu") + holidays["2029-04-30"] = Holiday(ymd: "2029-04-30", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2029-05-03"] = Holiday(ymd: "2029-05-03", week: "木", weekEn: "Thursday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2029-05-04"] = Holiday(ymd: "2029-05-04", week: "金", weekEn: "Friday", name: "みどりの日", nameEn: "Greenery Day") holidays["2029-05-05"] = Holiday(ymd: "2029-05-05", week: "土", weekEn: "Saturday", name: "こどもの日", nameEn: "Children's Day") @@ -956,7 +961,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2029-08-11"] = Holiday(ymd: "2029-08-11", week: "土", weekEn: "Saturday", name: "山の日", nameEn: "Mountain Day") holidays["2029-09-17"] = Holiday(ymd: "2029-09-17", week: "月", weekEn: "Monday", name: "敬老の日", nameEn: "Respect for the Aged Day") holidays["2029-09-23"] = Holiday(ymd: "2029-09-23", week: "日", weekEn: "Sunday", name: "秋分の日", nameEn: "Autumnal Equinox Day") - holidays["2029-09-24"] = Holiday(ymd: "2029-09-24", week: "月", weekEn: "Monday", name: "秋分の日 振替休日", nameEn: "Holiday in lieu") + holidays["2029-09-24"] = Holiday(ymd: "2029-09-24", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2029-10-08"] = Holiday(ymd: "2029-10-08", week: "月", weekEn: "Monday", name: "スポーツの日", nameEn: "Health and Sports Day") holidays["2029-11-03"] = Holiday(ymd: "2029-11-03", week: "土", weekEn: "Saturday", name: "文化の日", nameEn: "National Culture Day") holidays["2029-11-23"] = Holiday(ymd: "2029-11-23", week: "金", weekEn: "Friday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") @@ -969,27 +974,27 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2030-05-03"] = Holiday(ymd: "2030-05-03", week: "金", weekEn: "Friday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2030-05-04"] = Holiday(ymd: "2030-05-04", week: "土", weekEn: "Saturday", name: "みどりの日", nameEn: "Greenery Day") holidays["2030-05-05"] = Holiday(ymd: "2030-05-05", week: "日", weekEn: "Sunday", name: "こどもの日", nameEn: "Children's Day") - holidays["2030-05-06"] = Holiday(ymd: "2030-05-06", week: "月", weekEn: "Monday", name: "こどもの日 振替休日", nameEn: "Holiday in lieu") + holidays["2030-05-06"] = Holiday(ymd: "2030-05-06", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2030-07-15"] = Holiday(ymd: "2030-07-15", week: "月", weekEn: "Monday", name: "海の日", nameEn: "Marine Day") holidays["2030-08-11"] = Holiday(ymd: "2030-08-11", week: "日", weekEn: "Sunday", name: "山の日", nameEn: "Mountain Day") - holidays["2030-08-12"] = Holiday(ymd: "2030-08-12", week: "月", weekEn: "Monday", name: "山の日 振替休日", nameEn: "Holiday in lieu") + holidays["2030-08-12"] = Holiday(ymd: "2030-08-12", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2030-09-16"] = Holiday(ymd: "2030-09-16", week: "月", weekEn: "Monday", name: "敬老の日", nameEn: "Respect for the Aged Day") holidays["2030-09-23"] = Holiday(ymd: "2030-09-23", week: "月", weekEn: "Monday", name: "秋分の日", nameEn: "Autumnal Equinox Day") holidays["2030-10-14"] = Holiday(ymd: "2030-10-14", week: "月", weekEn: "Monday", name: "スポーツの日", nameEn: "Health and Sports Day") holidays["2030-11-03"] = Holiday(ymd: "2030-11-03", week: "日", weekEn: "Sunday", name: "文化の日", nameEn: "National Culture Day") - holidays["2030-11-04"] = Holiday(ymd: "2030-11-04", week: "月", weekEn: "Monday", name: "文化の日 振替休日", nameEn: "Holiday in lieu") + holidays["2030-11-04"] = Holiday(ymd: "2030-11-04", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2030-11-23"] = Holiday(ymd: "2030-11-23", week: "土", weekEn: "Saturday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") holidays["2031-01-01"] = Holiday(ymd: "2031-01-01", week: "水", weekEn: "Wednesday", name: "元日", nameEn: "New Year's Day") holidays["2031-01-13"] = Holiday(ymd: "2031-01-13", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["2031-02-11"] = Holiday(ymd: "2031-02-11", week: "火", weekEn: "Tuesday", name: "建国記念の日", nameEn: "National Foundation Day") holidays["2031-02-23"] = Holiday(ymd: "2031-02-23", week: "日", weekEn: "Sunday", name: "天皇誕生日", nameEn: "Emperor's Birthday") - holidays["2031-02-24"] = Holiday(ymd: "2031-02-24", week: "月", weekEn: "Monday", name: "天皇誕生日 振替休日", nameEn: "Holiday in lieu") + holidays["2031-02-24"] = Holiday(ymd: "2031-02-24", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2031-03-21"] = Holiday(ymd: "2031-03-21", week: "金", weekEn: "Friday", name: "春分の日", nameEn: "Vernal Equinox Day") holidays["2031-04-29"] = Holiday(ymd: "2031-04-29", week: "火", weekEn: "Tuesday", name: "昭和の日", nameEn: "Showa Day") holidays["2031-05-03"] = Holiday(ymd: "2031-05-03", week: "土", weekEn: "Saturday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2031-05-04"] = Holiday(ymd: "2031-05-04", week: "日", weekEn: "Sunday", name: "みどりの日", nameEn: "Greenery Day") holidays["2031-05-05"] = Holiday(ymd: "2031-05-05", week: "月", weekEn: "Monday", name: "こどもの日", nameEn: "Children's Day") - holidays["2031-05-06"] = Holiday(ymd: "2031-05-06", week: "火", weekEn: "Tuesday", name: "こどもの日 振替休日", nameEn: "Holiday in lieu") + holidays["2031-05-06"] = Holiday(ymd: "2031-05-06", week: "火", weekEn: "Tuesday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2031-07-21"] = Holiday(ymd: "2031-07-21", week: "月", weekEn: "Monday", name: "海の日", nameEn: "Marine Day") holidays["2031-08-11"] = Holiday(ymd: "2031-08-11", week: "月", weekEn: "Monday", name: "山の日", nameEn: "Mountain Day") holidays["2031-09-15"] = Holiday(ymd: "2031-09-15", week: "月", weekEn: "Monday", name: "敬老の日", nameEn: "Respect for the Aged Day") @@ -997,7 +1002,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2031-10-13"] = Holiday(ymd: "2031-10-13", week: "月", weekEn: "Monday", name: "スポーツの日", nameEn: "Health and Sports Day") holidays["2031-11-03"] = Holiday(ymd: "2031-11-03", week: "月", weekEn: "Monday", name: "文化の日", nameEn: "National Culture Day") holidays["2031-11-23"] = Holiday(ymd: "2031-11-23", week: "日", weekEn: "Sunday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") - holidays["2031-11-24"] = Holiday(ymd: "2031-11-24", week: "月", weekEn: "Monday", name: "勤労感謝の日 振替休日", nameEn: "Holiday in lieu") + holidays["2031-11-24"] = Holiday(ymd: "2031-11-24", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2032-01-01"] = Holiday(ymd: "2032-01-01", week: "木", weekEn: "Thursday", name: "元日", nameEn: "New Year's Day") holidays["2032-01-12"] = Holiday(ymd: "2032-01-12", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["2032-02-11"] = Holiday(ymd: "2032-02-11", week: "水", weekEn: "Wednesday", name: "建国記念の日", nameEn: "National Foundation Day") @@ -1020,7 +1025,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2033-02-11"] = Holiday(ymd: "2033-02-11", week: "金", weekEn: "Friday", name: "建国記念の日", nameEn: "National Foundation Day") holidays["2033-02-23"] = Holiday(ymd: "2033-02-23", week: "水", weekEn: "Wednesday", name: "天皇誕生日", nameEn: "Emperor's Birthday") holidays["2033-03-20"] = Holiday(ymd: "2033-03-20", week: "日", weekEn: "Sunday", name: "春分の日", nameEn: "Vernal Equinox Day") - holidays["2033-03-21"] = Holiday(ymd: "2033-03-21", week: "月", weekEn: "Monday", name: "春分の日 振替休日", nameEn: "Holiday in lieu") + holidays["2033-03-21"] = Holiday(ymd: "2033-03-21", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2033-04-29"] = Holiday(ymd: "2033-04-29", week: "金", weekEn: "Friday", name: "昭和の日", nameEn: "Showa Day") holidays["2033-05-03"] = Holiday(ymd: "2033-05-03", week: "火", weekEn: "Tuesday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2033-05-04"] = Holiday(ymd: "2033-05-04", week: "水", weekEn: "Wednesday", name: "みどりの日", nameEn: "Greenery Day") @@ -1033,7 +1038,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2033-11-03"] = Holiday(ymd: "2033-11-03", week: "木", weekEn: "Thursday", name: "文化の日", nameEn: "National Culture Day") holidays["2033-11-23"] = Holiday(ymd: "2033-11-23", week: "水", weekEn: "Wednesday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") holidays["2034-01-01"] = Holiday(ymd: "2034-01-01", week: "日", weekEn: "Sunday", name: "元日", nameEn: "New Year's Day") - holidays["2034-01-02"] = Holiday(ymd: "2034-01-02", week: "月", weekEn: "Monday", name: "元日 振替休日", nameEn: "Holiday in lieu") + holidays["2034-01-02"] = Holiday(ymd: "2034-01-02", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2034-01-09"] = Holiday(ymd: "2034-01-09", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["2034-02-11"] = Holiday(ymd: "2034-02-11", week: "土", weekEn: "Saturday", name: "建国記念の日", nameEn: "National Foundation Day") holidays["2034-02-23"] = Holiday(ymd: "2034-02-23", week: "木", weekEn: "Thursday", name: "天皇誕生日", nameEn: "Emperor's Birthday") @@ -1052,11 +1057,11 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2035-01-01"] = Holiday(ymd: "2035-01-01", week: "月", weekEn: "Monday", name: "元日", nameEn: "New Year's Day") holidays["2035-01-08"] = Holiday(ymd: "2035-01-08", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["2035-02-11"] = Holiday(ymd: "2035-02-11", week: "日", weekEn: "Sunday", name: "建国記念の日", nameEn: "National Foundation Day") - holidays["2035-02-12"] = Holiday(ymd: "2035-02-12", week: "月", weekEn: "Monday", name: "建国記念の日 振替休日", nameEn: "Holiday in lieu") + holidays["2035-02-12"] = Holiday(ymd: "2035-02-12", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2035-02-23"] = Holiday(ymd: "2035-02-23", week: "金", weekEn: "Friday", name: "天皇誕生日", nameEn: "Emperor's Birthday") holidays["2035-03-21"] = Holiday(ymd: "2035-03-21", week: "水", weekEn: "Wednesday", name: "春分の日", nameEn: "Vernal Equinox Day") holidays["2035-04-29"] = Holiday(ymd: "2035-04-29", week: "日", weekEn: "Sunday", name: "昭和の日", nameEn: "Showa Day") - holidays["2035-04-30"] = Holiday(ymd: "2035-04-30", week: "月", weekEn: "Monday", name: "昭和の日 振替休日", nameEn: "Holiday in lieu") + holidays["2035-04-30"] = Holiday(ymd: "2035-04-30", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2035-05-03"] = Holiday(ymd: "2035-05-03", week: "木", weekEn: "Thursday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2035-05-04"] = Holiday(ymd: "2035-05-04", week: "金", weekEn: "Friday", name: "みどりの日", nameEn: "Greenery Day") holidays["2035-05-05"] = Holiday(ymd: "2035-05-05", week: "土", weekEn: "Saturday", name: "こどもの日", nameEn: "Children's Day") @@ -1064,7 +1069,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2035-08-11"] = Holiday(ymd: "2035-08-11", week: "土", weekEn: "Saturday", name: "山の日", nameEn: "Mountain Day") holidays["2035-09-17"] = Holiday(ymd: "2035-09-17", week: "月", weekEn: "Monday", name: "敬老の日", nameEn: "Respect for the Aged Day") holidays["2035-09-23"] = Holiday(ymd: "2035-09-23", week: "日", weekEn: "Sunday", name: "秋分の日", nameEn: "Autumnal Equinox Day") - holidays["2035-09-24"] = Holiday(ymd: "2035-09-24", week: "月", weekEn: "Monday", name: "秋分の日 振替休日", nameEn: "Holiday in lieu") + holidays["2035-09-24"] = Holiday(ymd: "2035-09-24", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2035-10-08"] = Holiday(ymd: "2035-10-08", week: "月", weekEn: "Monday", name: "スポーツの日", nameEn: "Health and Sports Day") holidays["2035-11-03"] = Holiday(ymd: "2035-11-03", week: "土", weekEn: "Saturday", name: "文化の日", nameEn: "National Culture Day") holidays["2035-11-23"] = Holiday(ymd: "2035-11-23", week: "金", weekEn: "Friday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") @@ -1077,7 +1082,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2036-05-03"] = Holiday(ymd: "2036-05-03", week: "土", weekEn: "Saturday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2036-05-04"] = Holiday(ymd: "2036-05-04", week: "日", weekEn: "Sunday", name: "みどりの日", nameEn: "Greenery Day") holidays["2036-05-05"] = Holiday(ymd: "2036-05-05", week: "月", weekEn: "Monday", name: "こどもの日", nameEn: "Children's Day") - holidays["2036-05-06"] = Holiday(ymd: "2036-05-06", week: "火", weekEn: "Tuesday", name: "こどもの日 振替休日", nameEn: "Holiday in lieu") + holidays["2036-05-06"] = Holiday(ymd: "2036-05-06", week: "火", weekEn: "Tuesday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2036-07-21"] = Holiday(ymd: "2036-07-21", week: "月", weekEn: "Monday", name: "海の日", nameEn: "Marine Day") holidays["2036-08-11"] = Holiday(ymd: "2036-08-11", week: "月", weekEn: "Monday", name: "山の日", nameEn: "Mountain Day") holidays["2036-09-15"] = Holiday(ymd: "2036-09-15", week: "月", weekEn: "Monday", name: "敬老の日", nameEn: "Respect for the Aged Day") @@ -1085,7 +1090,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2036-10-13"] = Holiday(ymd: "2036-10-13", week: "月", weekEn: "Monday", name: "スポーツの日", nameEn: "Health and Sports Day") holidays["2036-11-03"] = Holiday(ymd: "2036-11-03", week: "月", weekEn: "Monday", name: "文化の日", nameEn: "National Culture Day") holidays["2036-11-23"] = Holiday(ymd: "2036-11-23", week: "日", weekEn: "Sunday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") - holidays["2036-11-24"] = Holiday(ymd: "2036-11-24", week: "月", weekEn: "Monday", name: "勤労感謝の日 振替休日", nameEn: "Holiday in lieu") + holidays["2036-11-24"] = Holiday(ymd: "2036-11-24", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2037-01-01"] = Holiday(ymd: "2037-01-01", week: "木", weekEn: "Thursday", name: "元日", nameEn: "New Year's Day") holidays["2037-01-12"] = Holiday(ymd: "2037-01-12", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["2037-02-11"] = Holiday(ymd: "2037-02-11", week: "水", weekEn: "Wednesday", name: "建国記念の日", nameEn: "National Foundation Day") @@ -1095,7 +1100,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2037-05-03"] = Holiday(ymd: "2037-05-03", week: "日", weekEn: "Sunday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2037-05-04"] = Holiday(ymd: "2037-05-04", week: "月", weekEn: "Monday", name: "みどりの日", nameEn: "Greenery Day") holidays["2037-05-05"] = Holiday(ymd: "2037-05-05", week: "火", weekEn: "Tuesday", name: "こどもの日", nameEn: "Children's Day") - holidays["2037-05-06"] = Holiday(ymd: "2037-05-06", week: "水", weekEn: "Wednesday", name: "こどもの日 振替休日", nameEn: "Holiday in lieu") + holidays["2037-05-06"] = Holiday(ymd: "2037-05-06", week: "水", weekEn: "Wednesday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2037-07-20"] = Holiday(ymd: "2037-07-20", week: "月", weekEn: "Monday", name: "海の日", nameEn: "Marine Day") holidays["2037-08-11"] = Holiday(ymd: "2037-08-11", week: "火", weekEn: "Tuesday", name: "山の日", nameEn: "Mountain Day") holidays["2037-09-21"] = Holiday(ymd: "2037-09-21", week: "月", weekEn: "Monday", name: "敬老の日", nameEn: "Respect for the Aged Day") @@ -1137,13 +1142,13 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2039-11-03"] = Holiday(ymd: "2039-11-03", week: "木", weekEn: "Thursday", name: "文化の日", nameEn: "National Culture Day") holidays["2039-11-23"] = Holiday(ymd: "2039-11-23", week: "水", weekEn: "Wednesday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") holidays["2040-01-01"] = Holiday(ymd: "2040-01-01", week: "日", weekEn: "Sunday", name: "元日", nameEn: "New Year's Day") - holidays["2040-01-02"] = Holiday(ymd: "2040-01-02", week: "月", weekEn: "Monday", name: "元日 振替休日", nameEn: "Holiday in lieu") + holidays["2040-01-02"] = Holiday(ymd: "2040-01-02", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2040-01-09"] = Holiday(ymd: "2040-01-09", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["2040-02-11"] = Holiday(ymd: "2040-02-11", week: "土", weekEn: "Saturday", name: "建国記念の日", nameEn: "National Foundation Day") holidays["2040-02-23"] = Holiday(ymd: "2040-02-23", week: "木", weekEn: "Thursday", name: "天皇誕生日", nameEn: "Emperor's Birthday") holidays["2040-03-20"] = Holiday(ymd: "2040-03-20", week: "火", weekEn: "Tuesday", name: "春分の日", nameEn: "Vernal Equinox Day") holidays["2040-04-29"] = Holiday(ymd: "2040-04-29", week: "日", weekEn: "Sunday", name: "昭和の日", nameEn: "Showa Day") - holidays["2040-04-30"] = Holiday(ymd: "2040-04-30", week: "月", weekEn: "Monday", name: "昭和の日 振替休日", nameEn: "Holiday in lieu") + holidays["2040-04-30"] = Holiday(ymd: "2040-04-30", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2040-05-03"] = Holiday(ymd: "2040-05-03", week: "木", weekEn: "Thursday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2040-05-04"] = Holiday(ymd: "2040-05-04", week: "金", weekEn: "Friday", name: "みどりの日", nameEn: "Greenery Day") holidays["2040-05-05"] = Holiday(ymd: "2040-05-05", week: "土", weekEn: "Saturday", name: "こどもの日", nameEn: "Children's Day") @@ -1163,27 +1168,27 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2041-05-03"] = Holiday(ymd: "2041-05-03", week: "金", weekEn: "Friday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2041-05-04"] = Holiday(ymd: "2041-05-04", week: "土", weekEn: "Saturday", name: "みどりの日", nameEn: "Greenery Day") holidays["2041-05-05"] = Holiday(ymd: "2041-05-05", week: "日", weekEn: "Sunday", name: "こどもの日", nameEn: "Children's Day") - holidays["2041-05-06"] = Holiday(ymd: "2041-05-06", week: "月", weekEn: "Monday", name: "こどもの日 振替休日", nameEn: "Holiday in lieu") + holidays["2041-05-06"] = Holiday(ymd: "2041-05-06", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2041-07-15"] = Holiday(ymd: "2041-07-15", week: "月", weekEn: "Monday", name: "海の日", nameEn: "Marine Day") holidays["2041-08-11"] = Holiday(ymd: "2041-08-11", week: "日", weekEn: "Sunday", name: "山の日", nameEn: "Mountain Day") - holidays["2041-08-12"] = Holiday(ymd: "2041-08-12", week: "月", weekEn: "Monday", name: "山の日 振替休日", nameEn: "Holiday in lieu") + holidays["2041-08-12"] = Holiday(ymd: "2041-08-12", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2041-09-16"] = Holiday(ymd: "2041-09-16", week: "月", weekEn: "Monday", name: "敬老の日", nameEn: "Respect for the Aged Day") holidays["2041-09-23"] = Holiday(ymd: "2041-09-23", week: "月", weekEn: "Monday", name: "秋分の日", nameEn: "Autumnal Equinox Day") holidays["2041-10-14"] = Holiday(ymd: "2041-10-14", week: "月", weekEn: "Monday", name: "スポーツの日", nameEn: "Health and Sports Day") holidays["2041-11-03"] = Holiday(ymd: "2041-11-03", week: "日", weekEn: "Sunday", name: "文化の日", nameEn: "National Culture Day") - holidays["2041-11-04"] = Holiday(ymd: "2041-11-04", week: "月", weekEn: "Monday", name: "文化の日 振替休日", nameEn: "Holiday in lieu") + holidays["2041-11-04"] = Holiday(ymd: "2041-11-04", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2041-11-23"] = Holiday(ymd: "2041-11-23", week: "土", weekEn: "Saturday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") holidays["2042-01-01"] = Holiday(ymd: "2042-01-01", week: "水", weekEn: "Wednesday", name: "元日", nameEn: "New Year's Day") holidays["2042-01-13"] = Holiday(ymd: "2042-01-13", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["2042-02-11"] = Holiday(ymd: "2042-02-11", week: "火", weekEn: "Tuesday", name: "建国記念の日", nameEn: "National Foundation Day") holidays["2042-02-23"] = Holiday(ymd: "2042-02-23", week: "日", weekEn: "Sunday", name: "天皇誕生日", nameEn: "Emperor's Birthday") - holidays["2042-02-24"] = Holiday(ymd: "2042-02-24", week: "月", weekEn: "Monday", name: "天皇誕生日 振替休日", nameEn: "Holiday in lieu") + holidays["2042-02-24"] = Holiday(ymd: "2042-02-24", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2042-03-20"] = Holiday(ymd: "2042-03-20", week: "木", weekEn: "Thursday", name: "春分の日", nameEn: "Vernal Equinox Day") holidays["2042-04-29"] = Holiday(ymd: "2042-04-29", week: "火", weekEn: "Tuesday", name: "昭和の日", nameEn: "Showa Day") holidays["2042-05-03"] = Holiday(ymd: "2042-05-03", week: "土", weekEn: "Saturday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2042-05-04"] = Holiday(ymd: "2042-05-04", week: "日", weekEn: "Sunday", name: "みどりの日", nameEn: "Greenery Day") holidays["2042-05-05"] = Holiday(ymd: "2042-05-05", week: "月", weekEn: "Monday", name: "こどもの日", nameEn: "Children's Day") - holidays["2042-05-06"] = Holiday(ymd: "2042-05-06", week: "火", weekEn: "Tuesday", name: "こどもの日 振替休日", nameEn: "Holiday in lieu") + holidays["2042-05-06"] = Holiday(ymd: "2042-05-06", week: "火", weekEn: "Tuesday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2042-07-21"] = Holiday(ymd: "2042-07-21", week: "月", weekEn: "Monday", name: "海の日", nameEn: "Marine Day") holidays["2042-08-11"] = Holiday(ymd: "2042-08-11", week: "月", weekEn: "Monday", name: "山の日", nameEn: "Mountain Day") holidays["2042-09-15"] = Holiday(ymd: "2042-09-15", week: "月", weekEn: "Monday", name: "敬老の日", nameEn: "Respect for the Aged Day") @@ -1191,7 +1196,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2042-10-13"] = Holiday(ymd: "2042-10-13", week: "月", weekEn: "Monday", name: "スポーツの日", nameEn: "Health and Sports Day") holidays["2042-11-03"] = Holiday(ymd: "2042-11-03", week: "月", weekEn: "Monday", name: "文化の日", nameEn: "National Culture Day") holidays["2042-11-23"] = Holiday(ymd: "2042-11-23", week: "日", weekEn: "Sunday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") - holidays["2042-11-24"] = Holiday(ymd: "2042-11-24", week: "月", weekEn: "Monday", name: "勤労感謝の日 振替休日", nameEn: "Holiday in lieu") + holidays["2042-11-24"] = Holiday(ymd: "2042-11-24", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2043-01-01"] = Holiday(ymd: "2043-01-01", week: "木", weekEn: "Thursday", name: "元日", nameEn: "New Year's Day") holidays["2043-01-12"] = Holiday(ymd: "2043-01-12", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["2043-02-11"] = Holiday(ymd: "2043-02-11", week: "水", weekEn: "Wednesday", name: "建国記念の日", nameEn: "National Foundation Day") @@ -1201,7 +1206,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2043-05-03"] = Holiday(ymd: "2043-05-03", week: "日", weekEn: "Sunday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2043-05-04"] = Holiday(ymd: "2043-05-04", week: "月", weekEn: "Monday", name: "みどりの日", nameEn: "Greenery Day") holidays["2043-05-05"] = Holiday(ymd: "2043-05-05", week: "火", weekEn: "Tuesday", name: "こどもの日", nameEn: "Children's Day") - holidays["2043-05-06"] = Holiday(ymd: "2043-05-06", week: "水", weekEn: "Wednesday", name: "こどもの日 振替休日", nameEn: "Holiday in lieu") + holidays["2043-05-06"] = Holiday(ymd: "2043-05-06", week: "水", weekEn: "Wednesday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2043-07-20"] = Holiday(ymd: "2043-07-20", week: "月", weekEn: "Monday", name: "海の日", nameEn: "Marine Day") holidays["2043-08-11"] = Holiday(ymd: "2043-08-11", week: "火", weekEn: "Tuesday", name: "山の日", nameEn: "Mountain Day") holidays["2043-09-21"] = Holiday(ymd: "2043-09-21", week: "月", weekEn: "Monday", name: "敬老の日", nameEn: "Respect for the Aged Day") @@ -1215,7 +1220,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2044-02-11"] = Holiday(ymd: "2044-02-11", week: "木", weekEn: "Thursday", name: "建国記念の日", nameEn: "National Foundation Day") holidays["2044-02-23"] = Holiday(ymd: "2044-02-23", week: "火", weekEn: "Tuesday", name: "天皇誕生日", nameEn: "Emperor's Birthday") holidays["2044-03-20"] = Holiday(ymd: "2044-03-20", week: "日", weekEn: "Sunday", name: "春分の日", nameEn: "Vernal Equinox Day") - holidays["2044-03-21"] = Holiday(ymd: "2044-03-21", week: "月", weekEn: "Monday", name: "春分の日 振替休日", nameEn: "Holiday in lieu") + holidays["2044-03-21"] = Holiday(ymd: "2044-03-21", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2044-04-29"] = Holiday(ymd: "2044-04-29", week: "金", weekEn: "Friday", name: "昭和の日", nameEn: "Showa Day") holidays["2044-05-03"] = Holiday(ymd: "2044-05-03", week: "火", weekEn: "Tuesday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2044-05-04"] = Holiday(ymd: "2044-05-04", week: "水", weekEn: "Wednesday", name: "みどりの日", nameEn: "Greenery Day") @@ -1228,7 +1233,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2044-11-03"] = Holiday(ymd: "2044-11-03", week: "木", weekEn: "Thursday", name: "文化の日", nameEn: "National Culture Day") holidays["2044-11-23"] = Holiday(ymd: "2044-11-23", week: "水", weekEn: "Wednesday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") holidays["2045-01-01"] = Holiday(ymd: "2045-01-01", week: "日", weekEn: "Sunday", name: "元日", nameEn: "New Year's Day") - holidays["2045-01-02"] = Holiday(ymd: "2045-01-02", week: "月", weekEn: "Monday", name: "元日 振替休日", nameEn: "Holiday in lieu") + holidays["2045-01-02"] = Holiday(ymd: "2045-01-02", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2045-01-09"] = Holiday(ymd: "2045-01-09", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["2045-02-11"] = Holiday(ymd: "2045-02-11", week: "土", weekEn: "Saturday", name: "建国記念の日", nameEn: "National Foundation Day") holidays["2045-02-23"] = Holiday(ymd: "2045-02-23", week: "木", weekEn: "Thursday", name: "天皇誕生日", nameEn: "Emperor's Birthday") @@ -1247,11 +1252,11 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2046-01-01"] = Holiday(ymd: "2046-01-01", week: "月", weekEn: "Monday", name: "元日", nameEn: "New Year's Day") holidays["2046-01-08"] = Holiday(ymd: "2046-01-08", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["2046-02-11"] = Holiday(ymd: "2046-02-11", week: "日", weekEn: "Sunday", name: "建国記念の日", nameEn: "National Foundation Day") - holidays["2046-02-12"] = Holiday(ymd: "2046-02-12", week: "月", weekEn: "Monday", name: "建国記念の日 振替休日", nameEn: "Holiday in lieu") + holidays["2046-02-12"] = Holiday(ymd: "2046-02-12", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2046-02-23"] = Holiday(ymd: "2046-02-23", week: "金", weekEn: "Friday", name: "天皇誕生日", nameEn: "Emperor's Birthday") holidays["2046-03-20"] = Holiday(ymd: "2046-03-20", week: "火", weekEn: "Tuesday", name: "春分の日", nameEn: "Vernal Equinox Day") holidays["2046-04-29"] = Holiday(ymd: "2046-04-29", week: "日", weekEn: "Sunday", name: "昭和の日", nameEn: "Showa Day") - holidays["2046-04-30"] = Holiday(ymd: "2046-04-30", week: "月", weekEn: "Monday", name: "昭和の日 振替休日", nameEn: "Holiday in lieu") + holidays["2046-04-30"] = Holiday(ymd: "2046-04-30", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2046-05-03"] = Holiday(ymd: "2046-05-03", week: "木", weekEn: "Thursday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2046-05-04"] = Holiday(ymd: "2046-05-04", week: "金", weekEn: "Friday", name: "みどりの日", nameEn: "Greenery Day") holidays["2046-05-05"] = Holiday(ymd: "2046-05-05", week: "土", weekEn: "Saturday", name: "こどもの日", nameEn: "Children's Day") @@ -1259,7 +1264,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2046-08-11"] = Holiday(ymd: "2046-08-11", week: "土", weekEn: "Saturday", name: "山の日", nameEn: "Mountain Day") holidays["2046-09-17"] = Holiday(ymd: "2046-09-17", week: "月", weekEn: "Monday", name: "敬老の日", nameEn: "Respect for the Aged Day") holidays["2046-09-23"] = Holiday(ymd: "2046-09-23", week: "日", weekEn: "Sunday", name: "秋分の日", nameEn: "Autumnal Equinox Day") - holidays["2046-09-24"] = Holiday(ymd: "2046-09-24", week: "月", weekEn: "Monday", name: "秋分の日 振替休日", nameEn: "Holiday in lieu") + holidays["2046-09-24"] = Holiday(ymd: "2046-09-24", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2046-10-08"] = Holiday(ymd: "2046-10-08", week: "月", weekEn: "Monday", name: "スポーツの日", nameEn: "Health and Sports Day") holidays["2046-11-03"] = Holiday(ymd: "2046-11-03", week: "土", weekEn: "Saturday", name: "文化の日", nameEn: "National Culture Day") holidays["2046-11-23"] = Holiday(ymd: "2046-11-23", week: "金", weekEn: "Friday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") @@ -1272,27 +1277,27 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2047-05-03"] = Holiday(ymd: "2047-05-03", week: "金", weekEn: "Friday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2047-05-04"] = Holiday(ymd: "2047-05-04", week: "土", weekEn: "Saturday", name: "みどりの日", nameEn: "Greenery Day") holidays["2047-05-05"] = Holiday(ymd: "2047-05-05", week: "日", weekEn: "Sunday", name: "こどもの日", nameEn: "Children's Day") - holidays["2047-05-06"] = Holiday(ymd: "2047-05-06", week: "月", weekEn: "Monday", name: "こどもの日 振替休日", nameEn: "Holiday in lieu") + holidays["2047-05-06"] = Holiday(ymd: "2047-05-06", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2047-07-15"] = Holiday(ymd: "2047-07-15", week: "月", weekEn: "Monday", name: "海の日", nameEn: "Marine Day") holidays["2047-08-11"] = Holiday(ymd: "2047-08-11", week: "日", weekEn: "Sunday", name: "山の日", nameEn: "Mountain Day") - holidays["2047-08-12"] = Holiday(ymd: "2047-08-12", week: "月", weekEn: "Monday", name: "山の日 振替休日", nameEn: "Holiday in lieu") + holidays["2047-08-12"] = Holiday(ymd: "2047-08-12", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2047-09-16"] = Holiday(ymd: "2047-09-16", week: "月", weekEn: "Monday", name: "敬老の日", nameEn: "Respect for the Aged Day") holidays["2047-09-23"] = Holiday(ymd: "2047-09-23", week: "月", weekEn: "Monday", name: "秋分の日", nameEn: "Autumnal Equinox Day") holidays["2047-10-14"] = Holiday(ymd: "2047-10-14", week: "月", weekEn: "Monday", name: "スポーツの日", nameEn: "Health and Sports Day") holidays["2047-11-03"] = Holiday(ymd: "2047-11-03", week: "日", weekEn: "Sunday", name: "文化の日", nameEn: "National Culture Day") - holidays["2047-11-04"] = Holiday(ymd: "2047-11-04", week: "月", weekEn: "Monday", name: "文化の日 振替休日", nameEn: "Holiday in lieu") + holidays["2047-11-04"] = Holiday(ymd: "2047-11-04", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2047-11-23"] = Holiday(ymd: "2047-11-23", week: "土", weekEn: "Saturday", name: "勤労感謝の日", nameEn: "Labor Thanksgiving Day") holidays["2048-01-01"] = Holiday(ymd: "2048-01-01", week: "水", weekEn: "Wednesday", name: "元日", nameEn: "New Year's Day") holidays["2048-01-13"] = Holiday(ymd: "2048-01-13", week: "月", weekEn: "Monday", name: "成人の日", nameEn: "Coming of Age Day") holidays["2048-02-11"] = Holiday(ymd: "2048-02-11", week: "火", weekEn: "Tuesday", name: "建国記念の日", nameEn: "National Foundation Day") holidays["2048-02-23"] = Holiday(ymd: "2048-02-23", week: "日", weekEn: "Sunday", name: "天皇誕生日", nameEn: "Emperor's Birthday") - holidays["2048-02-24"] = Holiday(ymd: "2048-02-24", week: "月", weekEn: "Monday", name: "天皇誕生日 振替休日", nameEn: "Holiday in lieu") + holidays["2048-02-24"] = Holiday(ymd: "2048-02-24", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2048-03-20"] = Holiday(ymd: "2048-03-20", week: "金", weekEn: "Friday", name: "春分の日", nameEn: "Vernal Equinox Day") holidays["2048-04-29"] = Holiday(ymd: "2048-04-29", week: "水", weekEn: "Wednesday", name: "昭和の日", nameEn: "Showa Day") holidays["2048-05-03"] = Holiday(ymd: "2048-05-03", week: "日", weekEn: "Sunday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2048-05-04"] = Holiday(ymd: "2048-05-04", week: "月", weekEn: "Monday", name: "みどりの日", nameEn: "Greenery Day") holidays["2048-05-05"] = Holiday(ymd: "2048-05-05", week: "火", weekEn: "Tuesday", name: "こどもの日", nameEn: "Children's Day") - holidays["2048-05-06"] = Holiday(ymd: "2048-05-06", week: "水", weekEn: "Wednesday", name: "こどもの日 振替休日", nameEn: "Holiday in lieu") + holidays["2048-05-06"] = Holiday(ymd: "2048-05-06", week: "水", weekEn: "Wednesday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2048-07-20"] = Holiday(ymd: "2048-07-20", week: "月", weekEn: "Monday", name: "海の日", nameEn: "Marine Day") holidays["2048-08-11"] = Holiday(ymd: "2048-08-11", week: "火", weekEn: "Tuesday", name: "山の日", nameEn: "Mountain Day") holidays["2048-09-21"] = Holiday(ymd: "2048-09-21", week: "月", weekEn: "Monday", name: "敬老の日", nameEn: "Respect for the Aged Day") @@ -1322,7 +1327,7 @@ fileprivate func newHolidays() -> [String: Holiday] { holidays["2050-02-11"] = Holiday(ymd: "2050-02-11", week: "金", weekEn: "Friday", name: "建国記念の日", nameEn: "National Foundation Day") holidays["2050-02-23"] = Holiday(ymd: "2050-02-23", week: "水", weekEn: "Wednesday", name: "天皇誕生日", nameEn: "Emperor's Birthday") holidays["2050-03-20"] = Holiday(ymd: "2050-03-20", week: "日", weekEn: "Sunday", name: "春分の日", nameEn: "Vernal Equinox Day") - holidays["2050-03-21"] = Holiday(ymd: "2050-03-21", week: "月", weekEn: "Monday", name: "春分の日 振替休日", nameEn: "Holiday in lieu") + holidays["2050-03-21"] = Holiday(ymd: "2050-03-21", week: "月", weekEn: "Monday", name: "振替休日", nameEn: "Holiday in lieu") holidays["2050-04-29"] = Holiday(ymd: "2050-04-29", week: "金", weekEn: "Friday", name: "昭和の日", nameEn: "Showa Day") holidays["2050-05-03"] = Holiday(ymd: "2050-05-03", week: "火", weekEn: "Tuesday", name: "憲法記念日", nameEn: "Constitution Memorial Day") holidays["2050-05-04"] = Holiday(ymd: "2050-05-04", week: "水", weekEn: "Wednesday", name: "みどりの日", nameEn: "Greenery Day") From 80f641eda675cd2df65ad9dc51e316564b420e3a Mon Sep 17 00:00:00 2001 From: nnsnodnb Date: Tue, 17 Oct 2023 23:38:42 +0900 Subject: [PATCH 4/4] Fix tests --- Tests/HolidayJpTests/HolidayJpTests.swift | 41 ++++++++++++++--------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/Tests/HolidayJpTests/HolidayJpTests.swift b/Tests/HolidayJpTests/HolidayJpTests.swift index 8b0b712..d8c296e 100644 --- a/Tests/HolidayJpTests/HolidayJpTests.swift +++ b/Tests/HolidayJpTests/HolidayJpTests.swift @@ -33,16 +33,18 @@ class HolidayJpTests: XCTestCase { func test_isHoliday_year_month_day() { // should be holiday returns date is holiday or not - XCTAssertTrue(HolidayJp.isHoliday(year: 2011, month: 9, day: 19)) - XCTAssertFalse(HolidayJp.isHoliday(year: 2011, month: 9, day: 18)) - + XCTAssertTrue(HolidayJp.isHoliday(year: 2011, month: 9, day: 19), "2011-09-19 is holiday") + XCTAssertFalse(HolidayJp.isHoliday(year: 2011, month: 9, day: 18), "2011-09-18 is not holiday") + // should be Mountain Day from 2016 - XCTAssertFalse(HolidayJp.isHoliday(year: 2015, month: 8, day: 11)) + XCTAssertFalse(HolidayJp.isHoliday(year: 2015, month: 8, day: 11), "2015-08-11 is not holiday") for i in 2016..<2051 { if i == 2020 { // Tokyo Olympic - XCTAssertTrue(HolidayJp.isHoliday(year: i, month: 8, day: 10)) + XCTAssertTrue(HolidayJp.isHoliday(year: i, month: 8, day: 10), "\(i)-08-10 is holiday") + } else if i == 2021 { // Tokyo Olympic + XCTAssertTrue(HolidayJp.isHoliday(year: i, month: 7, day: 23), "\(i)-07-23 is holiday") } else { - XCTAssertTrue(HolidayJp.isHoliday(year: i, month: 8, day: 11)) + XCTAssertTrue(HolidayJp.isHoliday(year: i, month: 8, day: 11), "\(i)-08-11 is holiday") } } } @@ -53,24 +55,31 @@ class HolidayJpTests: XCTestCase { // should be holiday returns date is holiday or not let date1 = calendar.date(from: DateComponents(year: 2011, month: 9, day: 19))! let date2 = calendar.date(from: DateComponents(year: 2011, month: 9, day: 18))! - XCTAssertTrue(HolidayJp.isHoliday(date1)) - XCTAssertTrue(HolidayJp.isHoliday(date1, calendar: calendar)) - XCTAssertFalse(HolidayJp.isHoliday(date2)) - XCTAssertFalse(HolidayJp.isHoliday(date2, calendar: calendar)) - + XCTAssertTrue(HolidayJp.isHoliday(date1), "2011-09-19 is holiday") + XCTAssertTrue(HolidayJp.isHoliday(date1, calendar: calendar), "2011-09-19 is holiday") + XCTAssertFalse(HolidayJp.isHoliday(date2), "2011-09-18 is not holiday") + XCTAssertFalse(HolidayJp.isHoliday(date2, calendar: calendar), "2011-09-18 is not holiday") + // should be Mountain Day from 2016 let date3 = calendar.date(from: DateComponents(year: 2015, month: 8, day: 11))! XCTAssertFalse(HolidayJp.isHoliday(date3)) XCTAssertFalse(HolidayJp.isHoliday(date3, calendar: calendar)) for i in 2016..<2051 { - let date4: Date + let month: Int + let day: Int if i == 2020 { // Tokyo Olympic - date4 = calendar.date(from: DateComponents(year: i, month: 8, day: 10))! + month = 8 + day = 10 + } else if i == 2021 { // Tokyo Olympic + month = 7 + day = 23 } else { - date4 = calendar.date(from: DateComponents(year: i, month: 8, day: 11))! + month = 8 + day = 11 } - XCTAssertTrue(HolidayJp.isHoliday(date4)) - XCTAssertTrue(HolidayJp.isHoliday(date4, calendar: calendar)) + let date4 = calendar.date(from: DateComponents(year: i, month: month, day: day))! + XCTAssertTrue(HolidayJp.isHoliday(date4), String(format: "%4d-%0.2d-%0.2d is holiday", i, month, day)) + XCTAssertTrue(HolidayJp.isHoliday(date4, calendar: calendar), String(format: "%4d-%0.2d-%0.2d is holiday", i, month, day)) } }