From 356c5f45282233378e17519c0e8eb5f32f175846 Mon Sep 17 00:00:00 2001
From: Yoshito Umaoka <y.umaoka@gmail.com>
Date: Thu, 26 May 2011 19:42:16 +0000
Subject: [PATCH] ICU-8589 Corrected the condition for using country display
 name in a time zone partial location name.

X-SVN-Rev: 30147
---
 .../src/com/ibm/icu/impl/TimeZoneGenericNames.java   | 12 ++++++++++--
 .../com/ibm/icu/dev/test/format/DateFormatTest.java  |  5 ++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/TimeZoneGenericNames.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/TimeZoneGenericNames.java
index 4f96ffd61eb..81c6506c69c 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/TimeZoneGenericNames.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/TimeZoneGenericNames.java
@@ -534,9 +534,17 @@ public class TimeZoneGenericNames implements Serializable, Freezable<TimeZoneGen
             return name;
         }
         String location = null;
-        String countryCode = ZoneMeta.getSingleCountry(tzID);
+        String countryCode = ZoneMeta.getCanonicalCountry(tzID);
         if (countryCode != null) {
-            location = getLocaleDisplayNames().regionDisplayName(countryCode);
+            // Is this the golden zone for the region?
+            String regionalGolden = _tznames.getReferenceZoneID(mzID, countryCode);
+            if (tzID.equals(regionalGolden)) {
+                // Use country name
+                location = getLocaleDisplayNames().regionDisplayName(countryCode);
+            } else {
+                // Otherwise, use exemplar city name
+                location = _tznames.getExemplarLocationName(tzID);
+            }
         } else {
             location = _tznames.getExemplarLocationName(tzID);
             if (location == null) {
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java
index 7499342dfcf..156e96dcdde 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java
@@ -1448,7 +1448,10 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
         { "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "zzzz", "GMT+05:30", "+5:30" },
         { "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "v", "(IN)", "Asia/Calcutta" },
         { "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "vvvv", "(IN)", "Asia/Calcutta" },
-        
+
+        // Ticket#8589 Partial location name to use country name if the zone is the golden
+        // zone for the time zone's country.
+        { "en_MX", "America/Chicago", "1995-07-15T00:00:00Z", "vvvv", "Central Time (United States)", "America/Chicago"},
     };
 
     /**