Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2025-02-05 03:58:25 +00:00
Code Issues Projects Releases Wiki Activity

Fix month name not following locale when date is in current year

Browse Source
This commit is contained in:
ariasuni 2020-12-31 21:18:18 +01:00
parent 2aaead1721
commit 3a8005c840
1 changed files with 20 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/output/time.rs
View File

@ -2,7 +2,7 @@
use std::time::{SystemTime, UNIX_EPOCH}; use std::time::{SystemTime, UNIX_EPOCH};
use datetime::{LocalDateTime, TimeZone, DatePiece, TimePiece, Month}; use datetime::{LocalDateTime, TimeZone, DatePiece, TimePiece};
use datetime::fmt::DateFormat; use datetime::fmt::DateFormat;
use lazy_static::lazy_static; use lazy_static::lazy_static;
@ -75,40 +75,25 @@ impl TimeFormat {
#[allow(trivial_numeric_casts)] #[allow(trivial_numeric_casts)]
fn default_local(time: SystemTime) -> String { fn default_local(time: SystemTime) -> String {
let date = LocalDateTime::at(systemtime_epoch(time)); let date = LocalDateTime::at(systemtime_epoch(time));
let date_format = get_dateformat(&date);
if date.year() == *CURRENT_YEAR { date_format.format(&date, &*LOCALE)
format!("{:2} {} {:02}:{:02}",
date.day(), month_to_abbrev(date.month()),
date.hour(), date.minute())
}
else {
let date_format = match *MAXIMUM_MONTH_WIDTH {
4 => &*FOUR_WIDE_DATE_TIME,
5 => &*FIVE_WIDE_DATE_TIME,
_ => &*OTHER_WIDE_DATE_TIME,
};
date_format.format(&date, &*LOCALE)
}
} }
#[allow(trivial_numeric_casts)] #[allow(trivial_numeric_casts)]
fn default_zoned(time: SystemTime, zone: &TimeZone) -> String { fn default_zoned(time: SystemTime, zone: &TimeZone) -> String {
let date = zone.to_zoned(LocalDateTime::at(systemtime_epoch(time))); let date = zone.to_zoned(LocalDateTime::at(systemtime_epoch(time)));
let date_format = get_dateformat(&date);
date_format.format(&date, &*LOCALE)
}
if date.year() == *CURRENT_YEAR { fn get_dateformat(date: &LocalDateTime) -> &'static DateFormat<'static> {
format!("{:2} {} {:02}:{:02}", match (is_recent(&date), *MAXIMUM_MONTH_WIDTH) {
date.day(), month_to_abbrev(date.month()), (true, 4) => &FOUR_WIDE_DATE_TIME,
date.hour(), date.minute()) (true, 5) => &FIVE_WIDE_DATE_TIME,
} (true, _) => &OTHER_WIDE_DATE_TIME,
else { (false, 4) => &FOUR_WIDE_DATE_YEAR,
let date_format = match *MAXIMUM_MONTH_WIDTH { (false, 5) => &FIVE_WIDE_DATE_YEAR,
4 => &*FOUR_WIDE_DATE_YEAR, (false, _) => &OTHER_WIDE_DATE_YEAR,
5 => &*FIVE_WIDE_DATE_YEAR,
_ => &*OTHER_WIDE_DATE_YEAR,
};
date_format.format(&date, &*LOCALE)
} }
} }
@ -153,7 +138,7 @@ fn full_zoned(time: SystemTime, zone: &TimeZone) -> String {
fn iso_local(time: SystemTime) -> String { fn iso_local(time: SystemTime) -> String {
let date = LocalDateTime::at(systemtime_epoch(time)); let date = LocalDateTime::at(systemtime_epoch(time));
if is_recent(date) { if is_recent(&date) {
format!("{:02}-{:02} {:02}:{:02}", format!("{:02}-{:02} {:02}:{:02}",
date.month() as usize, date.day(), date.month() as usize, date.day(),
date.hour(), date.minute()) date.hour(), date.minute())
@ -168,7 +153,7 @@ fn iso_local(time: SystemTime) -> String {
fn iso_zoned(time: SystemTime, zone: &TimeZone) -> String { fn iso_zoned(time: SystemTime, zone: &TimeZone) -> String {
let date = zone.to_zoned(LocalDateTime::at(systemtime_epoch(time))); let date = zone.to_zoned(LocalDateTime::at(systemtime_epoch(time)));
if is_recent(date) { if is_recent(&date) {
format!("{:02}-{:02} {:02}:{:02}", format!("{:02}-{:02} {:02}:{:02}",
date.month() as usize, date.day(), date.month() as usize, date.day(),
date.hour(), date.minute()) date.hour(), date.minute())
@ -206,27 +191,10 @@ fn systemtime_nanos(time: SystemTime) -> u32 {
}) })
} }
fn is_recent(date: LocalDateTime) -> bool { fn is_recent(date: &LocalDateTime) -> bool {
date.year() == *CURRENT_YEAR date.year() == *CURRENT_YEAR
} }
fn month_to_abbrev(month: Month) -> &'static str {
match month {
Month::January => "Jan",
Month::February => "Feb",
Month::March => "Mar",
Month::April => "Apr",
Month::May => "May",
Month::June => "Jun",
Month::July => "Jul",
Month::August => "Aug",
Month::September => "Sep",
Month::October => "Oct",
Month::November => "Nov",
Month::December => "Dec",
}
}
lazy_static! { lazy_static! {
@ -250,15 +218,15 @@ lazy_static! {
}; };
static ref FOUR_WIDE_DATE_TIME: DateFormat<'static> = DateFormat::parse( static ref FOUR_WIDE_DATE_TIME: DateFormat<'static> = DateFormat::parse(
"{2>:D} {4<:M} {2>:h}:{02>:m}" "{2>:D} {4<:M} {02>:h}:{02>:m}"
).unwrap(); ).unwrap();
static ref FIVE_WIDE_DATE_TIME: DateFormat<'static> = DateFormat::parse( static ref FIVE_WIDE_DATE_TIME: DateFormat<'static> = DateFormat::parse(
"{2>:D} {5<:M} {2>:h}:{02>:m}" "{2>:D} {5<:M} {02>:h}:{02>:m}"
).unwrap(); ).unwrap();
static ref OTHER_WIDE_DATE_TIME: DateFormat<'static> = DateFormat::parse( static ref OTHER_WIDE_DATE_TIME: DateFormat<'static> = DateFormat::parse(
"{2>:D} {:M} {2>:h}:{02>:m}" "{2>:D} {:M} {02>:h}:{02>:m}"
).unwrap(); ).unwrap();
static ref FOUR_WIDE_DATE_YEAR: DateFormat<'static> = DateFormat::parse( static ref FOUR_WIDE_DATE_YEAR: DateFormat<'static> = DateFormat::parse(