commit 960b8303017f6b3b971da4b67bc83c767ba49c8a
author Karsten Tausche <karsten@fairphone.com> Wed Mar 15 21:22:47 2023 +0100
committer Karsten Tausche <karsten@fairphone.com> Wed Mar 15 21:22:47 2023 +0100
tree c2bc967ca19b22c9861c2ba1154f1fe53bd6f6d0
parent 0078200fa09659fa3ddc8efd278bcca0eb584c3b
parent 3d5e129125517b68c70cdcd25dc87c8f8e9bf717

Merge tag 'android-13.0.0_r32' into int/13/fp3

Android 13.0.0 release 32

* tag 'android-13.0.0_r32':
  DO NOT MERGE Update Android CLDR data from 2022f to 2022g. [R]
  DO NOT MERGE Update Android CLDR data from 2022f to 2022g. [S]
  Android patch: [en-GB][hi_Latn] Use "Türkiye" as the default name for TR.
  Android patch: Use "Türkiye" as the default name for TR.
  Cherry-pick: CLDR-15318 Make sure it appears (as missing) in all locales (#2092)
  Cherry-pick: CLDR-15318 Add alt value for TR territory name (#2091)
  DO NOT MERGE Update Android CLDR data from 2022e to 2022f. [R]
  DO NOT MERGE Update Android CLDR data from 2022e to 2022f. [S]
  DO NOT MERGE Update Android CLDR data from 2022d to 2022e. [R]
  DO NOT MERGE Update Android CLDR data from 2022d to 2022e. [S]
  DO NOT MERGE Update Android CLDR data from 2021e to 2022d. [R]
  DO NOT MERGE Update Android CLDR data from 2021e to 2022d. [S]

Change-Id: I5021457a78d5079d8643121e76b22e618be6ef07

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");