commit 79d1b6cd27a9dd8c483757751f6234bf44d27f27
author Almaz Mingaleev <mingaleev@google.com> Mon Dec 12 23:41:20 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Dec 12 23:41:20 2022 +0000
tree c2bc967ca19b22c9861c2ba1154f1fe53bd6f6d0
parent 5689ba8723f3522dd76adf097ec82855e1bb03c3
parent 58f3a5f37d037e513b70991454f3a6abab1c2783

[automerger skipped] DO NOT MERGE Update Android CLDR data from 2022f to 2022g. [R] am: 90048afe2d -s ours am: d041ad89b9 -s ours am: 01677e46fc -s ours am: 10737dcd0c -s ours am: 10711fdf72 -s ours am: 58f3a5f37d -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/cldr/+/20689328

Change-Id: I2cc7a8d1bef4f32b595c6bc5911c6f9917b19a1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

common/main/en.xml

diff --git a/common/main/en.xml b/common/main/en.xml
index 30fc33e..7704c38 100644
--- a/common/main/en.xml
+++ b/common/main/en.xml
@@ -1150,7 +1150,10 @@
 			<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 &amp; Tobago</territory>
 			<territory type="TV">Tuvalu</territory>
 			<territory type="TW">Taiwan</territory>

common/main/en_GB.xml

diff --git a/common/main/en_GB.xml b/common/main/en_GB.xml
index 85c0ba7..fee638a 100644
--- a/common/main/en_GB.xml
+++ b/common/main/en_GB.xml
@@ -954,7 +954,10 @@
 			<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>

tools/cldr-code/src/main/java/org/unicode/cldr/util/XMLSource.java

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 618a247..c6e8a6f 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 @@
             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");