equal
deleted
inserted
replaced
686 adapter = LocaleProviderAdapter.getResourceBundleBased(); |
686 adapter = LocaleProviderAdapter.getResourceBundleBased(); |
687 break; |
687 break; |
688 } |
688 } |
689 ResourceBundle resource = adapter.getLocaleData().getDateFormatData(locale); |
689 ResourceBundle resource = adapter.getLocaleData().getDateFormatData(locale); |
690 |
690 |
691 eras = resource.getStringArray("Eras"); |
691 // JRE and CLDR use different keys |
|
692 // JRE: Eras, short.Eras and narrow.Eras |
|
693 // CLDR: long.Eras, Eras and narrow.Eras |
|
694 if (resource.containsKey("Eras")) { |
|
695 eras = resource.getStringArray("Eras"); |
|
696 } else if (resource.containsKey("long.Eras")) { |
|
697 eras = resource.getStringArray("long.Eras"); |
|
698 } else if (resource.containsKey("short.Eras")) { |
|
699 eras = resource.getStringArray("short.Eras"); |
|
700 } |
692 months = resource.getStringArray("MonthNames"); |
701 months = resource.getStringArray("MonthNames"); |
693 shortMonths = resource.getStringArray("MonthAbbreviations"); |
702 shortMonths = resource.getStringArray("MonthAbbreviations"); |
694 ampms = resource.getStringArray("AmPmMarkers"); |
703 ampms = resource.getStringArray("AmPmMarkers"); |
695 localPatternChars = resource.getString("DateTimePatternChars"); |
704 localPatternChars = resource.getString("DateTimePatternChars"); |
696 |
705 |