ZZZZ is a long format (#5685)

[Spec](https://unicode.org/reports/tr35/tr35-dates.html#Contents:~:text=the%20%22xxxx%22%20specifier.-,ZZZZ,localized%20GMT%20format.%20This%20is%20equivalent%20to%20the%20%22OOOO%22%20specifier.,-ZZZZZ)
unicode-org · Oct 15, 2024 · f864a56 · f864a56
1 parent 3a95556
commit f864a56
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/components/datetime/src/format/datetime.rs b/components/datetime/src/format/datetime.rs
@@ -609,13 +609,13 @@ fn select_zone_units(time_zone: ResolvedNeoTimeZoneSkeleton) -> [Option<TimeZone
         ResolvedNeoTimeZoneSkeleton::Location => {
             [Some(TimeZoneFormatterUnit::GenericLocation), None, None]
         }
-        // `O`, `ZZZZ`
+        // `O`
         ResolvedNeoTimeZoneSkeleton::OffsetShort => [
             Some(TimeZoneFormatterUnit::LocalizedOffsetShort),
             None,
             None,
         ],
-        // `OOOO`
+        // `OOOO`, `ZZZZ`
         ResolvedNeoTimeZoneSkeleton::OffsetLong => {
             [Some(TimeZoneFormatterUnit::LocalizedOffsetLong), None, None]
         }

diff --git a/components/datetime/src/tz_registry.rs b/components/datetime/src/tz_registry.rs
@@ -44,7 +44,7 @@ macro_rules! time_zone_style_registry {
                 (SpecificShort, LowerZ, Abbreviated), // 'zzz'
                 (Isoxxxx, UpperZ, TwoDigit), // 'ZZ'
                 (Isoxxxx, UpperZ, Abbreviated), // 'ZZZ'
-                (OffsetShort, UpperZ, Wide), // 'ZZZZ'
+                (OffsetLong, UpperZ, Wide), // 'ZZZZ'
                 (Isoxxxx, LowerX, Wide), // 'xxxx'
                 (IsoXXXXX, UpperX, Narrow), // 'XXXXX'
             ],

diff --git a/components/datetime/tests/patterns/tests/time_zones.json b/components/datetime/tests/patterns/tests/time_zones.json
@@ -36,8 +36,7 @@
       },
       {
         "patterns": [
-          "O",
-          "ZZZZ"
+          "O"
         ],
         "configs": [
           "LocalizedOffsetShort"
@@ -47,7 +46,8 @@
       },
       {
         "patterns": [
-          "OOOO"
+          "OOOO",
+          "ZZZZ"
         ],
         "configs": [
           "LocalizedOffsetLong"
@@ -400,8 +400,7 @@
       },
       {
         "patterns": [
-          "O",
-          "ZZZZ"
+          "O"
         ],
         "configs": [
           "LocalizedOffsetShort"
@@ -411,7 +410,8 @@
       },
       {
         "patterns": [
-          "OOOO"
+          "OOOO",
+          "ZZZZ"
         ],
         "configs": [
           "LocalizedOffsetLong"
@@ -762,8 +762,7 @@
       },
       {
         "patterns": [
-          "O",
-          "ZZZZ"
+          "O"
         ],
         "configs": [
           "LocalizedOffsetShort"
@@ -773,7 +772,8 @@
       },
       {
         "patterns": [
-          "OOOO"
+          "OOOO",
+          "ZZZZ"
         ],
         "configs": [
           "LocalizedOffsetLong"
@@ -906,8 +906,7 @@
       },
       {
         "patterns": [
-          "O",
-          "ZZZZ"
+          "O"
         ],
         "configs": [
           "LocalizedOffsetShort"
@@ -917,7 +916,8 @@
       },
       {
         "patterns": [
-          "OOOO"
+          "OOOO",
+          "ZZZZ"
         ],
         "configs": [
           "LocalizedOffsetLong"
@@ -949,8 +949,7 @@
       },
       {
         "patterns": [
-          "O",
-          "ZZZZ"
+          "O"
         ],
         "configs": [
           "LocalizedOffsetShort"
@@ -960,7 +959,8 @@
       },
       {
         "patterns": [
-          "OOOO"
+          "OOOO",
+          "ZZZZ"
         ],
         "configs": [
           "LocalizedOffsetLong"
@@ -987,7 +987,6 @@
           "z",
           "zz",
           "zzz",
-          "ZZZZ",
           "O"
         ],
         "configs": [],
@@ -996,7 +995,8 @@
       {
         "patterns": [
           "zzzz",
-          "OOOO"
+          "OOOO",
+          "ZZZZ"
         ],
         "configs": [],
         "expected": ["GMT-07:00"]
@@ -1037,7 +1037,6 @@
           "z",
           "zz",
           "zzz",
-          "ZZZZ",
           "O"
         ],
         "configs": [],
@@ -1046,6 +1045,7 @@
       {
         "patterns": [
           "zzzz",
+          "ZZZZ",
           "OOOO"
         ],
         "configs": [],