Inline the value of %r in T_FMT

chronotope · Jan 26, 2024 · 457413f · 457413f
1 parent b77fdd4
commit 457413f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/generate-api/src/main.rs b/generate-api/src/main.rs
@@ -119,6 +119,7 @@ fn validate_and_fix_t_fmt_ampm(objects: &mut Vec<Object>) {
 
 /// In some locales `D_T_FMT` refers to other items:
 /// to `D_FMT` with `%x`, `T_FMT` with `%X`, and/or `T_FMT_AMPM` with `%r`.
+/// In the same way `T_FMT` can refer `T_FMT_AMPM` with `%r`.
 /// Inlining these strings simplifies the implementation of the strftime parser in chrono.
 fn validate_and_fix_d_t_fmt(objects: &mut Vec<Object>) {
     for object in objects.iter_mut() {
@@ -141,7 +142,7 @@ fn validate_and_fix_d_t_fmt(objects: &mut Vec<Object>) {
         }
         for (key, ref mut value) in object.values.iter_mut() {
             match (key.as_str(), value) {
-                ("d_t_fmt", vec) => {
+                ("d_t_fmt", vec) | ("t_fmt", vec) => {
                     if let Value::String(ref val) = vec[0] {
                         let d_t_fmt = val
                             .replace("%x", &d_fmt)

diff --git a/src/lib.rs b/src/lib.rs