itsscb/chrono
1
0
Fork 0
mirror of https://github.com/chronotope/chrono.git synced 2025-10-04 00:06:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make %r use locale's 12 hour clock time

Browse Source
This commit is contained in:
Paul Dicker 2023-07-03 14:44:17 +02:00 committed by Paul Dicker
parent 3c50b428a9
commit dfd3cf5e50
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/format/locales.rs
View File

@ -31,3 +31,7 @@ pub(crate) const fn d_t_fmt(locale: Locale) -> &'static str {
pub(crate) const fn t_fmt(locale: Locale) -> &'static str { pub(crate) const fn t_fmt(locale: Locale) -> &'static str {
locale_match!(locale => LC_TIME::T_FMT) locale_match!(locale => LC_TIME::T_FMT)
} }
pub(crate) const fn t_fmt_ampm(locale: Locale) -> &'static str {
locale_match!(locale => LC_TIME::T_FMT_AMPM)
}

40
src/format/strftime.rs
View File

@ -65,7 +65,7 @@ The following specifiers are available both to formatting and parsing.
| `%R` | `00:34` | Hour-minute format. Same as `%H:%M`. | | `%R` | `00:34` | Hour-minute format. Same as `%H:%M`. |
| `%T` | `00:34:60` | Hour-minute-second format. Same as `%H:%M:%S`. | | `%T` | `00:34:60` | Hour-minute-second format. Same as `%H:%M:%S`. |
| `%X` | `00:34:60` | Locale's time representation (e.g., 23:13:48). | | `%X` | `00:34:60` | Locale's time representation (e.g., 23:13:48). |
| `%r` | `12:34:60 AM` | Hour-minute-second format in 12-hour clocks. Same as `%I:%M:%S %p`. | | `%r` | `12:34:60 AM` | Locale's 12 hour clock time. (e.g., 11:11:04 PM). Falls back to `%X` if the locale does not have a 12 hour clock format. |
| | | | | | | |
| | | **TIME ZONE SPECIFIERS:** | | | | **TIME ZONE SPECIFIERS:** |
| `%Z` | `ACST` | Local time zone name. Skips all non-whitespace characters during parsing. Identical to `%:z` when formatting. [^8] | | `%Z` | `ACST` | Local time zone name. Skips all non-whitespace characters during parsing. Identical to `%:z` when formatting. [^8] |
@ -274,6 +274,15 @@ impl<'a> StrftimeItems<'a> {
]; ];
static T_FMT: &[Item<'static>] = static T_FMT: &[Item<'static>] =
&[num0(Hour), Literal(":"), num0(Minute), Literal(":"), num0(Second)]; &[num0(Hour), Literal(":"), num0(Minute), Literal(":"), num0(Second)];
static T_FMT_AMPM: &[Item<'static>] = &[
num0(Hour12),
Literal(":"),
num0(Minute),
Literal(":"),
num0(Second),
Space(" "),
fixed(Fixed::UpperAmPm),
];
match remainder.chars().next() { match remainder.chars().next() {
// we are done // we are done
@ -366,15 +375,19 @@ impl<'a> StrftimeItems<'a> {
'm' => num0(Month), 'm' => num0(Month),
'n' => Space("\n"), 'n' => Space("\n"),
'p' => fixed(Fixed::UpperAmPm), 'p' => fixed(Fixed::UpperAmPm),
'r' => queue![ #[cfg(not(feature = "unstable-locales"))]
num0(Hour12), 'r' => queue_from_slice!(T_FMT_AMPM),
Literal(":"), #[cfg(feature = "unstable-locales")]
num0(Minute), 'r' => {
Literal(":"), if self.locale.is_some()
num0(Second), && locales::t_fmt_ampm(self.locale.unwrap()).is_empty()
Space(" "), {
fixed(Fixed::UpperAmPm) // 12-hour clock not supported by this locale. Switch to 24-hour format.
], self.switch_to_locale_str(locales::t_fmt, T_FMT)
} else {
self.switch_to_locale_str(locales::t_fmt_ampm, T_FMT_AMPM)
}
}
's' => num(Timestamp), 's' => num(Timestamp),
't' => Space("\t"), 't' => Space("\t"),
'u' => num(WeekdayFromMon), 'u' => num(WeekdayFromMon),
@ -704,7 +717,7 @@ mod tests {
assert_eq!(dt.format_localized("%R", Locale::fr_BE).to_string(), "00:34"); assert_eq!(dt.format_localized("%R", Locale::fr_BE).to_string(), "00:34");
assert_eq!(dt.format_localized("%T", Locale::fr_BE).to_string(), "00:34:60"); assert_eq!(dt.format_localized("%T", Locale::fr_BE).to_string(), "00:34:60");
assert_eq!(dt.format_localized("%X", Locale::fr_BE).to_string(), "00:34:60"); assert_eq!(dt.format_localized("%X", Locale::fr_BE).to_string(), "00:34:60");
assert_eq!(dt.format_localized("%r", Locale::fr_BE).to_string(), "12:34:60 "); assert_eq!(dt.format_localized("%r", Locale::fr_BE).to_string(), "00:34:60");
// date & time specifiers // date & time specifiers
assert_eq!( assert_eq!(
@ -803,7 +816,10 @@ mod tests {
assert_eq!(dt.format_localized("%r", Locale::ja_JP).to_string(), "午前12時34分60秒"); assert_eq!(dt.format_localized("%r", Locale::ja_JP).to_string(), "午前12時34分60秒");
// date & time specifiers // date & time specifiers
assert_eq!(dt.format_localized("%c", Locale::ja_JP).to_string(), "2001年07月08日 00時34分60秒"); assert_eq!(
dt.format_localized("%c", Locale::ja_JP).to_string(),
"2001年07月08日 00時34分60秒"
);
} }
#[test] #[test]