Remove HourCycle::H24 (#6426)

robertbastian · web-flow · commit b2cc23818818 · 2025-04-08T17:14:56.000+02:00
Fixes #6220
diff --git a/components/datetime/benches/fixtures/mod.rs b/components/datetime/benches/fixtures/mod.rs
@@ -70,7 +70,6 @@ pub enum TestHourCycle {
     H11,
     H12,
     H23,
-    H24,
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
diff --git a/components/datetime/benches/fixtures/tests/components.json b/components/datetime/benches/fixtures/tests/components.json
@@ -495,7 +495,7 @@
                         "length": "short",
                         "timePrecision": "minute"
                     },
-                    "hourCycle": "h24"
+                    "hourCycle": "h23"
                 }
             },
             {
@@ -551,7 +551,7 @@
                         "length": "short",
                         "timePrecision": "minute"
                     },
-                    "hourCycle": "h24"
+                    "hourCycle": "h23"
                 }
             }
         ],
diff --git a/components/datetime/src/dynamic.rs b/components/datetime/src/dynamic.rs
@@ -480,7 +480,7 @@ impl TimeFieldSet {
         match hour_cycle {
             None => Self::ATTR_T,
             Some(H11 | H12) => Self::ATTR_T12,
-            Some(H23 | H24) => Self::ATTR_T24,
+            Some(H23) => Self::ATTR_T24,
         }
     }
 }
diff --git a/components/datetime/src/fieldsets.rs b/components/datetime/src/fieldsets.rs
@@ -1118,14 +1118,14 @@ impl_time_marker!(
     /// );
     ///
     /// let formatter = NoCalendarFormatter::try_new(
-    ///     locale!("und-u-hc-h24").into(),
+    ///     locale!("und-u-hc-h23").into(),
     ///     T::short().hm(),
     /// )
     /// .unwrap();
     ///
     /// assert_writeable_eq!(
     ///     formatter.format(&Time::try_new(0, 0, 0, 0).unwrap()),
-    ///     "24:00"
+    ///     "00:00"
     /// );
     /// ```
     ///
diff --git a/components/datetime/src/format/datetime.rs b/components/datetime/src/format/datetime.rs
@@ -342,13 +342,6 @@ where
                     }
                 }
                 fields::Hour::H23 => h,
-                fields::Hour::H24 => {
-                    if h == 0 {
-                        24
-                    } else {
-                        h
-                    }
-                }
             };
             try_write_number(PART, w, decimal_formatter, h.into(), l)?
         }
