Bug 1818103: Revert date format for en-CA. r=platform-i18n-reviewers,…

…jfkthame, a=dsmith Revert the date format for en-CA per <unicode-org/cldr#2759>. The actual patch is based on <unicode-org/icu#2368>. Differential Revision: https://phabricator.services.mozilla.com/D173406
aosmond · Mar 23, 2023 · 9ee5367 · 9ee5367
1 parent 3230da2
commit 9ee5367
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 2 deletions.
diff --git a/config/external/icu/data/icudt72l.dat b/config/external/icu/data/icudt72l.dat
diff --git a/intl/icu-patches/bug-1818103-CLDR-16399.diff b/intl/icu-patches/bug-1818103-CLDR-16399.diff
@@ -0,0 +1,39 @@
+# https://github.com/unicode-org/cldr/pull/2759
+# https://github.com/unicode-org/cldr/pull/2759.diff
+# https://github.com/unicode-org/icu/pull/2368
+# https://github.com/unicode-org/icu/pull/2368.diff
+#
+# CLDR bug: https://unicode-org.atlassian.net/browse/CLDR-16399
+
+diff --git a/intl/icu/source/data/locales/en_CA.txt b/intl/icu/source/data/locales/en_CA.txt
+--- a/intl/icu/source/data/locales/en_CA.txt
++++ b/intl/icu/source/data/locales/en_CA.txt
+@@ -226,20 +226,26 @@ en_CA{
+                 "h:mm:ss a",
+                 "h:mm a",
+                 "EEEE, MMMM d, y",
+                 "MMMM d, y",
+                 "MMM d, y",
+-                "M/d/yy",
++                "y-MM-dd",
+                 "{1}, {0}",
+                 "{1}, {0}",
+                 "{1}, {0}",
+                 "{1}, {0}",
+                 "{1}, {0}",
+             }
+             availableFormats{
+                 Ed{"E d"}
+-                MMdd{"MM/dd"}
++                GyMd{"y-MM-dd G"}
++                MEd{"E, MM-dd"}
++                MMdd{"MM-dd"}
++                Md{"MM-dd"}
++                yM{"y-MM"}
++                yMEd{"E, y-MM-dd"}
++                yMd{"y-MM-dd"}
+             }
+             dayPeriod{
+                 format{
+                     narrow{
+                         afternoon1{"aft"}
diff --git a/intl/icu/source/data/locales/en_CA.txt b/intl/icu/source/data/locales/en_CA.txt
@@ -228,7 +228,7 @@ en_CA{
                 "EEEE, MMMM d, y",
                 "MMMM d, y",
                 "MMM d, y",
-                "M/d/yy",
+                "y-MM-dd",
                 "{1}, {0}",
                 "{1}, {0}",
                 "{1}, {0}",
@@ -237,7 +237,13 @@ en_CA{
             }
             availableFormats{
                 Ed{"E d"}
-                MMdd{"MM/dd"}
+                GyMd{"y-MM-dd G"}
+                MEd{"E, MM-dd"}
+                MMdd{"MM-dd"}
+                Md{"MM-dd"}
+                yM{"y-MM"}
+                yMEd{"E, y-MM-dd"}
+                yMd{"y-MM-dd"}
             }
             dayPeriod{
                 format{

diff --git a/intl/update-icu.sh b/intl/update-icu.sh
@@ -60,6 +60,7 @@ for patch in \
  bug-1790071-ICU-22132-standardize-vtzone-output.diff \
  bug-1792775-ICU-22198.diff \
  bug-1792775-ICU-22206.diff \
+ bug-1818103-CLDR-16399.diff \
 ; do
   echo "Applying local patch $patch"
   patch -d ${icu_dir}/../../ -p1 --no-backup-if-mismatch < ${icu_dir}/../icu-patches/$patch