diff --git a/src/util/dictionary.rs b/src/util/dictionary.rs index 52a8ffd..43b0dec 100644 --- a/src/util/dictionary.rs +++ b/src/util/dictionary.rs @@ -3924,14 +3924,15 @@ pub(crate) fn entry(lang: Language) -> Entry { }, comma_decimal: true, number_tokens: ::phf::Map { - key: 12913932095322966823, + key: 15467950696543387533, disps: &[ - (0, 0), + (3, 0), ], entries: &[ ("mio", 6), - ("mln", 6), ("mrd", 9), + ("mld", 9), + ("mln", 6), ], }, number_nd_tokens: ::phf::Map { @@ -4549,31 +4550,34 @@ pub(crate) fn entry(lang: Language) -> Entry { }, date_order: &[DateCmp::D, DateCmp::Y], months: ::phf::Map { - key: 10121458955350035957, + key: 8602556344903797927, disps: &[ - (0, 3), - (2, 2), - (5, 2), - (4, 0), + (5, 0), + (0, 0), + (2, 11), + (19, 14), ], entries: &[ - ("ಅಕ\u{ccd}ಟ\u{ccb}", 10), - ("ಅಕ\u{ccd}ಟ\u{ccb}ಬರ\u{ccd}", 10), - ("ಜುಲ\u{cc8}", 7), - ("ನವ\u{cc6}ಂಬರ\u{ccd}", 11), + ("ಆಗ", 8), ("ಫ\u{cc6}ಬ\u{ccd}ರವರ\u{cbf}", 2), - ("ಸ\u{cc6}ಪ\u{ccd}ಟ\u{cc6}ಂ", 9), - ("ಜ\u{cc2}ನ\u{ccd}", 6), + ("ಜನವರ\u{cbf}", 1), + ("ಅಕ\u{ccd}ಟ\u{ccb}", 10), ("ಮ\u{cc7}", 5), ("ನವ\u{cc6}ಂ", 11), + ("ಏಪ\u{ccd}ರ\u{cbf}", 4), + ("ಸ\u{cc6}ಪ\u{ccd}ಟ\u{cc6}ಂ", 9), + ("ಏಪ\u{ccd}ರ\u{cbf}ಲ\u{ccd}", 4), ("ಡ\u{cbf}ಸ\u{cc6}ಂಬರ\u{ccd}", 12), + ("ಜನ", 1), + ("ಜ\u{cc2}ನ\u{ccd}", 6), + ("ಆಗಸ\u{ccd}ಟ\u{ccd}", 8), + ("ಜುಲ\u{cc8}", 7), + ("ಅಕ\u{ccd}ಟ\u{ccb}ಬರ\u{ccd}", 10), ("ಸ\u{cc6}ಪ\u{ccd}ಟ\u{cc6}ಂಬರ\u{ccd}", 9), + ("ಫ\u{cc6}ಬ\u{ccd}ರ", 2), + ("ನವ\u{cc6}ಂಬರ\u{ccd}", 11), ("ಡ\u{cbf}ಸ\u{cc6}ಂ", 12), ("ಮಾರ\u{ccd}ಚ\u{ccd}", 3), - ("ಜನವರ\u{cbf}", 1), - ("ಏಪ\u{ccd}ರ\u{cbf}", 4), - ("ಏಪ\u{ccd}ರ\u{cbf}ಲ\u{ccd}", 4), - ("ಆಗಸ\u{ccd}ಟ\u{ccd}", 8), ], }, timeago_nd_tokens: ::phf::Map { diff --git a/src/util/timeago.rs b/src/util/timeago.rs index b1c2006..5ccb4fa 100644 --- a/src/util/timeago.rs +++ b/src/util/timeago.rs @@ -865,11 +865,17 @@ mod tests { for (t, entry) in entries { entry.cases.iter().for_each(|(txt, n)| { let timeago = parse_timeago(*lang, txt); + let textual_date = parse_textual_date(*lang, txt); assert_eq!( timeago, Some(TimeAgo { n: *n, unit: *t }), "lang: {lang}, txt: {txt}" ); + assert_eq!( + textual_date, + Some(ParsedDate::Relative(TimeAgo { n: *n, unit: *t })), + "textual_date lang: {lang}, txt: {txt}" + ); n_cases += 1; }); diff --git a/testfiles/dict/dictionary.json b/testfiles/dict/dictionary.json index deae2c9..be82dde 100644 --- a/testfiles/dict/dictionary.json +++ b/testfiles/dict/dictionary.json @@ -2526,6 +2526,7 @@ "number_tokens": { "mio": 6, "mln": 6, + "mld": 9, "mrd": 9 }, "number_nd_tokens": { @@ -2918,7 +2919,9 @@ }, "date_order": "DY", "months": { + "ಜನ": 1, "ಜನವರಿ": 1, + "ಫೆಬ್ರ": 2, "ಫೆಬ್ರವರಿ": 2, "ಮಾರ್ಚ್": 3, "ಏಪ್ರಿ": 4, @@ -2926,6 +2929,7 @@ "ಮೇ": 5, "ಜೂನ್": 6, "ಜುಲೈ": 7, + "ಆಗ": 8, "ಆಗಸ್ಟ್": 8, "ಸೆಪ್ಟೆಂ": 9, "ಸೆಪ್ಟೆಂಬರ್": 9,