diff --git a/components/datetime/src/provider/fields/components.rs b/components/datetime/src/provider/fields/components.rs
@@ -249,7 +249,6 @@ impl Bag {
             // fields::Hour::H11
             // fields::Hour::H12
             // fields::Hour::H23
-            // fields::Hour::H24
 
             let hour_cycle = self.hour_cycle.unwrap_or(default_hour_cycle);
 
@@ -266,7 +265,7 @@ impl Bag {
                     }
                     // Skeletons only contain the h23, not h24. The pattern that is matched
                     // is free to use h23 or h24.
-                    HourCycle::H24 | HourCycle::H23 => {
+                    HourCycle::H23 => {
                         // H - symbol
                         fields::Hour::H23
                     }
@@ -714,7 +713,6 @@ impl Bag {
                         fields::Hour::H11 => HourCycle::H11,
                         fields::Hour::H12 => HourCycle::H12,
                         fields::Hour::H23 => HourCycle::H23,
-                        fields::Hour::H24 => HourCycle::H24,
                     });
                 }
                 FieldSymbol::Minute => {
diff --git a/components/datetime/src/provider/fields/symbols.rs b/components/datetime/src/provider/fields/symbols.rs
@@ -33,7 +33,7 @@ impl core::error::Error for SymbolError {}
 /// Field symbols are a more granular distinction
 /// for a pattern field within the category of a field type. Examples of field types are:
 /// `Year`, `Month`, `Hour`.  Within the [`Hour`] field type, examples of field symbols are: [`Hour::H12`],
-/// [`Hour::H24`]. Each field symbol is represented within the date formatting pattern string
+/// [`Hour::H23`]. Each field symbol is represented within the date formatting pattern string
 /// by a distinct character from the set of `A..Z` and `a..z`.
 #[derive(Debug, Eq, PartialEq, Clone, Copy)]
 #[cfg_attr(feature = "datagen", derive(serde::Serialize, databake::Bake))]
@@ -297,7 +297,6 @@ impl FieldSymbol {
             Self::Hour(Hour::H11) => 18,
             Self::Hour(Hour::H12) => 19,
             Self::Hour(Hour::H23) => 20,
-            Self::Hour(Hour::H24) => 21,
             Self::Minute => 22,
             Self::Second(Second::Second) => 23,
             Self::Second(Second::MillisInDay) => 24,
@@ -583,8 +582,6 @@ field_type!(
         'h' => H12 = 1,
         /// Field symbol for numeric hour [0-23].
         'H' => H23 = 2,
-        /// Field symbol for numeric hour [1-24].
-        'k' => H24 = 3,
     };
     Numeric;
     HourULE
@@ -596,7 +593,6 @@ impl Hour {
             HourCycle::H11 => Self::H11,
             HourCycle::H12 => Self::H12,
             HourCycle::H23 => Self::H23,
-            HourCycle::H24 => Self::H24,
             _ => unreachable!(),
         }
     }
diff --git a/components/datetime/src/provider/pattern/hour_cycle.rs b/components/datetime/src/provider/pattern/hour_cycle.rs
@@ -12,7 +12,7 @@ use crate::provider::{self, skeleton};
 use icu_locale_core::preferences::extensions::unicode::keywords::HourCycle;
 use icu_provider::prelude::*;
 
-/// Used to represent either H11/H12, or H23/H24. Skeletons only store these
+/// Used to represent either H11/H12, or H23. Skeletons only store these
 /// hour cycles as H12 or H23.
 #[derive(Debug, PartialEq, Clone, Copy, yoke::Yokeable, zerofrom::ZeroFrom)]
 #[cfg_attr(feature = "datagen", derive(serde::Serialize, databake::Bake))]
@@ -22,15 +22,15 @@ use icu_provider::prelude::*;
 pub enum CoarseHourCycle {
     /// Can either be fields::Hour::H11 or fields::Hour::H12
     H11H12,
-    /// Can either be fields::Hour::H23 or fields::Hour::H24
-    H23H24,
+    /// fields::Hour::H23
+    H23,
 }
 
-/// Default is required for serialization. H23H24 is the more locale-agnostic choice, as it's
+/// Default is required for serialization. H23 is the more locale-agnostic choice, as it's
 /// less likely to have a day period in it.
 impl Default for CoarseHourCycle {
     fn default() -> Self {
-        CoarseHourCycle::H23H24
+        CoarseHourCycle::H23
     }
 }
 
@@ -46,7 +46,7 @@ impl CoarseHourCycle {
             {
                 return Some(match pattern_hour {
                     fields::Hour::H11 | fields::Hour::H12 => CoarseHourCycle::H11H12,
-                    fields::Hour::H23 | fields::Hour::H24 => CoarseHourCycle::H23H24,
+                    fields::Hour::H23 => CoarseHourCycle::H23,
                 });
             }
         }
@@ -71,11 +71,11 @@ impl CoarseHourCycle {
                     if match self {
                         CoarseHourCycle::H11H12 => match pattern_hour {
                             fields::Hour::H11 | fields::Hour::H12 => true,
-                            fields::Hour::H23 | fields::Hour::H24 => false,
+                            fields::Hour::H23 => false,
                         },
-                        CoarseHourCycle::H23H24 => match pattern_hour {
+                        CoarseHourCycle::H23 => match pattern_hour {
                             fields::Hour::H11 | fields::Hour::H12 => false,
-                            fields::Hour::H23 | fields::Hour::H24 => true,
+                            fields::Hour::H23 => true,
                         },
                     } {
                         // The preference hour cycle matches the pattern, bail out early and
@@ -85,7 +85,7 @@ impl CoarseHourCycle {
                         // Mutate the pattern with the new symbol, so that it can be matched against.
                         *symbol = fields::FieldSymbol::Hour(match self {
                             CoarseHourCycle::H11H12 => fields::Hour::H12,
-                            CoarseHourCycle::H23H24 => fields::Hour::H23,
+                            CoarseHourCycle::H23 => fields::Hour::H23,
                         });
                         break;
                     }
@@ -117,8 +117,8 @@ impl CoarseHourCycle {
     /// Get the other coarse hour cycle (map h11/h12 to h23/h24, and vice versa)
     pub fn invert(self) -> Self {
         match self {
-            CoarseHourCycle::H11H12 => CoarseHourCycle::H23H24,
-            CoarseHourCycle::H23H24 => CoarseHourCycle::H11H12,
+            CoarseHourCycle::H11H12 => CoarseHourCycle::H23,
+            CoarseHourCycle::H23 => CoarseHourCycle::H11H12,
         }
     }
 }
diff --git a/components/datetime/src/provider/skeleton/helpers.rs b/components/datetime/src/provider/skeleton/helpers.rs
@@ -534,7 +534,7 @@ impl components::Bag {
 
         let default_hour_cycle = match preferred_hour_cycle {
             CoarseHourCycle::H11H12 => HourCycle::H12,
-            CoarseHourCycle::H23H24 => HourCycle::H23,
+            CoarseHourCycle::H23 => HourCycle::H23,
         };
         let fields = self.to_vec_fields(default_hour_cycle);
         match create_best_pattern_for_fields(skeletons, length_patterns, &fields, &self, false) {
diff --git a/components/datetime/src/provider/skeleton/reference.rs b/components/datetime/src/provider/skeleton/reference.rs
@@ -98,9 +98,7 @@ impl From<&Pattern> for Skeleton {
                     FieldSymbol::Hour(fields::Hour::H11) | FieldSymbol::Hour(fields::Hour::H12) => {
                         FieldSymbol::Hour(fields::Hour::H12)
                     }
-                    FieldSymbol::Hour(fields::Hour::H23) | FieldSymbol::Hour(fields::Hour::H24) => {
-                        FieldSymbol::Hour(fields::Hour::H23)
-                    }
+                    FieldSymbol::Hour(fields::Hour::H23) => FieldSymbol::Hour(fields::Hour::H23),
 
                     // Pass through all of the following preferences unchanged.
                     FieldSymbol::Minute
diff --git a/components/datetime/tests/fixtures/tests/components_hour_cycle.json b/components/datetime/tests/fixtures/tests/components_hour_cycle.json
@@ -71,30 +71,6 @@
             }
         }
     },
-    {
-        "description": "h24 in the english locale",
-        "input": {
-            "value": "2020-01-07T00:25:07.000",
-            "options": {
-                "components": {
-                    "hour": "numeric",
-                    "minute": "numeric"
-                },
-                "semantic": {
-                    "length": "short",
-                    "timePrecision": "minute"
-                }
-            }
-        },
-        "output": {
-            "values": {
-                "en-u-hc-h24": {
-                    "formatted": "24:25",
-                    "pattern": "kk:mm"
-                }
-            }
-        }
-    },
 
     {
         "description": "h11 in the arabic locale",
@@ -159,27 +135,6 @@
             }
         }
     },
-    {
-        "description": "h24 in the arabic locale",
-        "input": {
-            "value": "2020-01-07T00:25:07.000",
-            "options": {
-                "components": {
-                    "hour": "numeric",
-                    "minute": "numeric"
-                },
-                "semantic": {
-                    "length": "short",
-                    "timePrecision": "minute"
-                }
-            }
-        },
-        "output": {
-            "values": {
-                "ar-EG-u-hc-h24": "٢٤:٢٥"
-            }
-        }
-    },
     {
         "description": "h11 with singleton h",
         "input": {
@@ -239,25 +194,5 @@
                 "en-u-hc-h23": "00"
             }
         }
-    },
-    {
-        "description": "h24 with singleton h",
-        "input": {
-            "value": "2002-12-31T00:05:07.000",
-            "options": {
-                "components": {
-                    "hour": "numeric"
-                },
-                "semantic": {
-                    "length": "short",
-                    "timePrecision": "hour"
-                }
-            }
-        },
-        "output": {
-            "values": {
-                "en-u-hc-h24": "24"
-            }
-        }
     }
 ]
