commit 64801af3ff237a24eeeebc7251a91db52750cc7f
author Mihai Nita <mnita@google.com> Tue Aug 30 16:23:12 2016 -0700
committer gitbuildkicker <android-build@google.com> Wed Aug 31 22:20:22 2016 -0700
tree 77d4a0b276c740007c8f3df71247866f41842cd8
parent 745f26a9779961811c7a52cf8897dd97dc58d495

Changed Turkish translation for Cyprus, cts tests

This changes the translation from "Güney Kıbrıs Rum Kesimi" to "Kıbrıs"
It backports a change that happened between CLDR 28 and 29.

Bug: 31177615
Change-Id: Ia637195190a60fd3b34d18b1974be5bfba0eaa8a
(cherry picked from commit f28636b4e04f53079401300bb432943752a526bb)
(cherry picked from commit 32157fee31c3e81171102be6faff745e22a19ca0)

android_icu4j/cts-coverage/src/main/tests/android/icu/cts/coverage/text/LocaleDisplayNamesTest.java

diff --git a/android_icu4j/cts-coverage/src/main/tests/android/icu/cts/coverage/text/LocaleDisplayNamesTest.java b/android_icu4j/cts-coverage/src/main/tests/android/icu/cts/coverage/text/LocaleDisplayNamesTest.java
index 14a7586..34495c5 100644
--- a/android_icu4j/cts-coverage/src/main/tests/android/icu/cts/coverage/text/LocaleDisplayNamesTest.java
+++ b/android_icu4j/cts-coverage/src/main/tests/android/icu/cts/coverage/text/LocaleDisplayNamesTest.java
@@ -92,4 +92,21 @@
                 Locale.CHINA, DisplayContext.CAPITALIZATION_NONE);
         assertEquals("拼音罗马字", names.variantDisplayName("PINYIN"));
     }
+
+    // http://b/31177615
+    @Test
+    public void testCyprusTurkishTranslation() {
+        final Locale[] variousTurkishTestLocales = {
+            new Locale("tr"),
+            new Locale("tr", "CY"),
+            new Locale("tr", "TR")
+        };
+
+        for (Locale testLocale : variousTurkishTestLocales) {
+            LocaleDisplayNamesImpl names = (LocaleDisplayNamesImpl) LocaleDisplayNames.getInstance(
+                    testLocale, DisplayContext.STANDARD_NAMES);
+            assertEquals("Bad translation for Cyprus in locale " + testLocale,
+                    "Kıbrıs", names.regionDisplayName("CY"));
+        }
+    }
 }