Add fixed-length localized offset format

components/datetime/examples/timezone_picker.rs

@@ -16,7 +16,7 @@ fn main() {
     let prefs = locale!("en").into();
 
     let offset_formatter =
-        TimeFormatter::try_new(prefs, fieldsets::zone::LocalizedOffsetLong).unwrap();
+        TimeFormatter::try_new(prefs, fieldsets::zone::LocalizedOffsetFixed).unwrap();
     let non_location_formatter =
         TimeFormatter::try_new(prefs, fieldsets::zone::GenericLong).unwrap();
     let city_formatter = TimeFormatter::try_new(prefs, fieldsets::zone::ExemplarCity).unwrap();

components/datetime/src/dynamic.rs

@@ -156,6 +156,9 @@ pub enum ZoneFieldSet {
     /// The short offset format, as in
     /// “GMT−8”.
     LocalizedOffsetShort(fieldsets::zone::LocalizedOffsetShort),
+    /// The fixed-length offset format, as in
+    /// “GMT−00:00”.
+    LocalizedOffsetFixed(fieldsets::zone::LocalizedOffsetFixed),
     /// The long generic non-location format, as in
     /// “Pacific Time”.
     GenericLong(fieldsets::zone::GenericLong),
@@ -476,6 +479,7 @@ impl_attrs! {
         SpecificShort,
         LocalizedOffsetLong,
         LocalizedOffsetShort,
+        LocalizedOffsetFixed,
         GenericLong,
         GenericShort,
         Location,

components/datetime/src/fieldsets.rs

@@ -1342,6 +1342,15 @@ pub mod zone {
         zone_essentials = yes,
     );
 
+    impl_zone_marker!(
+        LocalizedOffsetFixed,
+        description = "UTC offset, fixed-length",
+        length_override = Long,
+        sample = "GMT-05:00",
+        field = (fields::TimeZone::LocalizedOffset, fields::FieldLength::Two),
+        zone_essentials = yes,
+    );
+
     // TODO: Add short/long UTC offset?
 
     impl_zone_marker!(

components/datetime/src/format/time_zone.rs

@@ -227,7 +227,7 @@ impl FormatTimeZone for LocalizedOffsetFormat {
             sink.write_str(&essentials.offset_unknown)?;
             return Ok(Ok(()));
         };
-        Ok(if offset.is_zero() {
+        Ok(if offset.is_zero() && self.0 != FieldLength::Two {
             sink.write_str(&essentials.offset_zero)?;
             Ok(())
         } else {
@@ -246,7 +246,7 @@ impl FormatTimeZone for LocalizedOffsetFormat {
                     let fd = {
                         let mut fd = SignedFixedDecimal::from(self.offset.hours_part())
                             .with_sign_display(fixed_decimal::SignDisplay::Always);
-                        fd.pad_start(if self.length == FieldLength::Four {
+                        fd.pad_start(if self.length != FieldLength::One {
                             2
                         } else {
                             0
@@ -255,7 +255,7 @@ impl FormatTimeZone for LocalizedOffsetFormat {
                     };
                     self.fdf.format(&fd).write_to(sink)?;
 
-                    if self.length == FieldLength::Four
+                    if self.length != FieldLength::One
                         || self.offset.minutes_part() != 0
                         || self.offset.seconds_part() != 0
                     {

components/datetime/src/neo_serde.rs

@@ -598,6 +598,7 @@ impl FieldSetSerde {
             (ZoneFieldSet::SpecificShort(..), true) => (Self::ZONE_SPECIFIC, short),
             (ZoneFieldSet::LocalizedOffsetLong(..), true) => (Self::ZONE_OFFSET, long),
             (ZoneFieldSet::LocalizedOffsetShort(..), true) => (Self::ZONE_OFFSET, short),
+            (ZoneFieldSet::LocalizedOffsetFixed(..), true) => (Self::ZONE_OFFSET, long),
             (ZoneFieldSet::GenericLong(..), true) => (Self::ZONE_GENERIC, long),
             (ZoneFieldSet::GenericShort(..), true) => (Self::ZONE_GENERIC, short),
             (ZoneFieldSet::Location(..), true) => (Self::ZONE_LOCATION, long),
@@ -607,6 +608,7 @@ impl FieldSetSerde {
             (ZoneFieldSet::SpecificShort(..), false) => (Self::ZONE_SPECIFIC, short),
             (ZoneFieldSet::LocalizedOffsetLong(..), false) => (Self::ZONE_OFFSET_LONG, long),
             (ZoneFieldSet::LocalizedOffsetShort(..), false) => (Self::ZONE_OFFSET, short),
+            (ZoneFieldSet::LocalizedOffsetFixed(..), false) => (Self::ZONE_OFFSET, long),
             (ZoneFieldSet::GenericLong(..), false) => (Self::ZONE_GENERIC_LONG, long),
             (ZoneFieldSet::GenericShort(..), false) => (Self::ZONE_GENERIC, short),
             (ZoneFieldSet::Location(..), false) => (Self::ZONE_LOCATION, long),

components/datetime/src/pattern/names.rs

@@ -2405,8 +2405,8 @@ impl<FSet: DateTimeNamesMarker> RawDateTimeNames<FSet> {
                     )?;
                 }
 
-                // O, OOOO
-                (FS::TimeZone(TimeZone::LocalizedOffset), One | Four) => {
+                // O, OO, OOOO
+                (FS::TimeZone(TimeZone::LocalizedOffset), One | Two | Four) => {
                     self.load_time_zone_essentials(zone_essentials_provider, prefs)?;
                     numeric_field = Some(field);
                 }

components/datetime/tests/patterns/tests/time_zones.json

@@ -13,6 +13,7 @@
       "VVVV": "Los Angeles Time",
 
       "O": "GMT-7",
+      "OO": "GMT-07:00",
       "OOOO": "GMT-07:00",
 
       "x": "-07",
@@ -46,6 +47,7 @@
       "VVVV": "UK Time",
 
       "O": "GMT+1",
+      "OO": "GMT+01:00",
       "OOOO": "GMT+01:00"
     }
   },
@@ -80,6 +82,7 @@
       "VVVV": "日本時間",
 
       "O": "GMT+9",
+      "OO": "GMT+09:00",
       "OOOO": "GMT+09:00"
     }
   },
@@ -97,6 +100,7 @@
       "VVVV": "Тролль",
 
       "O": "GMT",
+      "OO": "GMT+00:00",
       "OOOO": "GMT",
 
       "X": "Z"
@@ -116,6 +120,7 @@
       "VVVV": "Непал",
 
       "O": "GMT+5.45",
+      "OO": "GMT+05.45",
       "OOOO": "GMT+05.45"
     }
   },
@@ -124,6 +129,7 @@
     "datetime": "2021-01-11T12:00:00.000+05:45[Asia/Kathmandu]",
     "expectations": {
       "O": "GMT +৫:৪৫",
+      "OO": "GMT +০৫:৪৫",
       "OOOO": "GMT +০৫:৪৫",
       "Z": "+0545"
     }
@@ -142,6 +148,7 @@
       "VVVV": "שעון ישראל",
 
       "O": "GMT\u200e+3\u200e",
+      "OO": "GMT\u200e+03:00\u200e",
       "OOOO": "GMT\u200e+03:00\u200e"
     }
   },
@@ -159,6 +166,7 @@
       "VVVV": "GMT-07:00",
 
       "O": "GMT-7",
+      "OO": "GMT-07:00",
       "OOOO": "GMT-07:00",
 
       "Z": "-0700",
@@ -179,6 +187,7 @@
       "VVVV": "GMT-07:00",
 
       "O": "GMT-7",
+      "OO": "GMT-07:00",
       "OOOO": "GMT-07:00",
 
       "Z": "-0700",
@@ -199,6 +208,7 @@
       "VVVV": "GMT+?",
 
       "O": "GMT+?",
+      "OO": "GMT+?",
       "OOOO": "GMT+?",
 
       "Z": "+?",
@@ -219,6 +229,7 @@
       "VVVV": "GMT",
 
       "O": "GMT",
+      "OO": "GMT+00:00",
       "OOOO": "GMT",
 
       "Z": "+0000",
@@ -239,6 +250,7 @@
       "VVVV": "GMT",
 
       "O": "GMT",
+      "OO": "GMT+00:00",
       "OOOO": "GMT",
 
       "Z": "+0000",

components/datetime/tests/patterns/time_zones.rs

@@ -24,6 +24,7 @@ pub fn pattern_to_semantic_skeleton(p: &str) -> Option<ZoneFieldSet> {
         "zzzz" => ZoneFieldSet::SpecificLong(fieldsets::zone::SpecificLong),
         "z" => ZoneFieldSet::SpecificShort(fieldsets::zone::SpecificShort),
         "OOOO" => ZoneFieldSet::LocalizedOffsetLong(fieldsets::zone::LocalizedOffsetLong),
+        "OO" => ZoneFieldSet::LocalizedOffsetFixed(fieldsets::zone::LocalizedOffsetFixed),
         "O" => ZoneFieldSet::LocalizedOffsetShort(fieldsets::zone::LocalizedOffsetShort),
         "VVV" => ZoneFieldSet::ExemplarCity(fieldsets::zone::ExemplarCity),
         _ => return None,

ffi/capi/tests/missing_apis.txt

@@ -142,6 +142,7 @@ icu::datetime::fieldsets::enums::TimeFieldSet::zone#FnInEnum
 icu::datetime::fieldsets::enums::ZoneFieldSet#Enum
 icu::datetime::fieldsets::zone::ExemplarCity#Struct
 icu::datetime::fieldsets::zone::GenericLong#Struct
+icu::datetime::fieldsets::zone::LocalizedOffsetFixed#Struct
 icu::datetime::fieldsets::zone::LocalizedOffsetLong#Struct
 icu::datetime::fieldsets::zone::LocalizedOffsetShort#Struct
 icu::datetime::fieldsets::zone::Location#Struct