diff --git a/components/datetime/tests/fixtures/tests/lengths_with_preferences.json b/components/datetime/tests/fixtures/tests/lengths_with_preferences.json
@@ -16,23 +16,6 @@
             }
         }
     },
-    {
-        "description": "Hour cycle preference h24",
-        "input": {
-            "value": "2020-02-20T00:12:00.000",
-            "options": {
-                "length": {
-                    "time": "medium",
-                    "date": "medium"
-                }
-            }
-        },
-        "output": {
-            "values": {
-                "en-u-hc-h24": "Feb 20, 2020, 24:12:00"
-            }
-        }
-    },
     {
         "description": "Hour cycle preference h11",
         "input": {
@@ -101,23 +84,6 @@
             }
         }
     },
-    {
-        "description": "Japan hour cycles can use h24",
-        "input": {
-            "value": "2020-02-20T00:12:00.000",
-            "options": {
-                "length": {
-                    "time": "medium",
-                    "date": "full"
-                }
-            }
-        },
-        "output": {
-            "values": {
-                "ja-u-hc-h24": "2020年2月20日木曜日 24:12:00"
-            }
-        }
-    },
     {
         "description": "Japan hour cycles prefer h23",
         "input": {
diff --git a/components/datetime/tests/resolved_components.rs b/components/datetime/tests/resolved_components.rs
@@ -67,12 +67,12 @@ fn test_length_time_preferences() {
     components_bag.hour = Some(components::Numeric::TwoDigit);
     components_bag.minute = Some(components::Numeric::TwoDigit);
     components_bag.second = Some(components::Numeric::TwoDigit);
-    components_bag.hour_cycle = Some(HourCycle::H24);
+    components_bag.hour_cycle = Some(HourCycle::H23);
 
     assert_resolved_components(
         skeleton,
         &components_bag,
-        "en-u-hc-h24".parse::<Locale>().unwrap(),
+        "en-u-hc-h23".parse::<Locale>().unwrap(),
     );
 }
 
diff --git a/components/locale/tests/fixtures/maximize.json b/components/locale/tests/fixtures/maximize.json
@@ -172,8 +172,8 @@
     "output": "zh-Hant-TW"
   },
   {
-    "input": "zh-hant-u-nu-Chinese-hc-h24",
-    "output": "zh-Hant-TW-u-hc-h24-nu-chinese"
+    "input": "zh-hant-u-nu-Chinese-hc-h23",
+    "output": "zh-Hant-TW-u-hc-h23-nu-chinese"
   },
   {
     "input": "und-001",
diff --git a/components/locale/tests/fixtures/minimize.json b/components/locale/tests/fixtures/minimize.json
@@ -20,7 +20,7 @@
     "output": "es-preeuro"
   },
   {
-    "input": "zh-Hant-TW-u-hc-h24-nu-chinese",
-    "output": "zh-TW-u-hc-h24-nu-chinese"
+    "input": "zh-Hant-TW-u-hc-h23-nu-chinese",
+    "output": "zh-TW-u-hc-h23-nu-chinese"
   }
 ]
