Sulkta-OSS/rustypipe
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: remove dots from timeago tokens

Browse source
This commit is contained in:
ThetaDev 2023-11-15 01:03:03 +01:00
parent 26fc5a0693
commit bd0f3adba3
4 changed files with 1638 additions and 1640 deletions
Download patch file Download diff file Expand all files Collapse all files

2476
src/util/dictionary.rs
View file

File diff suppressed because it is too large Load diff

9
src/util/timeago.rs
View file

@ -133,12 +133,13 @@ impl From<ParsedDate> for OffsetDateTime {
} }
} }
fn filter_str(string: &str) -> String { /// Prepare the datestring for parsing: lowercase and filter out unnecessary punctuation
fn filter_datestr(string: &str) -> String {
string string
.to_lowercase() .to_lowercase()
.chars() .chars()
.filter_map(|c| { .filter_map(|c| {
if c == '\u{200b}' || c.is_ascii_digit() { if matches!(c, '\u{200b}' | '.') || c.is_ascii_digit() {
None None
} else if c == '-' { } else if c == '-' {
Some(' ') Some(' ')
@ -197,7 +198,7 @@ fn parse_textual_month(entry: &dictionary::Entry, filtered_str: &str) -> Option<
/// Returns [`None`] if the date could not be parsed. /// Returns [`None`] if the date could not be parsed.
pub fn parse_timeago(lang: Language, textual_date: &str) -> Option<TimeAgo> { pub fn parse_timeago(lang: Language, textual_date: &str) -> Option<TimeAgo> {
let entry = dictionary::entry(lang); let entry = dictionary::entry(lang);
let filtered_str = filter_str(textual_date); let filtered_str = filter_datestr(textual_date);
let qu: u8 = util::parse_numeric_prod(textual_date).unwrap_or(1); let qu: u8 = util::parse_numeric_prod(textual_date).unwrap_or(1);
@ -244,7 +245,7 @@ pub fn parse_timeago_dt_or_warn(
pub fn parse_textual_date(lang: Language, textual_date: &str) -> Option<ParsedDate> { pub fn parse_textual_date(lang: Language, textual_date: &str) -> Option<ParsedDate> {
let entry = dictionary::entry(lang); let entry = dictionary::entry(lang);
let by_char = util::lang_by_char(lang); let by_char = util::lang_by_char(lang);
let filtered_str = filter_str(textual_date); let filtered_str = filter_datestr(textual_date);
let nums = util::parse_numeric_vec::<u16>(textual_date); let nums = util::parse_numeric_vec::<u16>(textual_date);

791
testfiles/dict/dictionary.json
View file

File diff suppressed because it is too large Load diff

2
testfiles/dict/format_dict.js
View file

@ -57,4 +57,4 @@ for (const [mainLang, entry] of Object.entries(dict)) {
} }
} }
fs.writeFileSync(DICT_PATH, JSON.stringify(dict, null, 2)); fs.writeFileSync(DICT_PATH, JSON.stringify(dict, null, 2) + "\n");