diff options
| author | Victor Chang <vichang@google.com> | 2021-01-19 10:19:17 +0000 |
|---|---|---|
| committer | Victor Chang <vichang@google.com> | 2024-04-19 12:16:36 +0100 |
| commit | d84a390a9662686c38d57ca3f7a92d2d9a115886 (patch) | |
| tree | d3fdb5b61d079250cca2dbb2534472c7325f1dcb | |
| parent | 8c161094f739f5632f6f11c5651a47fc957e8cb3 (diff) | |
| download | icu-d84a390a9662686c38d57ca3f7a92d2d9a115886.tar.gz | |
Android patch: Display names for countries/regions and currency symbol
1. Display names for Macedonia and Falkland Islands.
This change was originally introduced for English in Android by the
ICU52 upgrade:
https://android.googlesource.com/platform/external/icu/+/59d709d
As of the O release, this is replaced by consistently selecting the CLDR
variant name for all locales:
https://android.googlesource.com/platform/external/icu/+/ce738d3
https://android.googlesource.com/platform/external/icu/+/30d5dcd
It was later replaced by a patch in dataModifiers.txt in external/cldr.
https://r.android.com/692427
Bug: 36123938
2. Display name for Palestine.
This change was introduced in Android by the ICU4.4.1 upgrade:
https://android.googlesource.com/platform/external/icu/+/50294ea
It was later replaced by a patch in dataModifiers.txt in external/cldr.
https://r.android.com/692426
Bug: 8264703
3. Ukrainian hryvnia currency symbol.
Use the variant form instead of the hryvnia symbol:
https://unicode.org/cldr/trac/ticket/8814
This change was introduced in Android by this patch:
https://android.googlesource.com/platform/external/icu/+/cbdaa2b
It was later replaced by a patch in dataModifiers.txt in external/cldr.
https://r.android.com/692428
Bug: 21295835
Test: n/a
Change-Id: Ide76eb75e44e6e462048ecc77bfa8f501e9924c0
| -rw-r--r-- | tools/cldr/cldr-to-icu/build-icu-data.xml | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/tools/cldr/cldr-to-icu/build-icu-data.xml b/tools/cldr/cldr-to-icu/build-icu-data.xml index 22851b96d..d3a5f386a 100644 --- a/tools/cldr/cldr-to-icu/build-icu-data.xml +++ b/tools/cldr/cldr-to-icu/build-icu-data.xml @@ -396,6 +396,24 @@ <!-- <altPath target="//path/to/value[@attr='foo']" source="//path/to/value[@attr='bar']" locales="xx,yy_ZZ"/> --> + <!-- Android patch (b/36123938) begin. --> + <altPath target="//ldml/localeDisplayNames/territories/territory[@type='FK']" + source="//ldml/localeDisplayNames/territories/territory[@type='FK'][@alt='variant']"/> + <altPath target="//ldml/localeDisplayNames/territories/territory[@type='HK']" + source="//ldml/localeDisplayNames/territories/territory[@type='HK'][@alt='short']"/> + <altPath target="//ldml/localeDisplayNames/territories/territory[@type='MK']" + source="//ldml/localeDisplayNames/territories/territory[@type='MK'][@alt='variant']"/> + <altPath target="//ldml/localeDisplayNames/territories/territory[@type='MO']" + source="//ldml/localeDisplayNames/territories/territory[@type='MO'][@alt='short']"/> + <!-- Android patch (b/36123938) end. --> + <!-- Android patch (b/8264703) begin. --> + <altPath target="//ldml/localeDisplayNames/territories/territory[@type='PS']" + source="//ldml/localeDisplayNames/territories/territory[@type='PS'][@alt='short']"/> + <!-- Android patch (b/8264703) end. --> + <!-- Android patch (b/21295835) begin. --> + <altPath target="//ldml/numbers/currencies/currency[@type='UAH']/symbol" + source="//ldml/numbers/currencies/currency[@type='UAH']/symbol[@alt='variant']"/> + <!-- Android patch (b/21295835) end. --> </convert> <generateCode cldrDir="${cldrDir}" cOutDir="${genCCodeDir}" javaOutDir="${genJavaCodeDir}" unless:true="${dontGenCode}" /> |