diff --git a/components/locale_core/src/preferences/extensions/unicode/keywords/hour_cycle.rs b/components/locale_core/src/preferences/extensions/unicode/keywords/hour_cycle.rs
@@ -17,8 +17,4 @@ enum_keyword!(
         ("h23" => H23),
         /// Variant of the 12-hour clock, sometimes used in Japan. Hours are numbered 0–11. Corresponds to 'K' in patterns.
         ("h11" => H11),
-        /// Variant of the 24-hour clock, not in common use. Hours are numbered 1–24. Corresponds to 'k' in patterns.
-        ///
-        /// ❗ This is not the typical 24-hour clock! See `H23` above for the 24-hour clock used throughout most of the world.
-        ("h24" => H24),
 }, "hc");
diff --git a/components/locale_core/src/preferences/mod.rs b/components/locale_core/src/preferences/mod.rs
diff --git a/provider/source/src/datetime/patterns.rs b/provider/source/src/datetime/patterns.rs
diff --git a/provider/source/src/datetime/skeletons.rs b/provider/source/src/datetime/skeletons.rs

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,6 @@ pub enum TestHourCycle {`
`70`	`70`	`H11,`
`71`	`71`	`H12,`
`72`	`72`	`H23,`
`73`		`- H24,`
`74`	`73`	`}`
`75`	`74`
`76`	`75`	`#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]`
Original file line number	Diff line number	Diff line change
`@@ -495,7 +495,7 @@`
`495`	`495`	`"length": "short",`
`496`	`496`	`"timePrecision": "minute"`
`497`	`497`	`},`
`498`		`- "hourCycle": "h24"`
	`498`	`+ "hourCycle": "h23"`
`499`	`499`	`}`
`500`	`500`	`},`
`501`	`501`	`{`
`@@ -551,7 +551,7 @@`
`551`	`551`	`"length": "short",`
`552`	`552`	`"timePrecision": "minute"`
`553`	`553`	`},`
`554`		`- "hourCycle": "h24"`
	`554`	`+ "hourCycle": "h23"`
`555`	`555`	`}`
`556`	`556`	`}`
`557`	`557`	`],`
Original file line number	Diff line number	Diff line change
`@@ -480,7 +480,7 @@ impl TimeFieldSet {`
`480`	`480`	`match hour_cycle {`
`481`	`481`	`None => Self::ATTR_T,`
`482`	`482`	`Some(H11 \| H12) => Self::ATTR_T12,`
`483`		`- Some(H23 \| H24) => Self::ATTR_T24,`
	`483`	`+ Some(H23) => Self::ATTR_T24,`
`484`	`484`	`}`
`485`	`485`	`}`
`486`	`486`	`}`
Original file line number	Diff line number	Diff line change
`@@ -342,13 +342,6 @@ where`
`342`	`342`	`}`
`343`	`343`	`}`
`344`	`344`	`fields::Hour::H23 => h,`
`345`		`- fields::Hour::H24 => {`
`346`		`- if h == 0 {`
`347`		`- 24`
`348`		`- } else {`
`349`		`- h`
`350`		`- }`
`351`		`- }`
`352`	`345`	`};`
`353`	`346`	`try_write_number(PART, w, decimal_formatter, h.into(), l)?`
`354`	`347`	`}`