diff options
| author | Victor Chang <vichang@google.com> | 2023-03-15 12:51:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-15 12:51:29 +0000 |
| commit | 8212a4c37325bbfd65667d2ccf0e6d13f4a0e0b9 (patch) | |
| tree | 933f1d49d166ffb76125628282f8d1de699567cb | |
| parent | b1650be1755bf7609f5c44cc2a8209051e7352d8 (diff) | |
| parent | ce036dc1e3ea47f39bd1e5ccb5c7fdf97effba3e (diff) | |
| download | cldr-8212a4c37325bbfd65667d2ccf0e6d13f4a0e0b9.tar.gz | |
Merge "Cherry-pick: CLDR-16399 en_CA revert short date format to 41 (#2759)" am: 7388b6c433 am: 0ffd4d2579 am: ce036dc1e3
Original change: https://android-review.googlesource.com/c/platform/external/cldr/+/2484903
Change-Id: I0afcf062d919c429020c97bc86575ca91737cebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | common/main/en_CA.xml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/common/main/en_CA.xml b/common/main/en_CA.xml index 40d1c2df..7088312d 100644 --- a/common/main/en_CA.xml +++ b/common/main/en_CA.xml @@ -1777,7 +1777,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic </dateFormatLength> <dateFormatLength type="short"> <dateFormat> - <pattern>↑↑↑</pattern> + <pattern>y-MM-dd</pattern> <pattern alt="variant">d/M/yy</pattern> </dateFormat> </dateFormatLength> @@ -1851,7 +1851,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic <dateFormatItem id="Ehms">↑↑↑</dateFormatItem> <dateFormatItem id="EHms">↑↑↑</dateFormatItem> <dateFormatItem id="Gy">↑↑↑</dateFormatItem> - <dateFormatItem id="GyMd">↑↑↑</dateFormatItem> + <dateFormatItem id="GyMd">y-MM-dd G</dateFormatItem> <dateFormatItem id="GyMMM">↑↑↑</dateFormatItem> <dateFormatItem id="GyMMMd">↑↑↑</dateFormatItem> <dateFormatItem id="GyMMMEd">↑↑↑</dateFormatItem> @@ -1866,11 +1866,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic <dateFormatItem id="hmv">↑↑↑</dateFormatItem> <dateFormatItem id="Hmv">↑↑↑</dateFormatItem> <dateFormatItem id="M">↑↑↑</dateFormatItem> - <dateFormatItem id="Md">↑↑↑</dateFormatItem> + <dateFormatItem id="Md">MM-dd</dateFormatItem> <dateFormatItem id="Md" alt="variant">d/M</dateFormatItem> - <dateFormatItem id="MEd">↑↑↑</dateFormatItem> + <dateFormatItem id="MEd">E, MM-dd</dateFormatItem> <dateFormatItem id="MEd" alt="variant">E, d/M</dateFormatItem> - <dateFormatItem id="MMdd">MM/dd</dateFormatItem> + <dateFormatItem id="MMdd">MM-dd</dateFormatItem> <dateFormatItem id="MMdd" alt="variant">dd/MM</dateFormatItem> <dateFormatItem id="MMM">↑↑↑</dateFormatItem> <dateFormatItem id="MMMd">↑↑↑</dateFormatItem> @@ -1880,10 +1880,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic <dateFormatItem id="MMMMW" count="other">↑↑↑</dateFormatItem> <dateFormatItem id="ms">↑↑↑</dateFormatItem> <dateFormatItem id="y">↑↑↑</dateFormatItem> - <dateFormatItem id="yM">↑↑↑</dateFormatItem> - <dateFormatItem id="yMd">↑↑↑</dateFormatItem> + <dateFormatItem id="yM">y-MM</dateFormatItem> + <dateFormatItem id="yMd">y-MM-dd</dateFormatItem> <dateFormatItem id="yMd" alt="variant">d/M/y</dateFormatItem> - <dateFormatItem id="yMEd">↑↑↑</dateFormatItem> + <dateFormatItem id="yMEd">E, y-MM-dd</dateFormatItem> <dateFormatItem id="yMEd" alt="variant">E, d/M/y</dateFormatItem> <dateFormatItem id="yMMM">↑↑↑</dateFormatItem> <dateFormatItem id="yMMMd">↑↑↑</dateFormatItem> |