From bab7fad0e72e82638919585ccf717cce96d27ef0 Mon Sep 17 00:00:00 2001 From: ~Jhellico Date: Mon, 23 Sep 2024 00:43:05 +0300 Subject: [PATCH 1/2] Update Japan holidays --- holidays/countries/japan.py | 52 +++--- snapshots/countries/JP_COMMON.json | 267 ++++++++++++----------------- tests/countries/test_japan.py | 33 ++-- 3 files changed, 150 insertions(+), 202 deletions(-) diff --git a/holidays/countries/japan.py b/holidays/countries/japan.py index 83f3793c2..567544429 100644 --- a/holidays/countries/japan.py +++ b/holidays/countries/japan.py @@ -51,29 +51,34 @@ def __init__(self, *args, **kwargs) -> None: kwargs.setdefault("observed_rule", SUN_TO_NEXT_WORKDAY) super().__init__(*args, **kwargs) + def _is_observed(self, dt: date) -> bool: + return dt >= date(1973, APR, 12) + def _populate_observed(self, dts: Set[date]) -> None: # When a national holiday falls on Sunday, next working day - # shall become a public holiday (振替休日) - substitute holidays. + # shall become a public holiday (振替休日) - substitute holiday. for dt in sorted(dts): - is_observed, dt_observed = self._add_observed( - dt, - # Substitute Holiday. - name=tr("振替休日"), - show_observed_label=False, - ) - if is_observed: - dts.add(dt_observed) # type: ignore[arg-type] - - # A weekday between national holidays becomes - # a holiday too (国民の休日) - national holidays. - for dt in dts: - if _timedelta(dt, +2) not in dts: - continue - dt_observed = _timedelta(dt, +1) - if self._is_sunday(dt_observed) or dt_observed in dts: - continue - # National Holiday. - self._add_holiday(tr("国民の休日"), dt_observed) + # Substitute Holiday. + self._add_observed(dt, name=tr("振替休日"), show_observed_label=False) + + # A weekday between national holidays becomes a holiday too (国民の休日) - + # national holiday. + # In 1986-2006 it was only May 4 (between Constitution Day and Children's Day). + # Since 2006, it may be only the day between Respect for the Aged Day and + # Autumnal Equinox Day (in September). + if self._year <= 1985: + return None + if self._year <= 2006: + may_4 = (MAY, 4) + if not (self._is_monday(may_4) or self._is_sunday(may_4)): + # National Holiday. + self._add_holiday(tr("国民の休日"), may_4) + else: + for dt in dts: + if dt.month == SEP and _timedelta(dt, +2) in dts: + # National Holiday. + self._add_holiday(tr("国民の休日"), _timedelta(dt, +1)) + break def _populate_public_holidays(self): if self._year < 1949 or self._year > 2099: @@ -147,11 +152,7 @@ def _populate_public_holidays(self): } # Mountain Day. name = tr("山の日") - dts_observed.add( - self._add_holiday(name, dates[self._year]) - if self._year in dates - else self._add_holiday_aug_11(name) - ) + dts_observed.add(self._add_holiday(name, dates.get(self._year, (AUG, 11)))) if self._year >= 1966: # Respect for the Aged Day. @@ -204,6 +205,7 @@ def _populate_bank_holidays(self): # Bank Holiday. name = tr("銀行休業日") + self._add_new_years_day(name) self._add_new_years_day_two(name) self._add_new_years_day_three(name) self._add_new_years_eve(name) diff --git a/snapshots/countries/JP_COMMON.json b/snapshots/countries/JP_COMMON.json index 1fe3cc0d4..95f9920c4 100644 --- a/snapshots/countries/JP_COMMON.json +++ b/snapshots/countries/JP_COMMON.json @@ -1,33 +1,29 @@ { - "1950-01-01": "New Year's Day", - "1950-01-02": "Bank Holiday; Substitute Holiday", + "1950-01-01": "Bank Holiday; New Year's Day", + "1950-01-02": "Bank Holiday", "1950-01-03": "Bank Holiday", "1950-01-15": "Coming of Age Day", - "1950-01-16": "Substitute Holiday", "1950-03-21": "Vernal Equinox Day", "1950-04-29": "Emperor's Birthday", "1950-05-03": "Constitution Day", - "1950-05-04": "National Holiday", "1950-05-05": "Children's Day", "1950-09-23": "Autumnal Equinox", "1950-11-03": "Culture Day", "1950-11-23": "Labor Thanksgiving Day", "1950-12-31": "Bank Holiday", - "1951-01-01": "New Year's Day", + "1951-01-01": "Bank Holiday; New Year's Day", "1951-01-02": "Bank Holiday", "1951-01-03": "Bank Holiday", "1951-01-15": "Coming of Age Day", "1951-03-21": "Vernal Equinox Day", "1951-04-29": "Emperor's Birthday", - "1951-04-30": "Substitute Holiday", "1951-05-03": "Constitution Day", - "1951-05-04": "National Holiday", "1951-05-05": "Children's Day", "1951-09-24": "Autumnal Equinox", "1951-11-03": "Culture Day", "1951-11-23": "Labor Thanksgiving Day", "1951-12-31": "Bank Holiday", - "1952-01-01": "New Year's Day", + "1952-01-01": "Bank Holiday; New Year's Day", "1952-01-02": "Bank Holiday", "1952-01-03": "Bank Holiday", "1952-01-15": "Coming of Age Day", @@ -38,80 +34,68 @@ "1952-09-23": "Autumnal Equinox", "1952-11-03": "Culture Day", "1952-11-23": "Labor Thanksgiving Day", - "1952-11-24": "Substitute Holiday", "1952-12-31": "Bank Holiday", - "1953-01-01": "New Year's Day", + "1953-01-01": "Bank Holiday; New Year's Day", "1953-01-02": "Bank Holiday", "1953-01-03": "Bank Holiday", "1953-01-15": "Coming of Age Day", "1953-03-21": "Vernal Equinox Day", "1953-04-29": "Emperor's Birthday", "1953-05-03": "Constitution Day", - "1953-05-04": "Substitute Holiday", "1953-05-05": "Children's Day", "1953-09-23": "Autumnal Equinox", "1953-11-03": "Culture Day", "1953-11-23": "Labor Thanksgiving Day", "1953-12-31": "Bank Holiday", - "1954-01-01": "New Year's Day", + "1954-01-01": "Bank Holiday; New Year's Day", "1954-01-02": "Bank Holiday", "1954-01-03": "Bank Holiday", "1954-01-15": "Coming of Age Day", "1954-03-21": "Vernal Equinox Day", - "1954-03-22": "Substitute Holiday", "1954-04-29": "Emperor's Birthday", "1954-05-03": "Constitution Day", - "1954-05-04": "National Holiday", "1954-05-05": "Children's Day", "1954-09-23": "Autumnal Equinox", "1954-11-03": "Culture Day", "1954-11-23": "Labor Thanksgiving Day", "1954-12-31": "Bank Holiday", - "1955-01-01": "New Year's Day", + "1955-01-01": "Bank Holiday; New Year's Day", "1955-01-02": "Bank Holiday", "1955-01-03": "Bank Holiday", "1955-01-15": "Coming of Age Day", "1955-03-21": "Vernal Equinox Day", "1955-04-29": "Emperor's Birthday", "1955-05-03": "Constitution Day", - "1955-05-04": "National Holiday", "1955-05-05": "Children's Day", "1955-09-24": "Autumnal Equinox", "1955-11-03": "Culture Day", "1955-11-23": "Labor Thanksgiving Day", "1955-12-31": "Bank Holiday", - "1956-01-01": "New Year's Day", - "1956-01-02": "Bank Holiday; Substitute Holiday", + "1956-01-01": "Bank Holiday; New Year's Day", + "1956-01-02": "Bank Holiday", "1956-01-03": "Bank Holiday", "1956-01-15": "Coming of Age Day", - "1956-01-16": "Substitute Holiday", "1956-03-21": "Vernal Equinox Day", "1956-04-29": "Emperor's Birthday", - "1956-04-30": "Substitute Holiday", "1956-05-03": "Constitution Day", - "1956-05-04": "National Holiday", "1956-05-05": "Children's Day", "1956-09-23": "Autumnal Equinox", - "1956-09-24": "Substitute Holiday", "1956-11-03": "Culture Day", "1956-11-23": "Labor Thanksgiving Day", "1956-12-31": "Bank Holiday", - "1957-01-01": "New Year's Day", + "1957-01-01": "Bank Holiday; New Year's Day", "1957-01-02": "Bank Holiday", "1957-01-03": "Bank Holiday", "1957-01-15": "Coming of Age Day", "1957-03-21": "Vernal Equinox Day", "1957-04-29": "Emperor's Birthday", "1957-05-03": "Constitution Day", - "1957-05-04": "National Holiday", "1957-05-05": "Children's Day", - "1957-05-06": "Substitute Holiday", "1957-09-23": "Autumnal Equinox", "1957-11-03": "Culture Day", - "1957-11-04": "Substitute Holiday", "1957-11-23": "Labor Thanksgiving Day", "1957-12-31": "Bank Holiday", - "1958-01-01": "New Year's Day", + "1958-01-01": "Bank Holiday; New Year's Day", "1958-01-02": "Bank Holiday", "1958-01-03": "Bank Holiday", "1958-01-15": "Coming of Age Day", @@ -122,9 +106,8 @@ "1958-09-23": "Autumnal Equinox", "1958-11-03": "Culture Day", "1958-11-23": "Labor Thanksgiving Day", - "1958-11-24": "Substitute Holiday", "1958-12-31": "Bank Holiday", - "1959-01-01": "New Year's Day", + "1959-01-01": "Bank Holiday; New Year's Day", "1959-01-02": "Bank Holiday", "1959-01-03": "Bank Holiday", "1959-01-15": "Coming of Age Day", @@ -132,105 +115,90 @@ "1959-04-10": "The Crown Prince Marriage Ceremony", "1959-04-29": "Emperor's Birthday", "1959-05-03": "Constitution Day", - "1959-05-04": "Substitute Holiday", "1959-05-05": "Children's Day", "1959-09-24": "Autumnal Equinox", "1959-11-03": "Culture Day", "1959-11-23": "Labor Thanksgiving Day", "1959-12-31": "Bank Holiday", - "1960-01-01": "New Year's Day", + "1960-01-01": "Bank Holiday; New Year's Day", "1960-01-02": "Bank Holiday", "1960-01-03": "Bank Holiday", "1960-01-15": "Coming of Age Day", "1960-03-20": "Vernal Equinox Day", - "1960-03-21": "Substitute Holiday", "1960-04-29": "Emperor's Birthday", "1960-05-03": "Constitution Day", - "1960-05-04": "National Holiday", "1960-05-05": "Children's Day", "1960-09-23": "Autumnal Equinox", "1960-11-03": "Culture Day", "1960-11-23": "Labor Thanksgiving Day", "1960-12-31": "Bank Holiday", - "1961-01-01": "New Year's Day", - "1961-01-02": "Bank Holiday; Substitute Holiday", + "1961-01-01": "Bank Holiday; New Year's Day", + "1961-01-02": "Bank Holiday", "1961-01-03": "Bank Holiday", "1961-01-15": "Coming of Age Day", - "1961-01-16": "Substitute Holiday", "1961-03-21": "Vernal Equinox Day", "1961-04-29": "Emperor's Birthday", "1961-05-03": "Constitution Day", - "1961-05-04": "National Holiday", "1961-05-05": "Children's Day", "1961-09-23": "Autumnal Equinox", "1961-11-03": "Culture Day", "1961-11-23": "Labor Thanksgiving Day", "1961-12-31": "Bank Holiday", - "1962-01-01": "New Year's Day", + "1962-01-01": "Bank Holiday; New Year's Day", "1962-01-02": "Bank Holiday", "1962-01-03": "Bank Holiday", "1962-01-15": "Coming of Age Day", "1962-03-21": "Vernal Equinox Day", "1962-04-29": "Emperor's Birthday", - "1962-04-30": "Substitute Holiday", "1962-05-03": "Constitution Day", - "1962-05-04": "National Holiday", "1962-05-05": "Children's Day", "1962-09-23": "Autumnal Equinox", - "1962-09-24": "Substitute Holiday", "1962-11-03": "Culture Day", "1962-11-23": "Labor Thanksgiving Day", "1962-12-31": "Bank Holiday", - "1963-01-01": "New Year's Day", + "1963-01-01": "Bank Holiday; New Year's Day", "1963-01-02": "Bank Holiday", "1963-01-03": "Bank Holiday", "1963-01-15": "Coming of Age Day", "1963-03-21": "Vernal Equinox Day", "1963-04-29": "Emperor's Birthday", "1963-05-03": "Constitution Day", - "1963-05-04": "National Holiday", "1963-05-05": "Children's Day", - "1963-05-06": "Substitute Holiday", "1963-09-24": "Autumnal Equinox", "1963-11-03": "Culture Day", - "1963-11-04": "Substitute Holiday", "1963-11-23": "Labor Thanksgiving Day", "1963-12-31": "Bank Holiday", - "1964-01-01": "New Year's Day", + "1964-01-01": "Bank Holiday; New Year's Day", "1964-01-02": "Bank Holiday", "1964-01-03": "Bank Holiday", "1964-01-15": "Coming of Age Day", "1964-03-20": "Vernal Equinox Day", "1964-04-29": "Emperor's Birthday", "1964-05-03": "Constitution Day", - "1964-05-04": "Substitute Holiday", "1964-05-05": "Children's Day", "1964-09-23": "Autumnal Equinox", "1964-11-03": "Culture Day", "1964-11-23": "Labor Thanksgiving Day", "1964-12-31": "Bank Holiday", - "1965-01-01": "New Year's Day", + "1965-01-01": "Bank Holiday; New Year's Day", "1965-01-02": "Bank Holiday", "1965-01-03": "Bank Holiday", "1965-01-15": "Coming of Age Day", "1965-03-21": "Vernal Equinox Day", - "1965-03-22": "Substitute Holiday", "1965-04-29": "Emperor's Birthday", "1965-05-03": "Constitution Day", - "1965-05-04": "National Holiday", "1965-05-05": "Children's Day", "1965-09-23": "Autumnal Equinox", "1965-11-03": "Culture Day", "1965-11-23": "Labor Thanksgiving Day", "1965-12-31": "Bank Holiday", - "1966-01-01": "New Year's Day", + "1966-01-01": "Bank Holiday; New Year's Day", "1966-01-02": "Bank Holiday", "1966-01-03": "Bank Holiday", "1966-01-15": "Coming of Age Day", "1966-03-21": "Vernal Equinox Day", "1966-04-29": "Emperor's Birthday", "1966-05-03": "Constitution Day", - "1966-05-04": "National Holiday", "1966-05-05": "Children's Day", "1966-09-15": "Respect for the Aged Day", "1966-09-23": "Autumnal Equinox", @@ -238,45 +206,37 @@ "1966-11-03": "Culture Day", "1966-11-23": "Labor Thanksgiving Day", "1966-12-31": "Bank Holiday", - "1967-01-01": "New Year's Day", - "1967-01-02": "Bank Holiday; Substitute Holiday", + "1967-01-01": "Bank Holiday; New Year's Day", + "1967-01-02": "Bank Holiday", "1967-01-03": "Bank Holiday", "1967-01-15": "Coming of Age Day", - "1967-01-16": "Substitute Holiday", "1967-02-11": "Foundation Day", "1967-03-21": "Vernal Equinox Day", "1967-04-29": "Emperor's Birthday", "1967-05-03": "Constitution Day", - "1967-05-04": "National Holiday", "1967-05-05": "Children's Day", "1967-09-15": "Respect for the Aged Day", "1967-09-24": "Autumnal Equinox", - "1967-09-25": "Substitute Holiday", "1967-10-10": "Physical Education Day", "1967-11-03": "Culture Day", "1967-11-23": "Labor Thanksgiving Day", "1967-12-31": "Bank Holiday", - "1968-01-01": "New Year's Day", + "1968-01-01": "Bank Holiday; New Year's Day", "1968-01-02": "Bank Holiday", "1968-01-03": "Bank Holiday", "1968-01-15": "Coming of Age Day", "1968-02-11": "Foundation Day", - "1968-02-12": "Substitute Holiday", "1968-03-20": "Vernal Equinox Day", "1968-04-29": "Emperor's Birthday", "1968-05-03": "Constitution Day", - "1968-05-04": "National Holiday", "1968-05-05": "Children's Day", - "1968-05-06": "Substitute Holiday", "1968-09-15": "Respect for the Aged Day", - "1968-09-16": "Substitute Holiday", "1968-09-23": "Autumnal Equinox", "1968-10-10": "Physical Education Day", "1968-11-03": "Culture Day", - "1968-11-04": "Substitute Holiday", "1968-11-23": "Labor Thanksgiving Day", "1968-12-31": "Bank Holiday", - "1969-01-01": "New Year's Day", + "1969-01-01": "Bank Holiday; New Year's Day", "1969-01-02": "Bank Holiday", "1969-01-03": "Bank Holiday", "1969-01-15": "Coming of Age Day", @@ -290,9 +250,8 @@ "1969-10-10": "Physical Education Day", "1969-11-03": "Culture Day", "1969-11-23": "Labor Thanksgiving Day", - "1969-11-24": "Substitute Holiday", "1969-12-31": "Bank Holiday", - "1970-01-01": "New Year's Day", + "1970-01-01": "Bank Holiday; New Year's Day", "1970-01-02": "Bank Holiday", "1970-01-03": "Bank Holiday", "1970-01-15": "Coming of Age Day", @@ -300,7 +259,6 @@ "1970-03-21": "Vernal Equinox Day", "1970-04-29": "Emperor's Birthday", "1970-05-03": "Constitution Day", - "1970-05-04": "Substitute Holiday", "1970-05-05": "Children's Day", "1970-09-15": "Respect for the Aged Day", "1970-09-23": "Autumnal Equinox", @@ -308,25 +266,22 @@ "1970-11-03": "Culture Day", "1970-11-23": "Labor Thanksgiving Day", "1970-12-31": "Bank Holiday", - "1971-01-01": "New Year's Day", + "1971-01-01": "Bank Holiday; New Year's Day", "1971-01-02": "Bank Holiday", "1971-01-03": "Bank Holiday", "1971-01-15": "Coming of Age Day", "1971-02-11": "Foundation Day", "1971-03-21": "Vernal Equinox Day", - "1971-03-22": "Substitute Holiday", "1971-04-29": "Emperor's Birthday", "1971-05-03": "Constitution Day", - "1971-05-04": "National Holiday", "1971-05-05": "Children's Day", "1971-09-15": "Respect for the Aged Day", "1971-09-24": "Autumnal Equinox", "1971-10-10": "Physical Education Day", - "1971-10-11": "Substitute Holiday", "1971-11-03": "Culture Day", "1971-11-23": "Labor Thanksgiving Day", "1971-12-31": "Bank Holiday", - "1972-01-01": "New Year's Day", + "1972-01-01": "Bank Holiday; New Year's Day", "1972-01-02": "Bank Holiday", "1972-01-03": "Bank Holiday", "1972-01-15": "Coming of Age Day", @@ -334,7 +289,6 @@ "1972-03-20": "Vernal Equinox Day", "1972-04-29": "Emperor's Birthday", "1972-05-03": "Constitution Day", - "1972-05-04": "National Holiday", "1972-05-05": "Children's Day", "1972-09-15": "Respect for the Aged Day", "1972-09-23": "Autumnal Equinox", @@ -342,17 +296,15 @@ "1972-11-03": "Culture Day", "1972-11-23": "Labor Thanksgiving Day", "1972-12-31": "Bank Holiday", - "1973-01-01": "New Year's Day", + "1973-01-01": "Bank Holiday; New Year's Day", "1973-01-02": "Bank Holiday", "1973-01-03": "Bank Holiday", "1973-01-15": "Coming of Age Day", "1973-02-11": "Foundation Day", - "1973-02-12": "Substitute Holiday", "1973-03-21": "Vernal Equinox Day", "1973-04-29": "Emperor's Birthday", "1973-04-30": "Substitute Holiday", "1973-05-03": "Constitution Day", - "1973-05-04": "National Holiday", "1973-05-05": "Children's Day", "1973-09-15": "Respect for the Aged Day", "1973-09-23": "Autumnal Equinox", @@ -361,7 +313,7 @@ "1973-11-03": "Culture Day", "1973-11-23": "Labor Thanksgiving Day", "1973-12-31": "Bank Holiday", - "1974-01-01": "New Year's Day", + "1974-01-01": "Bank Holiday; New Year's Day", "1974-01-02": "Bank Holiday", "1974-01-03": "Bank Holiday", "1974-01-15": "Coming of Age Day", @@ -369,7 +321,6 @@ "1974-03-21": "Vernal Equinox Day", "1974-04-29": "Emperor's Birthday", "1974-05-03": "Constitution Day", - "1974-05-04": "National Holiday", "1974-05-05": "Children's Day", "1974-05-06": "Substitute Holiday", "1974-09-15": "Respect for the Aged Day", @@ -380,7 +331,7 @@ "1974-11-04": "Substitute Holiday", "1974-11-23": "Labor Thanksgiving Day", "1974-12-31": "Bank Holiday", - "1975-01-01": "New Year's Day", + "1975-01-01": "Bank Holiday; New Year's Day", "1975-01-02": "Bank Holiday", "1975-01-03": "Bank Holiday", "1975-01-15": "Coming of Age Day", @@ -396,7 +347,7 @@ "1975-11-23": "Labor Thanksgiving Day", "1975-11-24": "Substitute Holiday", "1975-12-31": "Bank Holiday", - "1976-01-01": "New Year's Day", + "1976-01-01": "Bank Holiday; New Year's Day", "1976-01-02": "Bank Holiday", "1976-01-03": "Bank Holiday", "1976-01-15": "Coming of Age Day", @@ -404,7 +355,6 @@ "1976-03-20": "Vernal Equinox Day", "1976-04-29": "Emperor's Birthday", "1976-05-03": "Constitution Day", - "1976-05-04": "National Holiday", "1976-05-05": "Children's Day", "1976-09-15": "Respect for the Aged Day", "1976-09-23": "Autumnal Equinox", @@ -413,7 +363,7 @@ "1976-11-03": "Culture Day", "1976-11-23": "Labor Thanksgiving Day", "1976-12-31": "Bank Holiday", - "1977-01-01": "New Year's Day", + "1977-01-01": "Bank Holiday; New Year's Day", "1977-01-02": "Bank Holiday", "1977-01-03": "Bank Holiday", "1977-01-15": "Coming of Age Day", @@ -421,7 +371,6 @@ "1977-03-21": "Vernal Equinox Day", "1977-04-29": "Emperor's Birthday", "1977-05-03": "Constitution Day", - "1977-05-04": "National Holiday", "1977-05-05": "Children's Day", "1977-09-15": "Respect for the Aged Day", "1977-09-23": "Autumnal Equinox", @@ -429,7 +378,7 @@ "1977-11-03": "Culture Day", "1977-11-23": "Labor Thanksgiving Day", "1977-12-31": "Bank Holiday", - "1978-01-01": "New Year's Day", + "1978-01-01": "Bank Holiday; New Year's Day", "1978-01-02": "Bank Holiday; Substitute Holiday", "1978-01-03": "Bank Holiday", "1978-01-15": "Coming of Age Day", @@ -438,7 +387,6 @@ "1978-03-21": "Vernal Equinox Day", "1978-04-29": "Emperor's Birthday", "1978-05-03": "Constitution Day", - "1978-05-04": "National Holiday", "1978-05-05": "Children's Day", "1978-09-15": "Respect for the Aged Day", "1978-09-23": "Autumnal Equinox", @@ -446,7 +394,7 @@ "1978-11-03": "Culture Day", "1978-11-23": "Labor Thanksgiving Day", "1978-12-31": "Bank Holiday", - "1979-01-01": "New Year's Day", + "1979-01-01": "Bank Holiday; New Year's Day", "1979-01-02": "Bank Holiday", "1979-01-03": "Bank Holiday", "1979-01-15": "Coming of Age Day", @@ -456,7 +404,6 @@ "1979-04-29": "Emperor's Birthday", "1979-04-30": "Substitute Holiday", "1979-05-03": "Constitution Day", - "1979-05-04": "National Holiday", "1979-05-05": "Children's Day", "1979-09-15": "Respect for the Aged Day", "1979-09-24": "Autumnal Equinox", @@ -464,7 +411,7 @@ "1979-11-03": "Culture Day", "1979-11-23": "Labor Thanksgiving Day", "1979-12-31": "Bank Holiday", - "1980-01-01": "New Year's Day", + "1980-01-01": "Bank Holiday; New Year's Day", "1980-01-02": "Bank Holiday", "1980-01-03": "Bank Holiday", "1980-01-15": "Coming of Age Day", @@ -480,7 +427,7 @@ "1980-11-23": "Labor Thanksgiving Day", "1980-11-24": "Substitute Holiday", "1980-12-31": "Bank Holiday", - "1981-01-01": "New Year's Day", + "1981-01-01": "Bank Holiday; New Year's Day", "1981-01-02": "Bank Holiday", "1981-01-03": "Bank Holiday", "1981-01-15": "Coming of Age Day", @@ -496,7 +443,7 @@ "1981-11-03": "Culture Day", "1981-11-23": "Labor Thanksgiving Day", "1981-12-31": "Bank Holiday", - "1982-01-01": "New Year's Day", + "1982-01-01": "Bank Holiday; New Year's Day", "1982-01-02": "Bank Holiday", "1982-01-03": "Bank Holiday", "1982-01-15": "Coming of Age Day", @@ -505,7 +452,6 @@ "1982-03-22": "Substitute Holiday", "1982-04-29": "Emperor's Birthday", "1982-05-03": "Constitution Day", - "1982-05-04": "National Holiday", "1982-05-05": "Children's Day", "1982-09-15": "Respect for the Aged Day", "1982-09-23": "Autumnal Equinox", @@ -514,7 +460,7 @@ "1982-11-03": "Culture Day", "1982-11-23": "Labor Thanksgiving Day", "1982-12-31": "Bank Holiday", - "1983-01-01": "New Year's Day", + "1983-01-01": "Bank Holiday; New Year's Day", "1983-01-02": "Bank Holiday", "1983-01-03": "Bank Holiday", "1983-01-15": "Coming of Age Day", @@ -522,7 +468,6 @@ "1983-03-21": "Vernal Equinox Day", "1983-04-29": "Emperor's Birthday", "1983-05-03": "Constitution Day", - "1983-05-04": "National Holiday", "1983-05-05": "Children's Day", "1983-09-15": "Respect for the Aged Day", "1983-09-23": "Autumnal Equinox", @@ -530,7 +475,7 @@ "1983-11-03": "Culture Day", "1983-11-23": "Labor Thanksgiving Day", "1983-12-31": "Bank Holiday", - "1984-01-01": "New Year's Day", + "1984-01-01": "Bank Holiday; New Year's Day", "1984-01-02": "Bank Holiday; Substitute Holiday", "1984-01-03": "Bank Holiday", "1984-01-15": "Coming of Age Day", @@ -540,7 +485,6 @@ "1984-04-29": "Emperor's Birthday", "1984-04-30": "Substitute Holiday", "1984-05-03": "Constitution Day", - "1984-05-04": "National Holiday", "1984-05-05": "Children's Day", "1984-09-15": "Respect for the Aged Day", "1984-09-23": "Autumnal Equinox", @@ -549,7 +493,7 @@ "1984-11-03": "Culture Day", "1984-11-23": "Labor Thanksgiving Day", "1984-12-31": "Bank Holiday", - "1985-01-01": "New Year's Day", + "1985-01-01": "Bank Holiday; New Year's Day", "1985-01-02": "Bank Holiday", "1985-01-03": "Bank Holiday", "1985-01-15": "Coming of Age Day", @@ -557,7 +501,6 @@ "1985-03-21": "Vernal Equinox Day", "1985-04-29": "Emperor's Birthday", "1985-05-03": "Constitution Day", - "1985-05-04": "National Holiday", "1985-05-05": "Children's Day", "1985-05-06": "Substitute Holiday", "1985-09-15": "Respect for the Aged Day", @@ -568,7 +511,7 @@ "1985-11-04": "Substitute Holiday", "1985-11-23": "Labor Thanksgiving Day", "1985-12-31": "Bank Holiday", - "1986-01-01": "New Year's Day", + "1986-01-01": "Bank Holiday; New Year's Day", "1986-01-02": "Bank Holiday", "1986-01-03": "Bank Holiday", "1986-01-15": "Coming of Age Day", @@ -584,7 +527,7 @@ "1986-11-23": "Labor Thanksgiving Day", "1986-11-24": "Substitute Holiday", "1986-12-31": "Bank Holiday", - "1987-01-01": "New Year's Day", + "1987-01-01": "Bank Holiday; New Year's Day", "1987-01-02": "Bank Holiday", "1987-01-03": "Bank Holiday", "1987-01-15": "Coming of Age Day", @@ -600,7 +543,7 @@ "1987-11-03": "Culture Day", "1987-11-23": "Labor Thanksgiving Day", "1987-12-31": "Bank Holiday", - "1988-01-01": "New Year's Day", + "1988-01-01": "Bank Holiday; New Year's Day", "1988-01-02": "Bank Holiday", "1988-01-03": "Bank Holiday", "1988-01-15": "Coming of Age Day", @@ -617,7 +560,7 @@ "1988-11-03": "Culture Day", "1988-11-23": "Labor Thanksgiving Day", "1988-12-31": "Bank Holiday", - "1989-01-01": "New Year's Day", + "1989-01-01": "Bank Holiday; New Year's Day", "1989-01-02": "Bank Holiday; Substitute Holiday", "1989-01-03": "Bank Holiday", "1989-01-15": "Coming of Age Day", @@ -636,7 +579,7 @@ "1989-11-23": "Labor Thanksgiving Day", "1989-12-23": "Emperor's Birthday", "1989-12-31": "Bank Holiday", - "1990-01-01": "New Year's Day", + "1990-01-01": "Bank Holiday; New Year's Day", "1990-01-02": "Bank Holiday", "1990-01-03": "Bank Holiday", "1990-01-15": "Coming of Age Day", @@ -658,7 +601,7 @@ "1990-12-23": "Emperor's Birthday", "1990-12-24": "Substitute Holiday", "1990-12-31": "Bank Holiday", - "1991-01-01": "New Year's Day", + "1991-01-01": "Bank Holiday; New Year's Day", "1991-01-02": "Bank Holiday", "1991-01-03": "Bank Holiday", "1991-01-15": "Coming of Age Day", @@ -678,7 +621,7 @@ "1991-11-23": "Labor Thanksgiving Day", "1991-12-23": "Emperor's Birthday", "1991-12-31": "Bank Holiday", - "1992-01-01": "New Year's Day", + "1992-01-01": "Bank Holiday; New Year's Day", "1992-01-02": "Bank Holiday", "1992-01-03": "Bank Holiday", "1992-01-15": "Coming of Age Day", @@ -695,7 +638,7 @@ "1992-11-23": "Labor Thanksgiving Day", "1992-12-23": "Emperor's Birthday", "1992-12-31": "Bank Holiday", - "1993-01-01": "New Year's Day", + "1993-01-01": "Bank Holiday; New Year's Day", "1993-01-02": "Bank Holiday", "1993-01-03": "Bank Holiday", "1993-01-15": "Coming of Age Day", @@ -714,7 +657,7 @@ "1993-11-23": "Labor Thanksgiving Day", "1993-12-23": "Emperor's Birthday", "1993-12-31": "Bank Holiday", - "1994-01-01": "New Year's Day", + "1994-01-01": "Bank Holiday; New Year's Day", "1994-01-02": "Bank Holiday", "1994-01-03": "Bank Holiday", "1994-01-15": "Coming of Age Day", @@ -731,7 +674,7 @@ "1994-11-23": "Labor Thanksgiving Day", "1994-12-23": "Emperor's Birthday", "1994-12-31": "Bank Holiday", - "1995-01-01": "New Year's Day", + "1995-01-01": "Bank Holiday; New Year's Day", "1995-01-02": "Bank Holiday; Substitute Holiday", "1995-01-03": "Bank Holiday", "1995-01-15": "Coming of Age Day", @@ -749,7 +692,7 @@ "1995-11-23": "Labor Thanksgiving Day", "1995-12-23": "Emperor's Birthday", "1995-12-31": "Bank Holiday", - "1996-01-01": "New Year's Day", + "1996-01-01": "Bank Holiday; New Year's Day", "1996-01-02": "Bank Holiday", "1996-01-03": "Bank Holiday", "1996-01-15": "Coming of Age Day", @@ -771,7 +714,7 @@ "1996-11-23": "Labor Thanksgiving Day", "1996-12-23": "Emperor's Birthday", "1996-12-31": "Bank Holiday", - "1997-01-01": "New Year's Day", + "1997-01-01": "Bank Holiday; New Year's Day", "1997-01-02": "Bank Holiday", "1997-01-03": "Bank Holiday", "1997-01-15": "Coming of Age Day", @@ -790,7 +733,7 @@ "1997-11-24": "Substitute Holiday", "1997-12-23": "Emperor's Birthday", "1997-12-31": "Bank Holiday", - "1998-01-01": "New Year's Day", + "1998-01-01": "Bank Holiday; New Year's Day", "1998-01-02": "Bank Holiday", "1998-01-03": "Bank Holiday", "1998-01-15": "Coming of Age Day", @@ -808,7 +751,7 @@ "1998-11-23": "Labor Thanksgiving Day", "1998-12-23": "Emperor's Birthday", "1998-12-31": "Bank Holiday", - "1999-01-01": "New Year's Day", + "1999-01-01": "Bank Holiday; New Year's Day", "1999-01-02": "Bank Holiday", "1999-01-03": "Bank Holiday", "1999-01-15": "Coming of Age Day", @@ -828,7 +771,7 @@ "1999-11-23": "Labor Thanksgiving Day", "1999-12-23": "Emperor's Birthday", "1999-12-31": "Bank Holiday", - "2000-01-01": "New Year's Day", + "2000-01-01": "Bank Holiday; New Year's Day", "2000-01-02": "Bank Holiday", "2000-01-03": "Bank Holiday", "2000-01-10": "Coming of Age Day", @@ -846,7 +789,7 @@ "2000-11-23": "Labor Thanksgiving Day", "2000-12-23": "Emperor's Birthday", "2000-12-31": "Bank Holiday", - "2001-01-01": "New Year's Day", + "2001-01-01": "Bank Holiday; New Year's Day", "2001-01-02": "Bank Holiday", "2001-01-03": "Bank Holiday", "2001-01-08": "Coming of Age Day", @@ -868,7 +811,7 @@ "2001-12-23": "Emperor's Birthday", "2001-12-24": "Substitute Holiday", "2001-12-31": "Bank Holiday", - "2002-01-01": "New Year's Day", + "2002-01-01": "Bank Holiday; New Year's Day", "2002-01-02": "Bank Holiday", "2002-01-03": "Bank Holiday", "2002-01-14": "Coming of Age Day", @@ -889,7 +832,7 @@ "2002-11-23": "Labor Thanksgiving Day", "2002-12-23": "Emperor's Birthday", "2002-12-31": "Bank Holiday", - "2003-01-01": "New Year's Day", + "2003-01-01": "Bank Holiday; New Year's Day", "2003-01-02": "Bank Holiday", "2003-01-03": "Bank Holiday", "2003-01-13": "Coming of Age Day", @@ -907,7 +850,7 @@ "2003-11-24": "Substitute Holiday", "2003-12-23": "Emperor's Birthday", "2003-12-31": "Bank Holiday", - "2004-01-01": "New Year's Day", + "2004-01-01": "Bank Holiday; New Year's Day", "2004-01-02": "Bank Holiday", "2004-01-03": "Bank Holiday", "2004-01-12": "Coming of Age Day", @@ -925,7 +868,7 @@ "2004-11-23": "Labor Thanksgiving Day", "2004-12-23": "Emperor's Birthday", "2004-12-31": "Bank Holiday", - "2005-01-01": "New Year's Day", + "2005-01-01": "Bank Holiday; New Year's Day", "2005-01-02": "Bank Holiday", "2005-01-03": "Bank Holiday", "2005-01-10": "Coming of Age Day", @@ -944,7 +887,7 @@ "2005-11-23": "Labor Thanksgiving Day", "2005-12-23": "Emperor's Birthday", "2005-12-31": "Bank Holiday", - "2006-01-01": "New Year's Day", + "2006-01-01": "Bank Holiday; New Year's Day", "2006-01-02": "Bank Holiday; Substitute Holiday", "2006-01-03": "Bank Holiday", "2006-01-09": "Coming of Age Day", @@ -962,7 +905,7 @@ "2006-11-23": "Labor Thanksgiving Day", "2006-12-23": "Emperor's Birthday", "2006-12-31": "Bank Holiday", - "2007-01-01": "New Year's Day", + "2007-01-01": "Bank Holiday; New Year's Day", "2007-01-02": "Bank Holiday", "2007-01-03": "Bank Holiday", "2007-01-08": "Coming of Age Day", @@ -984,7 +927,7 @@ "2007-12-23": "Emperor's Birthday", "2007-12-24": "Substitute Holiday", "2007-12-31": "Bank Holiday", - "2008-01-01": "New Year's Day", + "2008-01-01": "Bank Holiday; New Year's Day", "2008-01-02": "Bank Holiday", "2008-01-03": "Bank Holiday", "2008-01-14": "Coming of Age Day", @@ -1004,7 +947,7 @@ "2008-11-24": "Substitute Holiday", "2008-12-23": "Emperor's Birthday", "2008-12-31": "Bank Holiday", - "2009-01-01": "New Year's Day", + "2009-01-01": "Bank Holiday; New Year's Day", "2009-01-02": "Bank Holiday", "2009-01-03": "Bank Holiday", "2009-01-12": "Coming of Age Day", @@ -1024,7 +967,7 @@ "2009-11-23": "Labor Thanksgiving Day", "2009-12-23": "Emperor's Birthday", "2009-12-31": "Bank Holiday", - "2010-01-01": "New Year's Day", + "2010-01-01": "Bank Holiday; New Year's Day", "2010-01-02": "Bank Holiday", "2010-01-03": "Bank Holiday", "2010-01-11": "Coming of Age Day", @@ -1043,7 +986,7 @@ "2010-11-23": "Labor Thanksgiving Day", "2010-12-23": "Emperor's Birthday", "2010-12-31": "Bank Holiday", - "2011-01-01": "New Year's Day", + "2011-01-01": "Bank Holiday; New Year's Day", "2011-01-02": "Bank Holiday", "2011-01-03": "Bank Holiday", "2011-01-10": "Coming of Age Day", @@ -1061,7 +1004,7 @@ "2011-11-23": "Labor Thanksgiving Day", "2011-12-23": "Emperor's Birthday", "2011-12-31": "Bank Holiday", - "2012-01-01": "New Year's Day", + "2012-01-01": "Bank Holiday; New Year's Day", "2012-01-02": "Bank Holiday; Substitute Holiday", "2012-01-03": "Bank Holiday", "2012-01-09": "Coming of Age Day", @@ -1081,7 +1024,7 @@ "2012-12-23": "Emperor's Birthday", "2012-12-24": "Substitute Holiday", "2012-12-31": "Bank Holiday", - "2013-01-01": "New Year's Day", + "2013-01-01": "Bank Holiday; New Year's Day", "2013-01-02": "Bank Holiday", "2013-01-03": "Bank Holiday", "2013-01-14": "Coming of Age Day", @@ -1101,7 +1044,7 @@ "2013-11-23": "Labor Thanksgiving Day", "2013-12-23": "Emperor's Birthday", "2013-12-31": "Bank Holiday", - "2014-01-01": "New Year's Day", + "2014-01-01": "Bank Holiday; New Year's Day", "2014-01-02": "Bank Holiday", "2014-01-03": "Bank Holiday", "2014-01-13": "Coming of Age Day", @@ -1121,7 +1064,7 @@ "2014-11-24": "Substitute Holiday", "2014-12-23": "Emperor's Birthday", "2014-12-31": "Bank Holiday", - "2015-01-01": "New Year's Day", + "2015-01-01": "Bank Holiday; New Year's Day", "2015-01-02": "Bank Holiday", "2015-01-03": "Bank Holiday", "2015-01-12": "Coming of Age Day", @@ -1141,7 +1084,7 @@ "2015-11-23": "Labor Thanksgiving Day", "2015-12-23": "Emperor's Birthday", "2015-12-31": "Bank Holiday", - "2016-01-01": "New Year's Day", + "2016-01-01": "Bank Holiday; New Year's Day", "2016-01-02": "Bank Holiday", "2016-01-03": "Bank Holiday", "2016-01-11": "Coming of Age Day", @@ -1161,7 +1104,7 @@ "2016-11-23": "Labor Thanksgiving Day", "2016-12-23": "Emperor's Birthday", "2016-12-31": "Bank Holiday", - "2017-01-01": "New Year's Day", + "2017-01-01": "Bank Holiday; New Year's Day", "2017-01-02": "Bank Holiday; Substitute Holiday", "2017-01-03": "Bank Holiday", "2017-01-09": "Coming of Age Day", @@ -1180,7 +1123,7 @@ "2017-11-23": "Labor Thanksgiving Day", "2017-12-23": "Emperor's Birthday", "2017-12-31": "Bank Holiday", - "2018-01-01": "New Year's Day", + "2018-01-01": "Bank Holiday; New Year's Day", "2018-01-02": "Bank Holiday", "2018-01-03": "Bank Holiday", "2018-01-08": "Coming of Age Day", @@ -1203,7 +1146,7 @@ "2018-12-23": "Emperor's Birthday", "2018-12-24": "Substitute Holiday", "2018-12-31": "Bank Holiday", - "2019-01-01": "New Year's Day", + "2019-01-01": "Bank Holiday; New Year's Day", "2019-01-02": "Bank Holiday", "2019-01-03": "Bank Holiday", "2019-01-14": "Coming of Age Day", @@ -1228,7 +1171,7 @@ "2019-11-04": "Substitute Holiday", "2019-11-23": "Labor Thanksgiving Day", "2019-12-31": "Bank Holiday", - "2020-01-01": "New Year's Day", + "2020-01-01": "Bank Holiday; New Year's Day", "2020-01-02": "Bank Holiday", "2020-01-03": "Bank Holiday", "2020-01-13": "Coming of Age Day", @@ -1249,7 +1192,7 @@ "2020-11-03": "Culture Day", "2020-11-23": "Labor Thanksgiving Day", "2020-12-31": "Bank Holiday", - "2021-01-01": "New Year's Day", + "2021-01-01": "Bank Holiday; New Year's Day", "2021-01-02": "Bank Holiday", "2021-01-03": "Bank Holiday", "2021-01-11": "Coming of Age Day", @@ -1269,7 +1212,7 @@ "2021-11-03": "Culture Day", "2021-11-23": "Labor Thanksgiving Day", "2021-12-31": "Bank Holiday", - "2022-01-01": "New Year's Day", + "2022-01-01": "Bank Holiday; New Year's Day", "2022-01-02": "Bank Holiday", "2022-01-03": "Bank Holiday", "2022-01-10": "Coming of Age Day", @@ -1288,7 +1231,7 @@ "2022-11-03": "Culture Day", "2022-11-23": "Labor Thanksgiving Day", "2022-12-31": "Bank Holiday", - "2023-01-01": "New Year's Day", + "2023-01-01": "Bank Holiday; New Year's Day", "2023-01-02": "Bank Holiday; Substitute Holiday", "2023-01-03": "Bank Holiday", "2023-01-09": "Coming of Age Day", @@ -1307,7 +1250,7 @@ "2023-11-03": "Culture Day", "2023-11-23": "Labor Thanksgiving Day", "2023-12-31": "Bank Holiday", - "2024-01-01": "New Year's Day", + "2024-01-01": "Bank Holiday; New Year's Day", "2024-01-02": "Bank Holiday", "2024-01-03": "Bank Holiday", "2024-01-08": "Coming of Age Day", @@ -1331,7 +1274,7 @@ "2024-11-04": "Substitute Holiday", "2024-11-23": "Labor Thanksgiving Day", "2024-12-31": "Bank Holiday", - "2025-01-01": "New Year's Day", + "2025-01-01": "Bank Holiday; New Year's Day", "2025-01-02": "Bank Holiday", "2025-01-03": "Bank Holiday", "2025-01-13": "Coming of Age Day", @@ -1353,7 +1296,7 @@ "2025-11-23": "Labor Thanksgiving Day", "2025-11-24": "Substitute Holiday", "2025-12-31": "Bank Holiday", - "2026-01-01": "New Year's Day", + "2026-01-01": "Bank Holiday; New Year's Day", "2026-01-02": "Bank Holiday", "2026-01-03": "Bank Holiday", "2026-01-12": "Coming of Age Day", @@ -1374,7 +1317,7 @@ "2026-11-03": "Culture Day", "2026-11-23": "Labor Thanksgiving Day", "2026-12-31": "Bank Holiday", - "2027-01-01": "New Year's Day", + "2027-01-01": "Bank Holiday; New Year's Day", "2027-01-02": "Bank Holiday", "2027-01-03": "Bank Holiday", "2027-01-11": "Coming of Age Day", @@ -1394,7 +1337,7 @@ "2027-11-03": "Culture Day", "2027-11-23": "Labor Thanksgiving Day", "2027-12-31": "Bank Holiday", - "2028-01-01": "New Year's Day", + "2028-01-01": "Bank Holiday; New Year's Day", "2028-01-02": "Bank Holiday", "2028-01-03": "Bank Holiday", "2028-01-10": "Coming of Age Day", @@ -1413,7 +1356,7 @@ "2028-11-03": "Culture Day", "2028-11-23": "Labor Thanksgiving Day", "2028-12-31": "Bank Holiday", - "2029-01-01": "New Year's Day", + "2029-01-01": "Bank Holiday; New Year's Day", "2029-01-02": "Bank Holiday", "2029-01-03": "Bank Holiday", "2029-01-08": "Coming of Age Day", @@ -1435,7 +1378,7 @@ "2029-11-03": "Culture Day", "2029-11-23": "Labor Thanksgiving Day", "2029-12-31": "Bank Holiday", - "2030-01-01": "New Year's Day", + "2030-01-01": "Bank Holiday; New Year's Day", "2030-01-02": "Bank Holiday", "2030-01-03": "Bank Holiday", "2030-01-14": "Coming of Age Day", @@ -1457,7 +1400,7 @@ "2030-11-04": "Substitute Holiday", "2030-11-23": "Labor Thanksgiving Day", "2030-12-31": "Bank Holiday", - "2031-01-01": "New Year's Day", + "2031-01-01": "Bank Holiday; New Year's Day", "2031-01-02": "Bank Holiday", "2031-01-03": "Bank Holiday", "2031-01-13": "Coming of Age Day", @@ -1479,7 +1422,7 @@ "2031-11-23": "Labor Thanksgiving Day", "2031-11-24": "Substitute Holiday", "2031-12-31": "Bank Holiday", - "2032-01-01": "New Year's Day", + "2032-01-01": "Bank Holiday; New Year's Day", "2032-01-02": "Bank Holiday", "2032-01-03": "Bank Holiday", "2032-01-12": "Coming of Age Day", @@ -1499,7 +1442,7 @@ "2032-11-03": "Culture Day", "2032-11-23": "Labor Thanksgiving Day", "2032-12-31": "Bank Holiday", - "2033-01-01": "New Year's Day", + "2033-01-01": "Bank Holiday; New Year's Day", "2033-01-02": "Bank Holiday", "2033-01-03": "Bank Holiday", "2033-01-10": "Coming of Age Day", @@ -1519,7 +1462,7 @@ "2033-11-03": "Culture Day", "2033-11-23": "Labor Thanksgiving Day", "2033-12-31": "Bank Holiday", - "2034-01-01": "New Year's Day", + "2034-01-01": "Bank Holiday; New Year's Day", "2034-01-02": "Bank Holiday; Substitute Holiday", "2034-01-03": "Bank Holiday", "2034-01-09": "Coming of Age Day", @@ -1538,7 +1481,7 @@ "2034-11-03": "Culture Day", "2034-11-23": "Labor Thanksgiving Day", "2034-12-31": "Bank Holiday", - "2035-01-01": "New Year's Day", + "2035-01-01": "Bank Holiday; New Year's Day", "2035-01-02": "Bank Holiday", "2035-01-03": "Bank Holiday", "2035-01-08": "Coming of Age Day", @@ -1560,7 +1503,7 @@ "2035-11-03": "Culture Day", "2035-11-23": "Labor Thanksgiving Day", "2035-12-31": "Bank Holiday", - "2036-01-01": "New Year's Day", + "2036-01-01": "Bank Holiday; New Year's Day", "2036-01-02": "Bank Holiday", "2036-01-03": "Bank Holiday", "2036-01-14": "Coming of Age Day", @@ -1581,7 +1524,7 @@ "2036-11-23": "Labor Thanksgiving Day", "2036-11-24": "Substitute Holiday", "2036-12-31": "Bank Holiday", - "2037-01-01": "New Year's Day", + "2037-01-01": "Bank Holiday; New Year's Day", "2037-01-02": "Bank Holiday", "2037-01-03": "Bank Holiday", "2037-01-12": "Coming of Age Day", @@ -1602,7 +1545,7 @@ "2037-11-03": "Culture Day", "2037-11-23": "Labor Thanksgiving Day", "2037-12-31": "Bank Holiday", - "2038-01-01": "New Year's Day", + "2038-01-01": "Bank Holiday; New Year's Day", "2038-01-02": "Bank Holiday", "2038-01-03": "Bank Holiday", "2038-01-11": "Coming of Age Day", @@ -1621,7 +1564,7 @@ "2038-11-03": "Culture Day", "2038-11-23": "Labor Thanksgiving Day", "2038-12-31": "Bank Holiday", - "2039-01-01": "New Year's Day", + "2039-01-01": "Bank Holiday; New Year's Day", "2039-01-02": "Bank Holiday", "2039-01-03": "Bank Holiday", "2039-01-10": "Coming of Age Day", @@ -1640,7 +1583,7 @@ "2039-11-03": "Culture Day", "2039-11-23": "Labor Thanksgiving Day", "2039-12-31": "Bank Holiday", - "2040-01-01": "New Year's Day", + "2040-01-01": "Bank Holiday; New Year's Day", "2040-01-02": "Bank Holiday; Substitute Holiday", "2040-01-03": "Bank Holiday", "2040-01-09": "Coming of Age Day", @@ -1660,7 +1603,7 @@ "2040-11-03": "Culture Day", "2040-11-23": "Labor Thanksgiving Day", "2040-12-31": "Bank Holiday", - "2041-01-01": "New Year's Day", + "2041-01-01": "Bank Holiday; New Year's Day", "2041-01-02": "Bank Holiday", "2041-01-03": "Bank Holiday", "2041-01-14": "Coming of Age Day", @@ -1682,7 +1625,7 @@ "2041-11-04": "Substitute Holiday", "2041-11-23": "Labor Thanksgiving Day", "2041-12-31": "Bank Holiday", - "2042-01-01": "New Year's Day", + "2042-01-01": "Bank Holiday; New Year's Day", "2042-01-02": "Bank Holiday", "2042-01-03": "Bank Holiday", "2042-01-13": "Coming of Age Day", @@ -1704,7 +1647,7 @@ "2042-11-23": "Labor Thanksgiving Day", "2042-11-24": "Substitute Holiday", "2042-12-31": "Bank Holiday", - "2043-01-01": "New Year's Day", + "2043-01-01": "Bank Holiday; New Year's Day", "2043-01-02": "Bank Holiday", "2043-01-03": "Bank Holiday", "2043-01-12": "Coming of Age Day", @@ -1725,7 +1668,7 @@ "2043-11-03": "Culture Day", "2043-11-23": "Labor Thanksgiving Day", "2043-12-31": "Bank Holiday", - "2044-01-01": "New Year's Day", + "2044-01-01": "Bank Holiday; New Year's Day", "2044-01-02": "Bank Holiday", "2044-01-03": "Bank Holiday", "2044-01-11": "Coming of Age Day", @@ -1745,7 +1688,7 @@ "2044-11-03": "Culture Day", "2044-11-23": "Labor Thanksgiving Day", "2044-12-31": "Bank Holiday", - "2045-01-01": "New Year's Day", + "2045-01-01": "Bank Holiday; New Year's Day", "2045-01-02": "Bank Holiday; Substitute Holiday", "2045-01-03": "Bank Holiday", "2045-01-09": "Coming of Age Day", @@ -1764,7 +1707,7 @@ "2045-11-03": "Culture Day", "2045-11-23": "Labor Thanksgiving Day", "2045-12-31": "Bank Holiday", - "2046-01-01": "New Year's Day", + "2046-01-01": "Bank Holiday; New Year's Day", "2046-01-02": "Bank Holiday", "2046-01-03": "Bank Holiday", "2046-01-08": "Coming of Age Day", @@ -1786,7 +1729,7 @@ "2046-11-03": "Culture Day", "2046-11-23": "Labor Thanksgiving Day", "2046-12-31": "Bank Holiday", - "2047-01-01": "New Year's Day", + "2047-01-01": "Bank Holiday; New Year's Day", "2047-01-02": "Bank Holiday", "2047-01-03": "Bank Holiday", "2047-01-14": "Coming of Age Day", @@ -1808,7 +1751,7 @@ "2047-11-04": "Substitute Holiday", "2047-11-23": "Labor Thanksgiving Day", "2047-12-31": "Bank Holiday", - "2048-01-01": "New Year's Day", + "2048-01-01": "Bank Holiday; New Year's Day", "2048-01-02": "Bank Holiday", "2048-01-03": "Bank Holiday", "2048-01-13": "Coming of Age Day", @@ -1829,7 +1772,7 @@ "2048-11-03": "Culture Day", "2048-11-23": "Labor Thanksgiving Day", "2048-12-31": "Bank Holiday", - "2049-01-01": "New Year's Day", + "2049-01-01": "Bank Holiday; New Year's Day", "2049-01-02": "Bank Holiday", "2049-01-03": "Bank Holiday", "2049-01-11": "Coming of Age Day", @@ -1849,7 +1792,7 @@ "2049-11-03": "Culture Day", "2049-11-23": "Labor Thanksgiving Day", "2049-12-31": "Bank Holiday", - "2050-01-01": "New Year's Day", + "2050-01-01": "Bank Holiday; New Year's Day", "2050-01-02": "Bank Holiday", "2050-01-03": "Bank Holiday", "2050-01-10": "Coming of Age Day", diff --git a/tests/countries/test_japan.py b/tests/countries/test_japan.py index 7ba75c27f..1af4d1624 100644 --- a/tests/countries/test_japan.py +++ b/tests/countries/test_japan.py @@ -36,12 +36,14 @@ def test_not_implemented(self): Japan(categories=BANK, years=2100) def test_new_years_day(self): - self.assertHoliday(f"{year}-01-01" for year in range(1949, 2051)) + self.assertHolidayName("元日", (f"{year}-01-01" for year in range(1949, 2051))) def test_coming_of_age(self): - self.assertHoliday(f"{year}-01-15" for year in range(1949, 2000)) + name = "成人の日" + self.assertHolidayName(name, (f"{year}-01-15" for year in range(1949, 2000))) - self.assertHoliday( + self.assertHolidayName( + name, "2000-01-10", "2001-01-08", "2002-01-14", @@ -98,9 +100,10 @@ def test_coming_of_age(self): self.assertNoHoliday("2000-01-15", "2017-01-15", "2030-01-15") def test_foundation_day(self): - self.assertHoliday(f"{year}-02-11" for year in range(1967, 2051)) + name = "建国記念の日" + self.assertHolidayName(name, (f"{year}-02-11" for year in range(1967, 2051))) self.assertNoHoliday("1966-02-11") - self.assertNoHolidayName("建国記念の日", 1966) + self.assertNoHolidayName(name, range(1949, 1967)) def test_vernal_equinox_day(self): self.assertHolidayName( @@ -214,7 +217,7 @@ def test_vernal_equinox_day(self): def test_showa_day(self): name = "昭和の日" self.assertHolidayName(name, (f"{year}-04-29" for year in range(2007, 2051))) - self.assertNoHolidayName(name, 2006) + self.assertNoHolidayName(name, range(1949, 2007)) def test_constitution_memorial_day(self): self.assertHolidayName("憲法記念日", (f"{year}-05-03" for year in range(1949, 2051))) @@ -223,7 +226,7 @@ def test_greenery_day(self): name = "みどりの日" self.assertHolidayName(name, (f"{year}-04-29" for year in range(1989, 2007))) self.assertHolidayName(name, (f"{year}-05-04" for year in range(2007, 2051))) - self.assertNoHolidayName(name, 1988) + self.assertNoHolidayName(name, range(1949, 1989)) def test_national_holiday(self): name = "国民の休日" @@ -332,13 +335,13 @@ def test_mountain_day(self): self.assertHolidayName(name, (f"{year}-08-11" for year in years)) self.assertHolidayName(name, "2020-08-10", "2021-08-08") self.assertNoHoliday("2015-08-11") - self.assertNoHolidayName(name, 2015) + self.assertNoHolidayName(name, range(1949, 2016)) def test_respect_for_the_aged_day(self): name = "敬老の日" self.assertHolidayName(name, (f"{year}-09-15" for year in range(1966, 2003))) self.assertNoHoliday("1965-09-15") - self.assertNoHolidayName(name, 1965) + self.assertNoHolidayName(name, range(1949, 1966)) self.assertHolidayName( name, @@ -503,7 +506,7 @@ def test_health_and_sports_day(self): name = "体育の日" self.assertHolidayName(name, (f"{year}-10-10" for year in range(1966, 2000))) self.assertNoHoliday("1965-10-10", "2000-10-10") - self.assertNoHolidayName(name, 1965, 2020) + self.assertNoHolidayName(name, range(1949, 1966), range(2020, 2051)) self.assertHolidayName( name, @@ -564,7 +567,7 @@ def test_health_and_sports_day(self): "2049-10-11", "2050-10-10", ) - self.assertNoHolidayName(name, 2019) + self.assertNoHolidayName(name, range(1949, 2020)) def test_culture_day(self): self.assertHolidayName("文化の日", (f"{year}-11-03" for year in range(1949, 2051))) @@ -736,12 +739,12 @@ def test_bank_holidays(self): holidays = Japan(categories=BANK, years=range(1949, 2051)) for year in range(1949, 2051): self.assertHolidayName( - name, holidays, f"{year}-01-02", f"{year}-01-03", f"{year}-12-31" + name, holidays, f"{year}-01-01", f"{year}-01-02", f"{year}-01-03", f"{year}-12-31" ) def test_l10n_default(self): self.assertLocalizedHolidays( - ("2022-01-01", "元日"), + ("2022-01-01", "元日; 銀行休業日"), ("2022-01-02", "銀行休業日"), ("2022-01-03", "銀行休業日"), ("2022-01-10", "成人の日"), @@ -765,7 +768,7 @@ def test_l10n_default(self): def test_l10n_en_us(self): self.assertLocalizedHolidays( "en_US", - ("2022-01-01", "New Year's Day"), + ("2022-01-01", "Bank Holiday; New Year's Day"), ("2022-01-02", "Bank Holiday"), ("2022-01-03", "Bank Holiday"), ("2022-01-10", "Coming of Age Day"), @@ -789,7 +792,7 @@ def test_l10n_en_us(self): def test_l10n_th(self): self.assertLocalizedHolidays( "th", - ("2022-01-01", "วันขึ้นปีใหม่"), + ("2022-01-01", "วันขึ้นปีใหม่; วันหยุดธนาคาร"), ("2022-01-02", "วันหยุดธนาคาร"), ("2022-01-03", "วันหยุดธนาคาร"), ("2022-01-10", "วันฉลองบรรลุนิติภาวะ"), From d46c766d9e68a4c31c5883280ab9d313da73693d Mon Sep 17 00:00:00 2001 From: ~Jhellico Date: Tue, 24 Sep 2024 00:17:32 +0300 Subject: [PATCH 2/2] PR suggestion Co-authored-by: Arkadii Yakovets <2201626+arkid15r@users.noreply.github.com> --- holidays/countries/japan.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/holidays/countries/japan.py b/holidays/countries/japan.py index 567544429..5cefc7f19 100644 --- a/holidays/countries/japan.py +++ b/holidays/countries/japan.py @@ -70,7 +70,7 @@ def _populate_observed(self, dts: Set[date]) -> None: return None if self._year <= 2006: may_4 = (MAY, 4) - if not (self._is_monday(may_4) or self._is_sunday(may_4)): + if not self._is_monday(may_4) and not self._is_sunday(may_4): # National Holiday. self._add_holiday(tr("国民の休日"), may_4) else: