src/share/classes/sun/text/resources/FormatData.java

@@ -83,25 +83,48 @@
 
 public class FormatData extends ListResourceBundle {
     /**
      * Overrides ListResourceBundle
      */
+    @Override
     protected final Object[][] getContents() {
-        final String[] buddhistEras = new String[] { // Thai Buddhist calendar era strings
+        // Julian calendar era strings
+        final String[] julianEras = {
+            "BC",
+            "AD"
+        };
+
+        // Thai Buddhist calendar era strings
+        final String[] buddhistEras = {
             "BC",     // BC
             "B.E."    // Buddhist Era
         };
 
         // Japanese imperial calendar era abbreviations
-        final String[] japaneseEraAbbrs = new String[] {
+        final String[] japaneseEraAbbrs = {
             "",
             "M",
             "T",
             "S",
             "H",
         };
 
+        // Japanese imperial calendar era strings
+        final String[] japaneseEras = {
+            "",
+            "Meiji",
+            "Taisho",
+            "Showa",
+            "Heisei",
+        };
+
+        // Minguo era strings
+        final String[] rocEras ={
+            "Before R.O.C.",
+            "R.O.C.",
+        };
+
         return new Object[][] {
             { "MonthNames",
                 new String[] {
                     "January", // january
                     "February", // february

@@ -179,15 +202,19 @@
                     "a", // am marker
                     "p"  // pm marker
                 }
             },
             { "Eras",
-                new String[] { // era strings for GregorianCalendar
-                    "BC",
-                    "AD"
+                julianEras },
+            { "cldr.long.Eras",
+                new String[] {
+                    "Before Christ",
+                    "Anno Domini"
                 }
             },
+            { "cldr.short.Eras",
+                julianEras },
             { "narrow.Eras",
                 new String[] {
                     "B",
                     "A",
                 }

@@ -200,18 +227,15 @@
             },
             { "buddhist.narrow.Eras",
               buddhistEras
             },
             { "japanese.Eras",
-                new String[] { // Japanese imperial calendar era strings
-                    "",
-                    "Meiji",
-                    "Taisho",
-                    "Showa",
-                    "Heisei",
-                }
-            },
+                japaneseEras },
+            { "cldr.japanese.long.Eras",
+                japaneseEras },
+            { "cldr.japanese.short.Eras",
+                japaneseEras },
             { "japanese.short.Eras",
               japaneseEraAbbrs
             },
             { "japanese.narrow.Eras",
               japaneseEraAbbrs

@@ -846,16 +870,12 @@
             { "japanese.DateTimePatterns",
                 new String[] {
                     "{1} {0}"                  // date-time pattern
                 }
             },
-            { "roc.Eras",
-                new String[] {
-                    "Before R.O.C.",
-                    "R.O.C.",
-                }
-            },
+            { "roc.Eras", rocEras },
+            { "roc.short.Eras", rocEras },
             { "cldr.roc.DatePatterns",
                 new String[] {
                     "EEEE, G y MMMM dd",
                     "G y MMMM d",
                     "G y MMM d",