From 12d31b85c506377329a83d1a96b470c859953835 Mon Sep 17 00:00:00 2001 From: KevinAdu Date: Mon, 1 Apr 2019 21:34:22 +0900 Subject: [PATCH] Added new Reiwa period --- README.md | 12 ++++++------ periods.json | 8 ++++++++ test.js | 18 +++++++++--------- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index a2f8668..cae996b 100644 --- a/README.md +++ b/README.md @@ -25,11 +25,11 @@ To convert the Gregorian year into the Japanese calendar, use the `japaneseYear` The output should be an object containing data related to the Japanese calendar year: ```js -japaneseYear(new Date(1989, 0)) +japaneseYear(new Date(2019, 0)) // { -// "startYear": 1989, -// "names": ["Heisei", "平成", "へいせい"], +// "startYear": 2019, +// "names": ["Reiwa", "令和", "れいわ"], // "currentJapaneseYear": 0 // } ``` @@ -37,11 +37,11 @@ japaneseYear(new Date(1989, 0)) You can also obtain the start and end year of a particular Japanese period in Gregorian calendar year format, using the `gregorianYearRange` function. ```js -gregorianYearRange("昭和"); +gregorianYearRange("平成"); // { -// startYear: 1926, -// endYear: 1988 +// startYear: 1989, +// endYear: 2018 // } ``` diff --git a/periods.json b/periods.json index 1358506..238120c 100644 --- a/periods.json +++ b/periods.json @@ -232,5 +232,13 @@ "names": [ "平成", "へいせい", "Heisei" ] + }, + { + "startYear": 2019, + "names": [ + "令和", + "れいわ", + "Reiwa" + ] } ] \ No newline at end of file diff --git a/test.js b/test.js index 93edc1d..332e120 100644 --- a/test.js +++ b/test.js @@ -21,8 +21,8 @@ describe("#japaneseYear", () => { expect(heiseiYear.names).to.include("Heisei"); expect(heiseiYear.currentJapaneseYear).to.equal(2); - expect(tokyoOlympicYear.names).to.include("Heisei"); - expect(tokyoOlympicYear.currentJapaneseYear).to.equal(32); + expect(tokyoOlympicYear.names).to.include("Reiwa"); + expect(tokyoOlympicYear.currentJapaneseYear).to.equal(2); }); it("should convert any year below the first recorded emperor calendar date to null", () => { @@ -53,21 +53,21 @@ describe("#japaneseYear", () => { describe("#gregorianYearRange", () => { it("should convert the Japanese calendar year to the Gregorian year", () => { + const reiwaPeriodRange = gregorianYearRange("令和"); + const reiwaPeriodRangeEnglish = gregorianYearRange("Reiwa"); const heiseiPeriodRange = gregorianYearRange("平成"); - const heiseiPeriodRangeEnglish = gregorianYearRange("Heisei"); - const showaPeriodRange = gregorianYearRange("昭和"); const meijiPeriodRange = gregorianYearRange("明治"); const genjiPeriodRange = gregorianYearRange("元治"); const doesntExistPeriodRange = gregorianYearRange("横浜"); + expect(reiwaPeriodRange.startYear).to.equal(2019); + expect(reiwaPeriodRangeEnglish.startYear).to.equal(2019); expect(heiseiPeriodRange.startYear).to.equal(1989); - expect(heiseiPeriodRangeEnglish.startYear).to.equal(1989); - expect(showaPeriodRange.startYear).to.equal(1926); expect(meijiPeriodRange.startYear).to.equal(1868); expect(genjiPeriodRange.startYear).to.equal(1864); - expect(heiseiPeriodRange.endYear).to.equal(null); - expect(heiseiPeriodRangeEnglish.endYear).to.equal(null); - expect(showaPeriodRange.endYear).to.equal(1988); + expect(reiwaPeriodRange.endYear).to.equal(null); + expect(reiwaPeriodRangeEnglish.endYear).to.equal(null); + expect(heiseiPeriodRange.endYear).to.equal(2018); expect(meijiPeriodRange.endYear).to.equal(1911); expect(genjiPeriodRange.endYear).to.equal(1864); expect(doesntExistPeriodRange).to.equal(null);