Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion src/meta/date.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@ impl Date {
val.format("%F").to_string()
}
}
DateFlag::Formatted(format) => val.format_localized(format, locale).to_string(),
// Custom formats are explicit strftime strings; keep POSIX punctuation
// (e.g. '.' for %.Nf). format_localized would use ',' in many locales.
DateFlag::Formatted(format) => val.format(format).to_string(),
}
} else {
String::from('-')
Expand Down Expand Up @@ -366,4 +368,25 @@ mod test {
date.render(&colors, &flags)
);
}

#[test]
fn test_custom_format_keeps_posix_fractional_separator() {
// Regression: PR #820 switched Formatted dates to format_localized(), which uses a
// locale decimal separator (',' in es_ES/de_DE/fr_FR). Custom --date/+TIME_STYLE
// formats are strftime strings and must keep a POSIX '.' for %.Nf (as asserted by
// tests/integration.rs::test_date_custom_format_supports_nanos_with_length).
let date = Date::Date(Local::now());
let colors = Colors::new(ThemeOption::NoColor);
let flags = Flags {
date: DateFlag::Formatted("%.3f".to_string()),
..Default::default()
};

let rendered = date.render(&colors, &flags).to_string();
assert!(
rendered.starts_with('.')
&& rendered.chars().skip(1).take(3).all(|c| c.is_ascii_digit()),
"expected POSIX fractional seconds like .NNN, got {rendered:?}"
);
}
}