From fed302b41d736af66eaf78a1e587330089247743 Mon Sep 17 00:00:00 2001 From: Michael Fang Date: Wed, 30 Oct 2013 09:37:12 -0700 Subject: [PATCH] 6931564: Incorrect display name of Locale for south africa Reviewed-by: yhuang --- .../classes/sun/util/resources/sv/LocaleNames_sv.properties | 2 +- jdk/test/sun/text/resources/LocaleData | 3 +++ jdk/test/sun/text/resources/LocaleDataTest.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/jdk/src/share/classes/sun/util/resources/sv/LocaleNames_sv.properties b/jdk/src/share/classes/sun/util/resources/sv/LocaleNames_sv.properties index 96d73a9ba2b..e7bd9e04c9b 100644 --- a/jdk/src/share/classes/sun/util/resources/sv/LocaleNames_sv.properties +++ b/jdk/src/share/classes/sun/util/resources/sv/LocaleNames_sv.properties @@ -1106,7 +1106,7 @@ WF=Wallis och Futuna WS=Samoa YE=Jemen YT=Mayotte -ZA=Sydafrika +ZA=Sydafrika ZM=Zambia ZW=Zimbabwe diff --git a/jdk/test/sun/text/resources/LocaleData b/jdk/test/sun/text/resources/LocaleData index 8dfe01ed0d4..1fd2076a114 100644 --- a/jdk/test/sun/text/resources/LocaleData +++ b/jdk/test/sun/text/resources/LocaleData @@ -7684,3 +7684,6 @@ CurrencyNames/lv_LV/EUR=\u20AC # bug # 6192407 LocaleNames/ko/PT=\ud3ec\ub974\ud22c\uce7c + +# bug 6931564 +LocaleNames/sv/ZA=Sydafrika diff --git a/jdk/test/sun/text/resources/LocaleDataTest.java b/jdk/test/sun/text/resources/LocaleDataTest.java index 130f48b031f..8918f1a1513 100644 --- a/jdk/test/sun/text/resources/LocaleDataTest.java +++ b/jdk/test/sun/text/resources/LocaleDataTest.java @@ -35,7 +35,7 @@ * 6645405 6650730 6910489 6573250 6870908 6585666 6716626 6914413 6916787 * 6919624 6998391 7019267 7020960 7025837 7020583 7036905 7066203 7101495 * 7003124 7085757 7028073 7171028 7189611 8000983 7195759 8004489 8006509 - * 7114053 7074882 7040556 8013836 8021121 6192407 + * 7114053 7074882 7040556 8013836 8021121 6192407 6931564 * @summary Verify locale data * */