OpenJDK / jdk / jdk
changeset 51072:6a037fd949e4
8207152: Placeholder for Japanese new era should be two characters
Reviewed-by: rriggs
| author | naoto |
|---|---|
| date | Thu, 12 Jul 2018 11:24:10 -0700 |
| parents | 040880bdd0d4 |
| children | 34696f3aa22b |
| files | src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ja.java src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ja.java test/jdk/java/util/Calendar/JapaneseEraNameTest.java |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ja.java Wed Jul 11 15:35:47 2018 -0700 +++ b/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ja.java Thu Jul 12 11:24:10 2018 -0700 @@ -91,7 +91,7 @@ "\u5927\u6b63", // Taisho "\u662d\u548c", // Showa "\u5e73\u6210", // Heisei - "\u65b0\u5143\u53f7", // NewEra + "\u5143\u53f7", // NewEra }; final String[] rocEras = { "\u6c11\u56fd\u524d",
--- a/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ja.java Wed Jul 11 15:35:47 2018 -0700 +++ b/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ja.java Thu Jul 12 11:24:10 2018 -0700 @@ -154,7 +154,7 @@ "\u5927\u6b63", "\u662d\u548c", "\u5e73\u6210", - "\u65b0\u5143\u53f7", // NewEra + "\u5143\u53f7", // NewEra }; final String[] sharedJavaTimeShortEras = {
--- a/test/jdk/java/util/Calendar/JapaneseEraNameTest.java Wed Jul 11 15:35:47 2018 -0700 +++ b/test/jdk/java/util/Calendar/JapaneseEraNameTest.java Thu Jul 12 11:24:10 2018 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 8202088 + * @bug 8202088 8207152 * @summary Test the localized Japanese new era name (May 1st. 2019-) * is retrieved no matter CLDR provider contains the name or not. * @modules jdk.localedata @@ -51,7 +51,7 @@ Object[][] names() { return new Object[][] { // type, locale, name - { LONG, JAPAN, "\u65b0\u5143\u53f7" }, // NewEra + { LONG, JAPAN, "\u5143\u53f7" }, // NewEra { LONG, US, "NewEra" }, { SHORT, JAPAN, "N" }, { SHORT, US, "N" },