diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-11-12 02:05:32 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-11-12 02:05:32 +0000 |
| commit | d4f83d503ed1ec50e092c55ee9a09d53e8b4b2ac (patch) | |
| tree | c2bc967ca19b22c9861c2ba1154f1fe53bd6f6d0 | |
| parent | 9d23236d67c300e0c10d521429aeab2a10fcc699 (diff) | |
| parent | fbab78544ffffbf80ce7a259fe2ec5e783ee7e6c (diff) | |
| download | cldr-d4f83d503ed1ec50e092c55ee9a09d53e8b4b2ac.tar.gz | |
Snap for 9284490 from fbab78544ffffbf80ce7a259fe2ec5e783ee7e6c to tm-qpr2-release
Change-Id: I689fc5924d025cb4b315a7f8170b608a4c18cda1
| -rw-r--r-- | common/main/en.xml | 5 | ||||
| -rw-r--r-- | common/main/en_GB.xml | 5 | ||||
| -rw-r--r-- | tools/cldr-code/src/main/java/org/unicode/cldr/util/XMLSource.java | 5 |
3 files changed, 13 insertions, 2 deletions
diff --git a/common/main/en.xml b/common/main/en.xml index 30fc33eb..7704c38e 100644 --- a/common/main/en.xml +++ b/common/main/en.xml @@ -1150,7 +1150,10 @@ annotations. <territory type="TM">Turkmenistan</territory> <territory type="TN">Tunisia</territory> <territory type="TO">Tonga</territory> - <territory type="TR">Turkey</territory> + <!-- Android patch: Swap the primary and variant name. b/246410688 begin. --> + <territory type="TR">Türkiye</territory> + <territory type="TR" alt="variant">Turkey</territory> + <!-- Android patch: Swap the primary and variant name. b/246410688 end. --> <territory type="TT">Trinidad & Tobago</territory> <territory type="TV">Tuvalu</territory> <territory type="TW">Taiwan</territory> diff --git a/common/main/en_GB.xml b/common/main/en_GB.xml index 85c0ba7c..fee638a9 100644 --- a/common/main/en_GB.xml +++ b/common/main/en_GB.xml @@ -954,7 +954,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic <territory type="TM">Turkmenistan</territory> <territory type="TN">Tunisia</territory> <territory type="TO">Tonga</territory> - <territory type="TR">Turkey</territory> + <!-- Android patch: Swap the primary and variant name. b/246410688 begin. --> + <territory type="TR">Türkiye</territory> + <territory type="TR" alt="variant">Turkey</territory> + <!-- Android patch: Swap the primary and variant name. b/246410688 end. --> <territory type="TT">↑↑↑</territory> <territory type="TV">Tuvalu</territory> <territory type="TW">Taiwan</territory> diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/util/XMLSource.java b/tools/cldr-code/src/main/java/org/unicode/cldr/util/XMLSource.java index 618a2473..c6e8a6f7 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/util/XMLSource.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/util/XMLSource.java @@ -1438,6 +1438,11 @@ public abstract class XMLSource implements Freezable<XMLSource>, Iterable<String addFallbackCode(CLDRFile.TERRITORY_NAME, "TL", "TL", "variant"); addFallbackCode(CLDRFile.TERRITORY_NAME, "SZ", "SZ", "variant"); + // new alternate name + + addFallbackCode(CLDRFile.TERRITORY_NAME, "TR", "TR", "variant"); + + addFallbackCode(CLDRFile.TERRITORY_NAME, "XA", "XA"); addFallbackCode(CLDRFile.TERRITORY_NAME, "XB", "XB"); |