< prev index next >
make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
Print this page
rev 47480 : [mq]: 8176841
*** 50,71 ****
--- 50,80 ----
*/
public class CLDRConverter {
static final String LDML_DTD_SYSTEM_ID = "http://www.unicode.org/cldr/dtd/2.0/ldml.dtd";
static final String SPPL_LDML_DTD_SYSTEM_ID = "http://www.unicode.org/cldr/dtd/2.0/ldmlSupplemental.dtd";
+ static final String BCP47_LDML_DTD_SYSTEM_ID = "http://www.unicode.org/cldr/dtd/2.0/ldmlBCP47.dtd";
+
private static String CLDR_BASE = "../CLDR/21.0.1/";
static String LOCAL_LDML_DTD;
static String LOCAL_SPPL_LDML_DTD;
+ static String LOCAL_BCP47_LDML_DTD;
private static String SOURCE_FILE_DIR;
private static String SPPL_SOURCE_FILE;
private static String NUMBERING_SOURCE_FILE;
private static String METAZONES_SOURCE_FILE;
private static String LIKELYSUBTAGS_SOURCE_FILE;
+ private static String TIMEZONE_SOURCE_FILE;
static String DESTINATION_DIR = "build/gensrc";
static final String LOCALE_NAME_PREFIX = "locale.displayname.";
+ static final String LOCALE_SEPARATOR = LOCALE_NAME_PREFIX + "separator";
+ static final String LOCALE_KEYTYPE = LOCALE_NAME_PREFIX + "keytype";
+ static final String LOCALE_KEY_PREFIX = LOCALE_NAME_PREFIX + "key.";
+ static final String LOCALE_TYPE_PREFIX = LOCALE_NAME_PREFIX + "type.";
+ static final String LOCALE_TYPE_PREFIX_CA = LOCALE_TYPE_PREFIX + "ca.";
static final String CURRENCY_SYMBOL_PREFIX = "currency.symbol.";
static final String CURRENCY_NAME_PREFIX = "currency.displayname.";
static final String CALENDAR_NAME_PREFIX = "calendarname.";
static final String TIMEZONE_ID_PREFIX = "timezone.id.";
static final String ZONE_NAME_PREFIX = "timezone.displayname.";
*** 74,83 ****
--- 83,93 ----
private static SupplementDataParseHandler handlerSuppl;
private static LikelySubtagsParseHandler handlerLikelySubtags;
static NumberingSystemsParseHandler handlerNumbering;
static MetaZonesParseHandler handlerMetaZones;
+ static TimeZoneParseHandler handlerTimeZone;
private static BundleGenerator bundleGenerator;
// java.base module related
static boolean isBaseModule = false;
static final Set<Locale> BASE_LOCALES = new HashSet<>();
*** 199,222 ****
--- 209,235 ----
}
// Set up path names
LOCAL_LDML_DTD = CLDR_BASE + "/dtd/ldml.dtd";
LOCAL_SPPL_LDML_DTD = CLDR_BASE + "/dtd/ldmlSupplemental.dtd";
+ LOCAL_BCP47_LDML_DTD = CLDR_BASE + "/dtd/ldmlBCP47.dtd";
SOURCE_FILE_DIR = CLDR_BASE + "/main";
SPPL_SOURCE_FILE = CLDR_BASE + "/supplemental/supplementalData.xml";
LIKELYSUBTAGS_SOURCE_FILE = CLDR_BASE + "/supplemental/likelySubtags.xml";
NUMBERING_SOURCE_FILE = CLDR_BASE + "/supplemental/numberingSystems.xml";
METAZONES_SOURCE_FILE = CLDR_BASE + "/supplemental/metaZones.xml";
+ TIMEZONE_SOURCE_FILE = CLDR_BASE + "/bcp47/timezone.xml";
if (BASE_LOCALES.isEmpty()) {
setupBaseLocales("en-US");
}
bundleGenerator = new ResourceBundleGenerator();
// Parse data independent of locales
parseSupplemental();
+ parseBCP47();
List<Bundle> bundles = readBundleList();
convertBundles(bundles);
convertBundles(addedBundles);
}
*** 319,333 ****
private static Map<String, SortedSet<String>> metaInfo = new HashMap<>();
static {
// For generating information on supported locales.
- metaInfo.put("LocaleNames", new TreeSet<>());
- metaInfo.put("CurrencyNames", new TreeSet<>());
- metaInfo.put("TimeZoneNames", new TreeSet<>());
- metaInfo.put("CalendarData", new TreeSet<>());
- metaInfo.put("FormatData", new TreeSet<>());
metaInfo.put("AvailableLocales", new TreeSet<>());
}
private static Set<String> calendarDataFields = Set.of("firstDayOfWeek", "minimalDaysInFirstWeek");
--- 332,341 ----
*** 335,358 ****
static Map<String, Object> getCLDRBundle(String id) throws Exception {
Map<String, Object> bundle = cldrBundles.get(id);
if (bundle != null) {
return bundle;
}
- SAXParserFactory factory = SAXParserFactory.newInstance();
- factory.setValidating(true);
- SAXParser parser = factory.newSAXParser();
- enableFileAccess(parser);
- LDMLParseHandler handler = new LDMLParseHandler(id);
File file = new File(SOURCE_FILE_DIR + File.separator + id + ".xml");
if (!file.exists()) {
// Skip if the file doesn't exist.
return Collections.emptyMap();
}
info("..... main directory .....");
! info("Reading file " + file);
! parser.parse(file, handler);
bundle = handler.getData();
cldrBundles.put(id, bundle);
String country = getCountryCode(id);
if (country != null) {
--- 343,361 ----
static Map<String, Object> getCLDRBundle(String id) throws Exception {
Map<String, Object> bundle = cldrBundles.get(id);
if (bundle != null) {
return bundle;
}
File file = new File(SOURCE_FILE_DIR + File.separator + id + ".xml");
if (!file.exists()) {
// Skip if the file doesn't exist.
return Collections.emptyMap();
}
info("..... main directory .....");
! LDMLParseHandler handler = new LDMLParseHandler(id);
! parseLDMLFile(file, handler);
bundle = handler.getData();
cldrBundles.put(id, bundle);
String country = getCountryCode(id);
if (country != null) {
*** 377,428 ****
// region and composition numerical code (001 for World.)
//
// SupplementalData file also provides the "parent" locales which
// are othrwise not to be fallen back. Process them here as well.
//
- info("..... Parsing supplementalData.xml .....");
- SAXParserFactory factorySuppl = SAXParserFactory.newInstance();
- factorySuppl.setValidating(true);
- SAXParser parserSuppl = factorySuppl.newSAXParser();
- enableFileAccess(parserSuppl);
handlerSuppl = new SupplementDataParseHandler();
! File fileSupply = new File(SPPL_SOURCE_FILE);
! parserSuppl.parse(fileSupply, handlerSuppl);
Map<String, Object> parentData = handlerSuppl.getData("root");
parentData.keySet().forEach(key -> {
parentLocalesMap.put(key, new TreeSet(
Arrays.asList(((String)parentData.get(key)).split(" "))));
});
// Parse numberingSystems to get digit zero character information.
- SAXParserFactory numberingParser = SAXParserFactory.newInstance();
- numberingParser.setValidating(true);
- SAXParser parserNumbering = numberingParser.newSAXParser();
- enableFileAccess(parserNumbering);
handlerNumbering = new NumberingSystemsParseHandler();
! File fileNumbering = new File(NUMBERING_SOURCE_FILE);
! parserNumbering.parse(fileNumbering, handlerNumbering);
// Parse metaZones to create mappings between Olson tzids and CLDR meta zone names
- info("..... Parsing metaZones.xml .....");
- SAXParserFactory metazonesParser = SAXParserFactory.newInstance();
- metazonesParser.setValidating(true);
- SAXParser parserMetaZones = metazonesParser.newSAXParser();
- enableFileAccess(parserMetaZones);
handlerMetaZones = new MetaZonesParseHandler();
! File fileMetaZones = new File(METAZONES_SOURCE_FILE);
! parserMetaZones.parse(fileMetaZones, handlerMetaZones);
// Parse likelySubtags
- info("..... Parsing likelySubtags.xml .....");
- SAXParserFactory likelySubtagsParser = SAXParserFactory.newInstance();
- likelySubtagsParser.setValidating(true);
- SAXParser parserLikelySubtags = likelySubtagsParser.newSAXParser();
- enableFileAccess(parserLikelySubtags);
handlerLikelySubtags = new LikelySubtagsParseHandler();
! File fileLikelySubtags = new File(LIKELYSUBTAGS_SOURCE_FILE);
! parserLikelySubtags.parse(fileLikelySubtags, handlerLikelySubtags);
}
/**
* This method will check if a new region dependent Bundle needs to be
* generated for this Locale id and targetMap. New Bundle will be generated
--- 380,425 ----
// region and composition numerical code (001 for World.)
//
// SupplementalData file also provides the "parent" locales which
// are othrwise not to be fallen back. Process them here as well.
//
handlerSuppl = new SupplementDataParseHandler();
! parseLDMLFile(new File(SPPL_SOURCE_FILE), handlerSuppl);
Map<String, Object> parentData = handlerSuppl.getData("root");
parentData.keySet().forEach(key -> {
parentLocalesMap.put(key, new TreeSet(
Arrays.asList(((String)parentData.get(key)).split(" "))));
});
// Parse numberingSystems to get digit zero character information.
handlerNumbering = new NumberingSystemsParseHandler();
! parseLDMLFile(new File(NUMBERING_SOURCE_FILE), handlerNumbering);
// Parse metaZones to create mappings between Olson tzids and CLDR meta zone names
handlerMetaZones = new MetaZonesParseHandler();
! parseLDMLFile(new File(METAZONES_SOURCE_FILE), handlerMetaZones);
// Parse likelySubtags
handlerLikelySubtags = new LikelySubtagsParseHandler();
! parseLDMLFile(new File(LIKELYSUBTAGS_SOURCE_FILE), handlerLikelySubtags);
! }
!
! // Parsers for data in "bcp47" directory
! //
! private static void parseBCP47() throws Exception {
! // Parse timezone
! handlerTimeZone = new TimeZoneParseHandler();
! parseLDMLFile(new File(TIMEZONE_SOURCE_FILE), handlerTimeZone);
! }
!
! private static void parseLDMLFile(File srcfile, AbstractLDMLHandler handler) throws Exception {
! info("..... Parsing " + srcfile.getName() + " .....");
! SAXParserFactory pf = SAXParserFactory.newInstance();
! pf.setValidating(true);
! SAXParser parser = pf.newSAXParser();
! enableFileAccess(parser);
! parser.parse(srcfile, handler);
}
/**
* This method will check if a new region dependent Bundle needs to be
* generated for this Locale id and targetMap. New Bundle will be generated
*** 526,614 ****
// Now the map contains just the entries that need to be in the resources bundles.
// Go ahead and generate them.
if (bundleTypes.contains(Bundle.Type.LOCALENAMES)) {
Map<String, Object> localeNamesMap = extractLocaleNames(targetMap, bundle.getID());
if (!localeNamesMap.isEmpty() || bundle.isRoot()) {
- metaInfo.get("LocaleNames").add(toLanguageTag(bundle.getID()));
- addLikelySubtags(metaInfo, "LocaleNames", bundle.getID());
bundleGenerator.generateBundle("util", "LocaleNames", bundle.getJavaID(), true, localeNamesMap, BundleType.OPEN);
}
}
if (bundleTypes.contains(Bundle.Type.CURRENCYNAMES)) {
Map<String, Object> currencyNamesMap = extractCurrencyNames(targetMap, bundle.getID(), bundle.getCurrencies());
if (!currencyNamesMap.isEmpty() || bundle.isRoot()) {
- metaInfo.get("CurrencyNames").add(toLanguageTag(bundle.getID()));
- addLikelySubtags(metaInfo, "CurrencyNames", bundle.getID());
bundleGenerator.generateBundle("util", "CurrencyNames", bundle.getJavaID(), true, currencyNamesMap, BundleType.OPEN);
}
}
if (bundleTypes.contains(Bundle.Type.TIMEZONENAMES)) {
Map<String, Object> zoneNamesMap = extractZoneNames(targetMap, bundle.getID());
if (!zoneNamesMap.isEmpty() || bundle.isRoot()) {
- metaInfo.get("TimeZoneNames").add(toLanguageTag(bundle.getID()));
- addLikelySubtags(metaInfo, "TimeZoneNames", bundle.getID());
bundleGenerator.generateBundle("util", "TimeZoneNames", bundle.getJavaID(), true, zoneNamesMap, BundleType.TIMEZONE);
}
}
if (bundleTypes.contains(Bundle.Type.CALENDARDATA)) {
Map<String, Object> calendarDataMap = extractCalendarData(targetMap, bundle.getID());
if (!calendarDataMap.isEmpty() || bundle.isRoot()) {
- metaInfo.get("CalendarData").add(toLanguageTag(bundle.getID()));
- addLikelySubtags(metaInfo, "CalendarData", bundle.getID());
bundleGenerator.generateBundle("util", "CalendarData", bundle.getJavaID(), true, calendarDataMap, BundleType.PLAIN);
}
}
if (bundleTypes.contains(Bundle.Type.FORMATDATA)) {
Map<String, Object> formatDataMap = extractFormatData(targetMap, bundle.getID());
if (!formatDataMap.isEmpty() || bundle.isRoot()) {
- metaInfo.get("FormatData").add(toLanguageTag(bundle.getID()));
- addLikelySubtags(metaInfo, "FormatData", bundle.getID());
bundleGenerator.generateBundle("text", "FormatData", bundle.getJavaID(), true, formatDataMap, BundleType.PLAIN);
}
}
// For AvailableLocales
metaInfo.get("AvailableLocales").add(toLanguageTag(bundle.getID()));
addLikelySubtags(metaInfo, "AvailableLocales", bundle.getID());
}
- addCldrImplicitLocales(metaInfo);
bundleGenerator.generateMetaInfo(metaInfo);
}
- /**
- * These are the Locales that are implicitly supported by CLDR.
- * Adding them explicitly as likelySubtags here, will ensure that
- * COMPAT locales do not precede them during ResourceBundle search path.
- */
- private static void addCldrImplicitLocales(Map<String, SortedSet<String>> metaInfo) {
- metaInfo.get("LocaleNames").add("zh-Hans-CN");
- metaInfo.get("LocaleNames").add("zh-Hans-SG");
- metaInfo.get("LocaleNames").add("zh-Hant-HK");
- metaInfo.get("LocaleNames").add("zh-Hant-MO");
- metaInfo.get("LocaleNames").add("zh-Hant-TW");
- metaInfo.get("CurrencyNames").add("zh-Hans-CN");
- metaInfo.get("CurrencyNames").add("zh-Hans-SG");
- metaInfo.get("CurrencyNames").add("zh-Hant-HK");
- metaInfo.get("CurrencyNames").add("zh-Hant-MO");
- metaInfo.get("CurrencyNames").add("zh-Hant-TW");
- metaInfo.get("TimeZoneNames").add("zh-Hans-CN");
- metaInfo.get("TimeZoneNames").add("zh-Hans-SG");
- metaInfo.get("TimeZoneNames").add("zh-Hant-HK");
- metaInfo.get("TimeZoneNames").add("zh-Hant-MO");
- metaInfo.get("TimeZoneNames").add("zh-Hant-TW");
- metaInfo.get("TimeZoneNames").add("zh-HK");
- metaInfo.get("CalendarData").add("zh-Hans-CN");
- metaInfo.get("CalendarData").add("zh-Hans-SG");
- metaInfo.get("CalendarData").add("zh-Hant-HK");
- metaInfo.get("CalendarData").add("zh-Hant-MO");
- metaInfo.get("CalendarData").add("zh-Hant-TW");
- metaInfo.get("FormatData").add("zh-Hans-CN");
- metaInfo.get("FormatData").add("zh-Hans-SG");
- metaInfo.get("FormatData").add("zh-Hant-HK");
- metaInfo.get("FormatData").add("zh-Hant-MO");
- metaInfo.get("FormatData").add("zh-Hant-TW");
- }
static final Map<String, String> aliases = new HashMap<>();
/**
* Translate the aliases into the real entries in the bundle map.
*/
--- 523,567 ----
*** 693,705 ****
--- 646,674 ----
private static Map<String, Object> extractLocaleNames(Map<String, Object> map, String id) {
Map<String, Object> localeNames = new TreeMap<>(KeyComparator.INSTANCE);
for (String key : map.keySet()) {
if (key.startsWith(LOCALE_NAME_PREFIX)) {
+ switch (key) {
+ case LOCALE_SEPARATOR:
+ localeNames.put("ListCompositionPattern", map.get(key));
+ break;
+ case LOCALE_KEYTYPE:
+ localeNames.put("ListKeyTypePattern", map.get(key));
+ break;
+ default:
localeNames.put(key.substring(LOCALE_NAME_PREFIX.length()), map.get(key));
+ break;
+ }
}
}
+
+ if (id.equals("root")) {
+ // Add display name pattern, which is not in CLDR
+ localeNames.put("DisplayNamePattern", "{0,choice,0#|1#{1}|2#{1} ({2})}");
+ }
+
return localeNames;
}
@SuppressWarnings("AssignmentToForLoopParameter")
private static Map<String, Object> extractCurrencyNames(Map<String, Object> map, String id, String names)
*** 842,862 ****
}
}
for (String key : map.keySet()) {
// Copy available calendar names
! if (key.startsWith(CLDRConverter.CALENDAR_NAME_PREFIX)) {
! String type = key.substring(CLDRConverter.CALENDAR_NAME_PREFIX.length());
for (CalendarType calendarType : CalendarType.values()) {
if (calendarType == CalendarType.GENERIC) {
continue;
}
if (type.equals(calendarType.lname())) {
Object value = map.get(key);
! formatData.put(key, value);
! String ukey = CLDRConverter.CALENDAR_NAME_PREFIX + calendarType.uname();
! if (!key.equals(ukey)) {
formatData.put(ukey, value);
}
}
}
}
--- 811,833 ----
}
}
for (String key : map.keySet()) {
// Copy available calendar names
! if (key.startsWith(CLDRConverter.LOCALE_TYPE_PREFIX_CA)) {
! String type = key.substring(CLDRConverter.LOCALE_TYPE_PREFIX_CA.length());
for (CalendarType calendarType : CalendarType.values()) {
if (calendarType == CalendarType.GENERIC) {
continue;
}
if (type.equals(calendarType.lname())) {
Object value = map.get(key);
! String dataKey = key.replace(LOCALE_TYPE_PREFIX_CA,
! CALENDAR_NAME_PREFIX);
! formatData.put(dataKey, value);
! String ukey = CALENDAR_NAME_PREFIX + calendarType.uname();
! if (!dataKey.equals(ukey)) {
formatData.put(ukey, value);
}
}
}
}
*** 872,881 ****
--- 843,864 ----
}
} else {
copyIfPresent(map, "NumberElements", formatData);
}
copyIfPresent(map, "NumberPatterns", formatData);
+
+ // put extra number elements for available scripts into formatData, if it is "root"
+ if (id.equals("root")) {
+ handlerNumbering.keySet().stream()
+ .filter(k -> !numberingScripts.contains(k))
+ .forEach(k -> {
+ String[] ne = (String[])map.get("latn.NumberElements");
+ String[] neNew = Arrays.copyOf(ne, ne.length);
+ neNew[4] = handlerNumbering.get(k).substring(0, 1);
+ formatData.put(k + ".NumberElements", neNew);
+ });
+ }
return formatData;
}
private static void copyIfPresent(Map<String, Object> src, String key, Map<String, Object> dest) {
Object value = src.get(key);
< prev index next >