< prev index next >

src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_zh.java

Print this page
rev 55480 : 8227127: Era designator not displayed correctly using the COMPAT provider
Reviewed-by:

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Oracle designates this

@@ -86,10 +86,14 @@
     protected final Object[][] getContents() {
         final String[] rocEras = {
             "\u6c11\u56fd\u524d",
             "\u6c11\u56fd",
         };
+        final String[] gregoryEras = {
+            "\u516c\u5143\u524d",
+            "\u516c\u5143",
+        };
         return new Object[][] {
             { "MonthNames",
                 new String[] {
                     "\u4e00\u6708", // january
                     "\u4e8c\u6708", // february

@@ -261,16 +265,12 @@
                 new String[] {
                     "\u4e0a\u5348", // am marker
                     "\u4e0b\u5348" // pm marker
                 }
             },
-            { "Eras",
-                new String[] { // era strings
-                    "\u516c\u5143\u524d",
-                    "\u516c\u5143"
-                }
-            },
+            { "Eras", gregoryEras },
+            { "short.Eras", gregoryEras },
             { "buddhist.Eras",
                 new String[] {
                     "BC",
                     "\u4f5b\u5386",
                 }
< prev index next >