Skip to content

Commit 22cf7cc

Browse files
Fix Meiji start date (#6432)
Fixes #4892
1 parent 9777c6c commit 22cf7cc

File tree

10 files changed

+20
-14
lines changed

10 files changed

+20
-14
lines changed

components/calendar/src/cal/japanese.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -494,8 +494,8 @@ impl Date<JapaneseExtended> {
494494

495495
const MEIJI_START: EraStartDate = EraStartDate {
496496
year: 1868,
497-
month: 9,
498-
day: 8,
497+
month: 10,
498+
day: 23,
499499
};
500500
const TAISHO_START: EraStartDate = EraStartDate {
501501
year: 1912,

provider/data/calendar/data/calendar_japanese_extended_v1.rs.data

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

provider/data/calendar/data/calendar_japanese_modern_v1.rs.data

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

provider/data/calendar/fingerprints.csv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
calendar/chinese/v1, <singleton>, 782B, 754B, 134f5ec7c9bdc494
22
calendar/dangi/v1, <singleton>, 782B, 754B, 79d5d32449956411
33
calendar/hijri/simulated/mecca/v1, <singleton>, 532B, 504B, ad7346b38a43c235
4-
calendar/japanese/extended/v1, <singleton>, 5238B, 5216B, 781ca7801695fa36
5-
calendar/japanese/modern/v1, <singleton>, 134B, 111B, b31e52deaf52706f
4+
calendar/japanese/extended/v1, <singleton>, 5238B, 5216B, e80e648736f019
5+
calendar/japanese/modern/v1, <singleton>, 134B, 111B, ec96742e22e8fc30
66
calendar/week/v1, <lookup>, 292B, 72 identifiers
77
calendar/week/v1, <total>, 20B, 20B, 10 unique payloads
88
calendar/week/v1, und, 2B, 2B, db63f20c2a6a914a

provider/data/calendar/stubdata/calendar_japanese_extended_v1.rs.data

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

provider/data/calendar/stubdata/calendar_japanese_modern_v1.rs.data

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

provider/source/data/debug/calendar/CalendarJapaneseExtendedV1.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

provider/source/data/debug/calendar/CalendarJapaneseModernV1.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

provider/source/data/japanese-golden/calendar/CalendarJapaneseExtendedV1.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

provider/source/src/calendar/eras.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,13 +285,19 @@ fn process_era_dates_map(
285285
// https://unicode-org.atlassian.net/browse/CLDR-18388 for why we need to do + 2
286286
let idx = (idx.parse::<usize>().unwrap() + 2).to_string();
287287
if let Some(start) = era.start.as_mut() {
288+
// All pre-Taisho start dates are known to be wrong, this at least makes them valid.
289+
// See https://unicode-org.atlassian.net/browse/CLDR-11400
288290
if start.month == 2 && start.day > 28 {
289291
start.day = if calendrical_calculations::iso::is_leap_year(start.year) {
290292
29
291293
} else {
292294
28
293295
};
294296
}
297+
if era.code.as_deref() == Some("meiji") {
298+
start.month = 10;
299+
start.day = 23;
300+
}
295301
}
296302
(idx, era)
297303
})

0 commit comments

Comments
 (0)