diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-01-10 00:04:59 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-01-10 00:04:59 +0000 |
commit | e17074aeca678696b07b2799908b39a7c6a82fa8 (patch) | |
tree | c2bc967ca19b22c9861c2ba1154f1fe53bd6f6d0 | |
parent | 2290844782b589304f5b055440cffd3a993c33cb (diff) | |
parent | 79d1b6cd27a9dd8c483757751f6234bf44d27f27 (diff) | |
download | cldr-android13-qpr3-s10-release.tar.gz |
Snap for 9470583 from 79d1b6cd27a9dd8c483757751f6234bf44d27f27 to tm-qpr3-releaseandroid-13.0.0_r83android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-release
Change-Id: Ice13376ae742dc9d5c883782ddb3316ac148f340
-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"); |