--- old/make/java/java/genlocales.gmk 2013-09-05 16:58:41.839243921 -0700 +++ new/make/java/java/genlocales.gmk 2013-09-05 16:58:41.222235797 -0700 @@ -38,31 +38,31 @@ # only FILES_java and FILES_compiled_properties variables will be picked up # # $(BUILDDIR)/java/util/FILES_java.gmk & $(BUILDDIR)/java/util/FILES_properties.gmk -# contain "sun.util.resources" for US language support +# contain "sun.util.resources" for EN language support include $(BUILDDIR)/java/util/FILES_java.gmk include $(BUILDDIR)/java/util/FILES_properties.gmk -US_Resources_java := $(FILES_java) -US_Resources_properties := $(FILES_compiled_properties) +EN_Resources_java := $(FILES_java) +EN_Resources_properties := $(FILES_compiled_properties) # $(BUILDDIR)/java/text/FILES_java.gmk contains the "sun.text.resources" for -# US language support +# EN language support include $(BUILDDIR)/java/text/base/FILES_java.gmk -US_Resources_java += $(FILES_java) +EN_Resources_java += $(FILES_java) FILES_compiled_properties= # $(BUILDDIR)/sun/text/FILES_java.gmk & $(BUILDDIR)/sun/text/FILES_properties.gmk -# contain both resources for Non-US language support +# contain both resources for Non-EN language support include $(BUILDDIR)/sun/text/FILES_java.gmk include $(BUILDDIR)/sun/text/FILES_properties.gmk -NonUS_Resources_java := $(FILES_java) -NonUS_Resources_properties := $(FILES_compiled_properties) +NonEN_Resources_java := $(FILES_java) +NonEN_Resources_properties := $(FILES_compiled_properties) # Restore the orignal FILES_java & FILES_compiled_properties variables FILES_java := $(FILES_java_orig) @@ -80,30 +80,30 @@ ifeq ($(PLATFORM), macosx) $(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH) - @$(RM) $@.tmp.us $@.tmp.nonus; + @$(RM) $@.tmp.en $@.tmp.nonen; @$(prep-target) - @$(ECHO) $(US_Resources_properties) | $(NAWK) 'gsub(/.properties/,"\n") {print}' > $@.tmp.us; - @$(ECHO) $(US_Resources_java) | $(NAWK) 'gsub(/.java/,"\n") {print}' >> $@.tmp.us; - @$(ECHO) $(NonUS_Resources_properties) | $(NAWK) 'gsub(/.properties/,"\n") {print}' > $@.tmp.nonus; - @$(ECHO) $(NonUS_Resources_java) | $(NAWK) 'gsub(/.java/,"\n") {print}' >> $@.tmp.nonus; + @$(ECHO) $(EN_Resources_properties) | $(NAWK) 'gsub(/.properties/,"\n") {print}' > $@.tmp.en; + @$(ECHO) $(EN_Resources_java) | $(NAWK) 'gsub(/.java/,"\n") {print}' >> $@.tmp.en; + @$(ECHO) $(NonEN_Resources_properties) | $(NAWK) 'gsub(/.properties/,"\n") {print}' > $@.tmp.nonen; + @$(ECHO) $(NonEN_Resources_java) | $(NAWK) 'gsub(/.java/,"\n") {print}' >> $@.tmp.nonen; NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \ - $(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.us \ - $@.tmp.nonus $< $@ - @$(RM) $@.tmp.us $@.tmp.nonus; + $(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.en \ + $@.tmp.nonen $< $@ + @$(RM) $@.tmp.en $@.tmp.nonen; else $(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH) - @$(RM) $@.tmp.us $@.tmp.nonus; + @$(RM) $@.tmp.en $@.tmp.nonen; @$(prep-target) - @$(ECHO) $(subst .properties,'\n',$(US_Resources_properties)) > $@.tmp.us; - @$(ECHO) $(subst .java,'\n',$(US_Resources_java)) >> $@.tmp.us; - @$(ECHO) $(subst .properties,'\n',$(NonUS_Resources_properties)) > $@.tmp.nonus; - @$(ECHO) $(subst .java,'\n',$(NonUS_Resources_java)) >> $@.tmp.nonus; + @$(ECHO) $(subst .properties,'\n',$(EN_Resources_properties)) > $@.tmp.en; + @$(ECHO) $(subst .java,'\n',$(EN_Resources_java)) >> $@.tmp.en; + @$(ECHO) $(subst .properties,'\n',$(NonEN_Resources_properties)) > $@.tmp.nonen; + @$(ECHO) $(subst .java,'\n',$(NonEN_Resources_java)) >> $@.tmp.nonen; NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \ - $(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.us \ - $@.tmp.nonus $< $@ - @$(RM) $@.tmp.us $@.tmp.nonus; + $(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.en \ + $@.tmp.nonen $< $@ + @$(RM) $@.tmp.en $@.tmp.nonen; endif genlocales : $(LocaleDataMetaInfo_Dest) --- old/make/java/java/localegen.sh 2013-09-05 16:58:43.059259985 -0700 +++ new/make/java/java/localegen.sh 2013-09-05 16:58:42.833257009 -0700 @@ -35,11 +35,11 @@ # A list of resource base name list; RESOURCE_NAMES=$1 -# A list of US resources; -US_FILES_LIST=$2 +# A list of EN resources; +EN_FILES_LIST=$2 -# A list of non-US resources; -NONUS_FILES_LIST=$3 +# A list of non-EN resources; +NONEN_FILES_LIST=$3 INPUT_FILE=$4 OUTPUT_FILE=$5 @@ -53,23 +53,23 @@ sed_script="$SED -e \"s@^#warn .*@// -- This file was mechanically generated: Do not edit! -- //@\" " # ja-JP-JP and th-TH-TH need to be manually added, as they don't have any resource files. -nonusall=" ja-JP-JP th-TH-TH " +nonenall=" ja-JP-JP th-TH-TH " for FILE in $RESOURCE_NAMES do - getlocalelist $FILE $US_FILES_LIST - sed_script=$sed_script"-e \"s@#"$FILE"_USLocales#@$localelist@g\" " - usall=$usall" "$localelist - getlocalelist $FILE $NONUS_FILES_LIST - sed_script=$sed_script"-e \"s@#"$FILE"_NonUSLocales#@$localelist@g\" " - nonusall=$nonusall" "$localelist + getlocalelist $FILE $EN_FILES_LIST + sed_script=$sed_script"-e \"s@#"$FILE"_ENLocales#@$localelist@g\" " + enall=$enall" "$localelist + getlocalelist $FILE $NONEN_FILES_LIST + sed_script=$sed_script"-e \"s@#"$FILE"_NonENLocales#@$localelist@g\" " + nonenall=$nonenall" "$localelist done -usall=`(for LOC in $usall; do echo $LOC;done) |$SORT -u` -nonusall=`(for LOC in $nonusall; do echo $LOC;done) |$SORT -u` +enall=`(for LOC in $enall; do echo $LOC;done) |$SORT -u` +nonenall=`(for LOC in $nonenall; do echo $LOC;done) |$SORT -u` -sed_script=$sed_script"-e \"s@#AvailableLocales_USLocales#@$usall@g\" " -sed_script=$sed_script"-e \"s@#AvailableLocales_NonUSLocales#@$nonusall@g\" " +sed_script=$sed_script"-e \"s@#AvailableLocales_ENLocales#@$enall@g\" " +sed_script=$sed_script"-e \"s@#AvailableLocales_NonENLocales#@$nonenall@g\" " sed_script=$sed_script"$INPUT_FILE > $OUTPUT_FILE" eval $sed_script --- old/make/java/text/base/FILES_java.gmk 2013-09-05 16:58:44.165274547 -0700 +++ new/make/java/text/base/FILES_java.gmk 2013-09-05 16:58:43.884270848 -0700 @@ -107,5 +107,17 @@ sun/text/resources/FormatData.java \ sun/text/resources/JavaTimeSupplementary.java \ sun/text/resources/en/FormatData_en.java \ + sun/text/resources/en/FormatData_en_AU.java \ + sun/text/resources/en/FormatData_en_CA.java \ + sun/text/resources/en/FormatData_en_GB.java \ + sun/text/resources/en/FormatData_en_IE.java \ + sun/text/resources/en/FormatData_en_IN.java \ + sun/text/resources/en/FormatData_en_MT.java \ + sun/text/resources/en/FormatData_en_NZ.java \ + sun/text/resources/en/FormatData_en_PH.java \ + sun/text/resources/en/FormatData_en_SG.java \ sun/text/resources/en/FormatData_en_US.java \ + sun/text/resources/en/FormatData_en_ZA.java \ sun/text/resources/en/JavaTimeSupplementary_en.java \ + sun/text/resources/en/JavaTimeSupplementary_en_GB.java \ + sun/text/resources/en/JavaTimeSupplementary_en_SG.java --- old/make/java/util/FILES_java.gmk 2013-09-05 16:58:45.211288319 -0700 +++ new/make/java/util/FILES_java.gmk 2013-09-05 16:58:44.971285160 -0700 @@ -30,4 +30,7 @@ sun/util/resources/LocaleNamesBundle.java \ sun/util/resources/TimeZoneNamesBundle.java \ sun/util/resources/TimeZoneNames.java \ - sun/util/resources/en/TimeZoneNames_en.java + sun/util/resources/en/TimeZoneNames_en.java \ + sun/util/resources/en/TimeZoneNames_en_CA.java \ + sun/util/resources/en/TimeZoneNames_en_GB.java \ + sun/util/resources/en/TimeZoneNames_en_IE.java --- old/make/java/util/FILES_properties.gmk 2013-09-05 16:58:46.298302632 -0700 +++ new/make/java/util/FILES_properties.gmk 2013-09-05 16:58:46.047299327 -0700 @@ -26,9 +26,25 @@ FILES_compiled_properties = \ sun/util/resources/LocaleNames.properties \ sun/util/resources/en/LocaleNames_en.properties \ + sun/util/resources/en/LocaleNames_en_MT.properties \ + sun/util/resources/en/LocaleNames_en_PH.properties \ + sun/util/resources/en/LocaleNames_en_SG.properties \ \ sun/util/resources/CalendarData.properties \ sun/util/resources/en/CalendarData_en.properties \ + sun/util/resources/en/CalendarData_en_GB.properties \ + sun/util/resources/en/CalendarData_en_IE.properties \ + sun/util/resources/en/CalendarData_en_MT.properties \ \ sun/util/resources/CurrencyNames.properties \ - sun/util/resources/en/CurrencyNames_en_US.properties + sun/util/resources/en/CurrencyNames_en_AU.properties \ + sun/util/resources/en/CurrencyNames_en_CA.properties \ + sun/util/resources/en/CurrencyNames_en_GB.properties \ + sun/util/resources/en/CurrencyNames_en_IE.properties \ + sun/util/resources/en/CurrencyNames_en_IN.properties \ + sun/util/resources/en/CurrencyNames_en_MT.properties \ + sun/util/resources/en/CurrencyNames_en_NZ.properties \ + sun/util/resources/en/CurrencyNames_en_PH.properties \ + sun/util/resources/en/CurrencyNames_en_SG.properties \ + sun/util/resources/en/CurrencyNames_en_US.properties \ + sun/util/resources/en/CurrencyNames_en_ZA.properties --- old/make/sun/text/FILES_java.gmk 2013-09-05 16:58:47.498318433 -0700 +++ new/make/sun/text/FILES_java.gmk 2013-09-05 16:58:47.266315378 -0700 @@ -96,16 +96,6 @@ sun/text/resources/el/FormatData_el.java \ sun/text/resources/el/FormatData_el_CY.java \ sun/text/resources/el/FormatData_el_GR.java \ - sun/text/resources/en/FormatData_en_AU.java \ - sun/text/resources/en/FormatData_en_CA.java \ - sun/text/resources/en/FormatData_en_GB.java \ - sun/text/resources/en/FormatData_en_IE.java \ - sun/text/resources/en/FormatData_en_IN.java \ - sun/text/resources/en/FormatData_en_MT.java \ - sun/text/resources/en/FormatData_en_NZ.java \ - sun/text/resources/en/FormatData_en_PH.java \ - sun/text/resources/en/FormatData_en_SG.java \ - sun/text/resources/en/FormatData_en_ZA.java \ sun/text/resources/es/FormatData_es.java \ sun/text/resources/es/FormatData_es_BO.java \ sun/text/resources/es/FormatData_es_AR.java \ @@ -214,9 +204,6 @@ sun/util/resources/zh/CurrencyNames_zh_SG.java \ sun/util/resources/zh/LocaleNames_zh_HK.java \ sun/util/resources/de/TimeZoneNames_de.java \ - sun/util/resources/en/TimeZoneNames_en_CA.java \ - sun/util/resources/en/TimeZoneNames_en_GB.java \ - sun/util/resources/en/TimeZoneNames_en_IE.java \ sun/util/resources/es/TimeZoneNames_es.java \ sun/util/resources/fr/TimeZoneNames_fr.java \ sun/util/resources/hi/TimeZoneNames_hi.java \ @@ -237,8 +224,6 @@ sun/text/resources/da/JavaTimeSupplementary_da.java \ sun/text/resources/de/JavaTimeSupplementary_de.java \ sun/text/resources/el/JavaTimeSupplementary_el.java \ - sun/text/resources/en/JavaTimeSupplementary_en_GB.java \ - sun/text/resources/en/JavaTimeSupplementary_en_SG.java \ sun/text/resources/es/JavaTimeSupplementary_es.java \ sun/text/resources/et/JavaTimeSupplementary_et.java \ sun/text/resources/fi/JavaTimeSupplementary_fi.java \ --- old/make/sun/text/FILES_properties.gmk 2013-09-05 16:58:48.572332574 -0700 +++ new/make/sun/text/FILES_properties.gmk 2013-09-05 16:58:48.340329519 -0700 @@ -33,9 +33,6 @@ sun/util/resources/de/LocaleNames_de.properties \ sun/util/resources/el/LocaleNames_el.properties \ sun/util/resources/el/LocaleNames_el_CY.properties \ - sun/util/resources/en/LocaleNames_en_MT.properties \ - sun/util/resources/en/LocaleNames_en_PH.properties \ - sun/util/resources/en/LocaleNames_en_SG.properties \ sun/util/resources/es/LocaleNames_es.properties \ sun/util/resources/es/LocaleNames_es_US.properties \ sun/util/resources/et/LocaleNames_et.properties \ @@ -88,9 +85,6 @@ sun/util/resources/de/CalendarData_de.properties \ sun/util/resources/el/CalendarData_el.properties \ sun/util/resources/el/CalendarData_el_CY.properties \ - sun/util/resources/en/CalendarData_en_GB.properties \ - sun/util/resources/en/CalendarData_en_IE.properties \ - sun/util/resources/en/CalendarData_en_MT.properties \ sun/util/resources/es/CalendarData_es.properties \ sun/util/resources/es/CalendarData_es_ES.properties \ sun/util/resources/es/CalendarData_es_US.properties \ @@ -164,16 +158,6 @@ sun/util/resources/de/CurrencyNames_de_LU.properties \ sun/util/resources/el/CurrencyNames_el_CY.properties \ sun/util/resources/el/CurrencyNames_el_GR.properties \ - sun/util/resources/en/CurrencyNames_en_AU.properties \ - sun/util/resources/en/CurrencyNames_en_CA.properties \ - sun/util/resources/en/CurrencyNames_en_GB.properties \ - sun/util/resources/en/CurrencyNames_en_IE.properties \ - sun/util/resources/en/CurrencyNames_en_IN.properties \ - sun/util/resources/en/CurrencyNames_en_MT.properties \ - sun/util/resources/en/CurrencyNames_en_NZ.properties \ - sun/util/resources/en/CurrencyNames_en_PH.properties \ - sun/util/resources/en/CurrencyNames_en_SG.properties \ - sun/util/resources/en/CurrencyNames_en_ZA.properties \ sun/util/resources/es/CurrencyNames_es.properties \ sun/util/resources/es/CurrencyNames_es_AR.properties \ sun/util/resources/es/CurrencyNames_es_BO.properties \ --- old/makefiles/CreateJars.gmk 2013-09-05 16:58:49.699347412 -0700 +++ new/makefiles/CreateJars.gmk 2013-09-05 16:58:49.456344213 -0700 @@ -80,39 +80,6 @@ LOCALEDATA_INCLUDES := $(addprefix sun/text/resources/,$(LOCALEDATA_INCLUDE_LOCALES)) \ $(addprefix sun/util/resources/,$(LOCALEDATA_INCLUDE_LOCALES)) -# For non-US English locale data - -LOCALEDATA_INCLUDES += \ - sun/text/resources/en/FormatData_en_AU.class \ - sun/text/resources/en/FormatData_en_CA.class \ - sun/text/resources/en/FormatData_en_GB.class \ - sun/text/resources/en/FormatData_en_IE.class \ - sun/text/resources/en/FormatData_en_IN.class \ - sun/text/resources/en/FormatData_en_MT.class \ - sun/text/resources/en/FormatData_en_NZ.class \ - sun/text/resources/en/FormatData_en_PH.class \ - sun/text/resources/en/FormatData_en_SG.class \ - sun/text/resources/en/FormatData_en_ZA.class \ - sun/util/resources/en/CalendarData_en_GB.class \ - sun/util/resources/en/CalendarData_en_IE.class \ - sun/util/resources/en/CalendarData_en_MT.class \ - sun/util/resources/en/CurrencyNames_en_AU.class \ - sun/util/resources/en/CurrencyNames_en_CA.class \ - sun/util/resources/en/CurrencyNames_en_GB.class \ - sun/util/resources/en/CurrencyNames_en_IE.class \ - sun/util/resources/en/CurrencyNames_en_IN.class \ - sun/util/resources/en/CurrencyNames_en_MT.class \ - sun/util/resources/en/CurrencyNames_en_NZ.class \ - sun/util/resources/en/CurrencyNames_en_PH.class \ - sun/util/resources/en/CurrencyNames_en_SG.class \ - sun/util/resources/en/CurrencyNames_en_ZA.class \ - sun/util/resources/en/LocaleNames_en_MT.class \ - sun/util/resources/en/LocaleNames_en_PH.class \ - sun/util/resources/en/LocaleNames_en_SG.class \ - sun/util/resources/en/TimeZoneNames_en_CA.class \ - sun/util/resources/en/TimeZoneNames_en_GB.class \ - sun/util/resources/en/TimeZoneNames_en_IE.class - $(eval $(call SetupArchive,BUILD_LOCALEDATA_JAR,,\ SRCS:=$(JDK_OUTPUTDIR)/classes,\ SUFFIXES:=.class _dict _th,\ --- old/makefiles/GensrcLocaleDataMetaInfo.gmk 2013-09-05 16:58:50.947363843 -0700 +++ new/makefiles/GensrcLocaleDataMetaInfo.gmk 2013-09-05 16:58:50.621359552 -0700 @@ -50,27 +50,27 @@ $(shell $(RM) $(JDK_OUTPUTDIR)/gensrc/sun/util/locale/provider/LocaleDataMetaInfo.java) endif -# The US locales -US_LOCALES:=en en-US +# The EN locales +EN_LOCALES:=en% # ja-JP-JP and th-TH-TH need to be manually added, as they don't have any resource files. -ALL_NON_US_LOCALES:=ja-JP-JP th-TH-TH +ALL_NON_EN_LOCALES:=ja-JP-JP th-TH-TH SED_ARGS:=-e 's|$(HASH)warn This file is preprocessed before being compiled|// -- This file was mechanically generated: Do not edit! -- //|g' # This macro creates a sed expression that substitues for example: -# #FormatData_USLocales# with: en and/or en_US. +# #FormatData_ENLocales# with: en% locales. define CaptureLocale $1_LOCALES := $$(subst _,-,$$(filter-out $1,$$(subst $1_,,$$(filter $1_%,$(LOCALE_RESOURCES))))) - $1_US_LOCALES := $$(filter $(US_LOCALES),$$($1_LOCALES)) - $1_NON_US_LOCALES := $$(filter-out $(US_LOCALES),$$($1_LOCALES)) + $1_EN_LOCALES := $$(filter $(EN_LOCALES),$$($1_LOCALES)) + $1_NON_EN_LOCALES := $$(filter-out $(EN_LOCALES),$$($1_LOCALES)) - ALL_US_LOCALES += $$($1_US_LOCALES) - ALL_NON_US_LOCALES += $$($1_NON_US_LOCALES) + ALL_EN_LOCALES += $$($1_EN_LOCALES) + ALL_NON_EN_LOCALES += $$($1_NON_EN_LOCALES) # Don't sed in a space if there are no locales. - SED_ARGS+= -e 's/$$(HASH)$1_USLocales$$(HASH)/$$(if $$($1_US_LOCALES),$$(SPACE)$$($1_US_LOCALES),)/g' - SED_ARGS+= -e 's/$$(HASH)$1_NonUSLocales$$(HASH)/$$(if $$($1_NON_US_LOCALES),$$(SPACE)$$($1_NON_US_LOCALES),)/g' + SED_ARGS+= -e 's/$$(HASH)$1_ENLocales$$(HASH)/$$(if $$($1_EN_LOCALES),$$(SPACE)$$($1_EN_LOCALES),)/g' + SED_ARGS+= -e 's/$$(HASH)$1_NonENLocales$$(HASH)/$$(if $$($1_NON_EN_LOCALES),$$(SPACE)$$($1_NON_EN_LOCALES),)/g' endef #sun.text.resources.FormatData @@ -91,8 +91,8 @@ #sun.util.resources.CalendarData $(eval $(call CaptureLocale,CalendarData)) -SED_ARGS+= -e 's/$(HASH)AvailableLocales_USLocales$(HASH)/$(sort $(ALL_US_LOCALES))/g' -SED_ARGS+= -e 's/$(HASH)AvailableLocales_NonUSLocales$(HASH)/$(sort $(ALL_NON_US_LOCALES))/g' +SED_ARGS+= -e 's/$(HASH)AvailableLocales_ENLocales$(HASH)/$(sort $(ALL_EN_LOCALES))/g' +SED_ARGS+= -e 's/$(HASH)AvailableLocales_NonENLocales$(HASH)/$(sort $(ALL_NON_EN_LOCALES))/g' $(JDK_OUTPUTDIR)/gensrc/sun/util/locale/provider/LocaleDataMetaInfo.java: \ $(JDK_TOPDIR)/src/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template --- old/src/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java 2013-09-05 16:58:52.187380171 -0700 +++ new/src/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java 2013-09-05 16:58:51.930376787 -0700 @@ -361,7 +361,7 @@ while (tokens.hasMoreTokens()) { String token = tokens.nextToken(); if (token.equals("|")) { - if (isNonUSLangSupported()) { + if (isNonENLangSupported()) { continue; } break; @@ -398,7 +398,7 @@ */ int barIndex = supportedLocaleString.indexOf('|'); StringTokenizer localeStringTokenizer; - if (isNonUSLangSupported()) { + if (isNonENLangSupported()) { localeStringTokenizer = new StringTokenizer(supportedLocaleString.substring(0, barIndex) + supportedLocaleString.substring(barIndex + 1)); } else { @@ -427,17 +427,17 @@ return locales; } - private static volatile Boolean isNonUSSupported = null; + private static volatile Boolean isNonENSupported = null; /* - * Returns true if the non US resources jar file exists in jre + * Returns true if the non EN resources jar file exists in jre * extension directory. @returns true if the jar file is there. Otherwise, * returns false. */ - private static boolean isNonUSLangSupported() { - if (isNonUSSupported == null) { + private static boolean isNonENLangSupported() { + if (isNonENSupported == null) { synchronized (JRELocaleProviderAdapter.class) { - if (isNonUSSupported == null) { + if (isNonENSupported == null) { final String sep = File.separator; String localeDataJar = java.security.AccessController.doPrivileged( @@ -449,7 +449,7 @@ * localedata.jar is installed or not. */ final File f = new File(localeDataJar); - isNonUSSupported = + isNonENSupported = AccessController.doPrivileged(new PrivilegedAction() { @Override public Boolean run() { @@ -459,6 +459,6 @@ } } } - return isNonUSSupported; + return isNonENSupported; } } --- old/src/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template 2013-09-05 16:58:53.331395233 -0700 +++ new/src/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template 2013-09-05 16:58:53.096392137 -0700 @@ -52,25 +52,25 @@ look up locale string such as "en" could be based on if it contains " en ". */ resourceNameToLocales.put("FormatData", - " #FormatData_USLocales# | #FormatData_NonUSLocales# "); + " #FormatData_ENLocales# | #FormatData_NonENLocales# "); resourceNameToLocales.put("CollationData", - " #CollationData_USLocales# | #CollationData_NonUSLocales# "); + " #CollationData_ENLocales# | #CollationData_NonENLocales# "); resourceNameToLocales.put("TimeZoneNames", - " #TimeZoneNames_USLocales# | #TimeZoneNames_NonUSLocales# "); + " #TimeZoneNames_ENLocales# | #TimeZoneNames_NonENLocales# "); resourceNameToLocales.put("LocaleNames", - " #LocaleNames_USLocales# | #LocaleNames_NonUSLocales# "); + " #LocaleNames_ENLocales# | #LocaleNames_NonENLocales# "); resourceNameToLocales.put("CurrencyNames", - " #CurrencyNames_USLocales# | #CurrencyNames_NonUSLocales# "); + " #CurrencyNames_ENLocales# | #CurrencyNames_NonENLocales# "); resourceNameToLocales.put("CalendarData", - " #CalendarData_USLocales# | #CalendarData_NonUSLocales# "); + " #CalendarData_ENLocales# | #CalendarData_NonENLocales# "); resourceNameToLocales.put("AvailableLocales", - " #AvailableLocales_USLocales# | #AvailableLocales_NonUSLocales# "); + " #AvailableLocales_ENLocales# | #AvailableLocales_NonENLocales# "); } /*