jdk/src/share/classes/java/text/DateFormatSymbols.java
changeset 14765 0987999ed367
parent 14172 fad44417edf8
child 15260 7af2d7a87806
--- a/jdk/src/share/classes/java/text/DateFormatSymbols.java	Sun Dec 09 19:13:08 2012 +0000
+++ b/jdk/src/share/classes/java/text/DateFormatSymbols.java	Mon Dec 10 10:52:11 2012 +0900
@@ -688,7 +688,16 @@
         }
         ResourceBundle resource = adapter.getLocaleData().getDateFormatData(locale);
 
-        eras = resource.getStringArray("Eras");
+        // JRE and CLDR use different keys
+        // JRE: Eras, short.Eras and narrow.Eras
+        // CLDR: long.Eras, Eras and narrow.Eras
+        if (resource.containsKey("Eras")) {
+            eras = resource.getStringArray("Eras");
+        } else if (resource.containsKey("long.Eras")) {
+            eras = resource.getStringArray("long.Eras");
+        } else if (resource.containsKey("short.Eras")) {
+            eras = resource.getStringArray("short.Eras");
+        }
         months = resource.getStringArray("MonthNames");
         shortMonths = resource.getStringArray("MonthAbbreviations");
         ampms = resource.getStringArray("AmPmMarkers");