infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-19 06:45:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

8008577: Use CLDR Locale Data by Default

Browse Source 
Reviewed-by: erikj, okutsu
This commit is contained in:
Naoto Sato 2015-06-24 16:42:11 -07:00
parent 7c8e579281
commit a693ebca66
1542 changed files with 730277 additions and 290744 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jdk/make/gensrc/Gensrc-java.base.gmk
View File

@ -26,6 +26,7 @@
include GensrcCommon.gmk
include GensrcLocaleData.gmk
include GensrcCLDR.gmk
include GensrcCharacterData.gmk
include GensrcMisc.gmk
include GensrcCharsetMapping.gmk

21
jdk/make/gensrc/GensrcCLDR.gmk
View File

@ -23,19 +23,30 @@
# questions.
#
CLDRVERSION := 21.0.1
CLDRVERSION := 27.0.0
CLDRSRCDIR := $(JDK_TOPDIR)/src/jdk.localedata/share/classes/sun/util/cldr/resources/$(subst .,_,$(CLDRVERSION))
GENSRC_BASEDIR := $(SUPPORT_OUTPUTDIR)/gensrc/java.base
GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata
CLDR_METAINFO_FILE := $(GENSRC_DIR)/sun/util/resources/cldr/provider/CLDRLocaleDataMetaInfo.java
CLDR_BASEMETAINFO_FILE := $(GENSRC_DIR)/sun/util/cldr/CLDRBaseLocaleDataMetaInfo.java
CLDR_METAINFO_FILE := $(GENSRC_DIR)/sun/util/resources/cldr/provider/CLDRLocaleDataMetaInfo_jdk_localedata.java
CLDR_BASE_LOCALES := "en-US"
$(CLDR_BASEMETAINFO_FILE): $(wildcard $(CLDRSRCDIR)/common/dtd/*.dtd) \
$(wildcard $(CLDRSRCDIR)/common/main/en*.xml) \
$(wildcard $(CLDRSRCDIR)/common/supplemental/*.xml) \
$(BUILD_TOOLS_JDK)
$(MKDIR) -p $(GENSRC_BASEDIR)
$(TOOL_CLDRCONVERTER) -base $(CLDRSRCDIR) -baselocales $(CLDR_BASE_LOCALES) -basemodule -o $(GENSRC_BASEDIR)
$(CLDR_METAINFO_FILE): $(wildcard $(CLDRSRCDIR)/common/dtd/*.dtd) \
$(wildcard $(CLDRSRCDIR)/common/main/*.xml) \
$(wildcard $(CLDRSRCDIR)/common/supplemental/*.xml) \
$(BUILD_TOOLS_JDK)
$(MKDIR) -p $(GENSRC_DIR)
$(TOOL_CLDRCONVERTER) -base $(CLDRSRCDIR) -o $(GENSRC_DIR)
$(TOOL_CLDRCONVERTER) -base $(CLDRSRCDIR) -baselocales $(CLDR_BASE_LOCALES) -o $(GENSRC_DIR)
GENSRC_CLDR := $(CLDR_METAINFO_FILE)
GENSRC_JDK_LOCALEDATA += $(GENSRC_CLDR)
GENSRC_JAVA_BASE += $(CLDR_BASEMETAINFO_FILE)
GENSRC_JDK_LOCALEDATA += $(CLDR_METAINFO_FILE)

67
jdk/make/gensrc/GensrcLocaleData.gmk
View File

@ -42,51 +42,54 @@ LOCALE_FILES := $(shell $(FIND) $(JDK_TOPDIR)/src/java.base/share/classes \
LOCALE_RESOURCES := $(sort $(subst .properties,,$(subst .java,,$(notdir $(LOCALE_FILES)))))
# Include the list of resources found during the previous compile.
-include $(SUPPORT_OUTPUTDIR)/gensrc/java.base/_the.locale_resources
-include $(SUPPORT_OUTPUTDIR)/gensrc/_the.locale_resources
MISSING_RESOURCES := $(filter-out $(LOCALE_RESOURCES), $(PREV_LOCALE_RESOURCES))
NEW_RESOURCES := $(filter-out $(PREV_LOCALE_RESOURCES), $(LOCALE_RESOURCES))
ifneq (, $(MISSING_RESOURCES)$(NEW_RESOURCES))
# There is a difference in the number of supported resources. Trigger a regeneration.
$(shell $(RM) $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/locale/provider/LocaleDataMetaInfo.java)
$(shell $(RM) $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/locale/provider/BaseLocaleDataMetaInfo.java \
$(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java \
$(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/cldr/CLDRBaseLocaleDataMetaInfo.java \
$(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/cldr/provider/CLDRLocaleDataMetaInfo_jdk_localedata.java)
endif
# The EN locales
EN_LOCALES := en%
# The base locales
BASE_LOCALES := en en-US
# Locales that don't have any resource files should be included here.
ALL_NON_EN_LOCALES := ja-JP-JP nb-NO nn-NO th-TH-TH
ALL_NON_BASE_LOCALES := ja-JP-JP nb-NO nn-NO th-TH-TH
SED_ENARGS := -e 's|$(HASH)warn This file is preprocessed before being compiled|// -- This file was mechanically generated: Do not edit! -- //|g'
SED_NONENARGS := $(SED_ENARGS)
SED_BASEARGS := -e 's|$(HASH)warn This file is preprocessed before being compiled|// -- This file was mechanically generated: Do not edit! -- //|g'
SED_NONBASEARGS := $(SED_BASEARGS)
# Fill in the languages and package names
SED_ENARGS += -e 's/$(HASH)Lang$(HASH)/En/' \
SED_BASEARGS += -e 's/$(HASH)Lang$(HASH)/Base/' \
-e 's/$(HASH)Package$(HASH)/sun.util.locale.provider/'
SED_NONENARGS += -e 's/$(HASH)Lang$(HASH)/NonEn/' \
SED_NONBASEARGS += -e 's/$(HASH)Lang$(HASH)/NonBase/' \
-e 's/$(HASH)Package$(HASH)/sun.util.resources.provider/'
# This macro creates a sed expression that substitues for example:
# #FormatData_ENLocales# with: en% locales.
# #FormatData_Locales# with: en-US locales.
define CaptureLocale
$1_LOCALES := $$(subst _,-,$$(filter-out $1, $$(subst $1_,,$$(filter $1_%, $(LOCALE_RESOURCES)))))
$1_EN_LOCALES := $$(filter $(EN_LOCALES), $$($1_LOCALES))
$1_NON_EN_LOCALES := $$(filter-out $(EN_LOCALES), $$($1_LOCALES))
$1_BASE_LOCALES := $$(filter $(BASE_LOCALES), $$($1_LOCALES))
$1_NON_BASE_LOCALES := $$(filter-out $(BASE_LOCALES), $$($1_LOCALES))
# Special handling for Chinese locales to include implicit scripts
$1_NON_EN_LOCALES := $$(subst zh-CN,zh-CN$$(SPACE)zh-Hans-CN, $$($1_NON_EN_LOCALES))
$1_NON_EN_LOCALES := $$(subst zh-SG,zh-SG$$(SPACE)zh-Hans-SG, $$($1_NON_EN_LOCALES))
$1_NON_EN_LOCALES := $$(subst zh-HK,zh-HK$$(SPACE)zh-Hant-HK, $$($1_NON_EN_LOCALES))
$1_NON_EN_LOCALES := $$(subst zh-MO,zh-MO$$(SPACE)zh-Hant-MO, $$($1_NON_EN_LOCALES))
$1_NON_EN_LOCALES := $$(subst zh-TW,zh-TW$$(SPACE)zh-Hant-TW, $$($1_NON_EN_LOCALES))
$1_NON_BASE_LOCALES := $$(subst zh-CN,zh-CN$$(SPACE)zh-Hans-CN, $$($1_NON_BASE_LOCALES))
$1_NON_BASE_LOCALES := $$(subst zh-SG,zh-SG$$(SPACE)zh-Hans-SG, $$($1_NON_BASE_LOCALES))
$1_NON_BASE_LOCALES := $$(subst zh-HK,zh-HK$$(SPACE)zh-Hant-HK, $$($1_NON_BASE_LOCALES))
$1_NON_BASE_LOCALES := $$(subst zh-MO,zh-MO$$(SPACE)zh-Hant-MO, $$($1_NON_BASE_LOCALES))
$1_NON_BASE_LOCALES := $$(subst zh-TW,zh-TW$$(SPACE)zh-Hant-TW, $$($1_NON_BASE_LOCALES))
ALL_EN_LOCALES += $$($1_EN_LOCALES)
ALL_NON_EN_LOCALES += $$($1_NON_EN_LOCALES)
ALL_BASE_LOCALES += $$($1_BASE_LOCALES)
ALL_NON_BASE_LOCALES += $$($1_NON_BASE_LOCALES)
# Don't sed in a space if there are no locales.
SED_ENARGS += -e 's/$$(HASH)$1_Locales$$(HASH)/$$(if $$($1_EN_LOCALES),$$(SPACE)$$($1_EN_LOCALES),)/g'
SED_NONENARGS += -e 's/$$(HASH)$1_Locales$$(HASH)/$$(if $$($1_NON_EN_LOCALES),$$(SPACE)$$($1_NON_EN_LOCALES),)/g'
SED_BASEARGS += -e 's/$$(HASH)$1_Locales$$(HASH)/$$(if $$($1_BASE_LOCALES),$$(SPACE)$$($1_BASE_LOCALES),)/g'
SED_NONBASEARGS += -e 's/$$(HASH)$1_Locales$$(HASH)/$$(if $$($1_NON_BASE_LOCALES),$$(SPACE)$$($1_NON_BASE_LOCALES),)/g'
endef
#sun.text.resources.FormatData
@ -113,27 +116,27 @@ $(eval $(call CaptureLocale,CurrencyNames))
#sun.util.resources.CalendarData
$(eval $(call CaptureLocale,CalendarData))
SED_ENARGS += -e 's/$(HASH)AvailableLocales_Locales$(HASH)/$(sort $(ALL_EN_LOCALES))/g'
SED_NONENARGS += -e 's/$(HASH)AvailableLocales_Locales$(HASH)/$(sort $(ALL_NON_EN_LOCALES))/g'
SED_BASEARGS += -e 's/$(HASH)AvailableLocales_Locales$(HASH)/$(sort $(ALL_BASE_LOCALES))/g'
SED_NONBASEARGS += -e 's/$(HASH)AvailableLocales_Locales$(HASH)/$(sort $(ALL_NON_BASE_LOCALES))/g'
$(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/locale/provider/EnLocaleDataMetaInfo.java: \
$(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/locale/provider/BaseLocaleDataMetaInfo.java: \
$(JDK_TOPDIR)/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template
$(MKDIR) -p $(@D)
$(ECHO) Creating sun/util/locale/provider/EnLocaleDataMetaInfo.java from $(words $(LOCALE_RESOURCES)) found resources.
$(ECHO) Creating sun/util/locale/provider/BaseLocaleDataMetaInfo.java from $(words $(LOCALE_RESOURCES)) found resources.
$(PRINTF) "PREV_LOCALE_RESOURCES:=$(LOCALE_RESOURCES)" \
> $(SUPPORT_OUTPUTDIR)/gensrc/_the.locale_resources
$(SED) $(SED_ENARGS) $< > $@
$(SED) $(SED_BASEARGS) $< > $@
$(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/provider/NonEnLocaleDataMetaInfo.java: \
$(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java: \
$(JDK_TOPDIR)/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template
$(MKDIR) -p $(@D)
$(ECHO) Creating sun/util/resources/provider/NonEnLocaleDataMetaInfo.java from $(words $(LOCALE_RESOURCES)) found resources.
$(ECHO) Creating sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java from $(words $(LOCALE_RESOURCES)) found resources.
$(PRINTF) "PREV_LOCALE_RESOURCES:=$(LOCALE_RESOURCES)" \
> $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/_the.locale_resources
$(SED) $(SED_NONENARGS) $< > $@
> $(SUPPORT_OUTPUTDIR)/gensrc/_the.locale_resources
$(SED) $(SED_NONBASEARGS) $< > $@
GENSRC_BASELOCALEDATA := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/locale/provider/EnLocaleDataMetaInfo.java
GENSRC_LOCALEDATA := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/provider/NonEnLocaleDataMetaInfo.java
GENSRC_BASELOCALEDATA := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/locale/provider/BaseLocaleDataMetaInfo.java
GENSRC_LOCALEDATA := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java
################################################################################

11
jdk/make/src/classes/build/tools/cldrconverter/AbstractLDMLHandler.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -121,6 +121,15 @@ abstract class AbstractLDMLHandler<V> extends DefaultHandler {
}
}
/**
* start an element that defines an alias entry, with the value provided by the element's alias.
*/
void pushAliasEntry(String qName, Attributes attributes, String key) {
if (!pushIfIgnored(qName, attributes)) {
currentContainer = new AliasEntry(qName, currentContainer, key);
}
}
/**
* start an element that defines a string entry, with the value provided by an attribute value.
*/

36
jdk/make/src/classes/build/tools/cldrconverter/AliasEntry.java Normal file
View File

@ -0,0 +1,36 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package build.tools.cldrconverter;
class AliasEntry extends StringEntry {
AliasEntry(String qName, Container parent, String key) {
super(qName, parent, key);
}
AliasEntry(String qName, Container parent, String key, String value) {
super(qName, parent, key, value);
}
}

47
jdk/make/src/classes/build/tools/cldrconverter/Bundle.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -32,6 +32,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
class Bundle {
static enum Type {
@ -81,7 +82,10 @@ class Bundle {
};
private final static String[] DATETIME_PATTERN_KEYS = {
"DateTimePatterns/date-time"
"DateTimePatterns/full-dateTime",
"DateTimePatterns/long-dateTime",
"DateTimePatterns/medium-dateTime",
"DateTimePatterns/short-dateTime",
};
private final static String[] ERA_KEYS = {
@ -170,6 +174,7 @@ class Bundle {
for (index = 0; index < cldrBundles.length; index++) {
if (cldrBundles[index].equals(id)) {
myMap.putAll(CLDRConverter.getCLDRBundle(cldrBundles[index]));
CLDRConverter.handleAliases(myMap);
break;
}
}
@ -179,10 +184,11 @@ class Bundle {
for (int i = cldrBundles.length - 1; i > index; i--) {
if (!("no".equals(cldrBundles[i]) || cldrBundles[i].startsWith("no_"))) {
parentsMap.putAll(CLDRConverter.getCLDRBundle(cldrBundles[i]));
CLDRConverter.handleAliases(parentsMap);
}
}
// Duplicate myMap as parentsMap for "root" so that the
// fallback works. This is a huck, though.
// fallback works. This is a hack, though.
if ("root".equals(cldrBundles[0])) {
assert parentsMap.isEmpty();
parentsMap.putAll(myMap);
@ -370,6 +376,17 @@ class Bundle {
}
}
}
// Remove all duplicates
if (Objects.nonNull(parentsMap)) {
for (Iterator<String> it = myMap.keySet().iterator(); it.hasNext();) {
String key = it.next();
if (Objects.deepEquals(parentsMap.get(key), myMap.get(key))) {
it.remove();
}
}
}
return myMap;
}
@ -506,11 +523,6 @@ class Bundle {
if (patterns.isEmpty()) {
return;
}
for (String p : patterns) {
if (p == null) {
return;
}
}
String key = calendarPrefix + name;
if (!rawPatterns.equals(patterns)) {
myMap.put("java.time." + key, rawPatterns.toArray(new String[len]));
@ -630,7 +642,9 @@ class Bundle {
if (name.contains("Standard Time")) {
name = name.replace("Standard Time", "Daylight Time");
} else if (name.endsWith("Mean Time")) {
if (!name.startsWith("Greenwich ")) {
name = name.replace("Mean Time", "Summer Time");
}
} else if (name.endsWith(" Time")) {
name = name.replace(" Time", " Summer Time");
}
@ -644,8 +658,10 @@ class Bundle {
if (name.endsWith("Standard Time")) {
name = name.replace("Standard Time", "Time");
} else if (name.endsWith("Mean Time")) {
if (!name.startsWith("Greenwich ")) {
name = name.replace("Mean Time", "Time");
}
}
map.put(TZ_GEN_LONG_KEY, name);
fillInAbbrs(TZ_GEN_LONG_KEY, TZ_GEN_SHORT_KEY, map);
}
@ -712,6 +728,15 @@ class Bundle {
}
break;
case 'l':
// 'l' is deprecated as a pattern character. Should be ignored.
break;
case 'u':
// Use 'y' for now.
appendN('y', count, sb);
break;
case 'v':
case 'V':
appendN('z', count, sb);
@ -723,16 +748,14 @@ class Bundle {
}
break;
case 'u':
case 'U':
case 'q':
case 'Q':
case 'l':
case 'g':
case 'j':
case 'A':
throw new InternalError(String.format("Unsupported letter: '%c', count=%d%n",
cldrLetter, count));
throw new InternalError(String.format("Unsupported letter: '%c', count=%d, id=%s%n",
cldrLetter, count, id));
default:
appendN(cldrLetter, count, sb);
break;

216
jdk/make/src/classes/build/tools/cldrconverter/CLDRConverter.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -32,6 +32,9 @@ import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.*;
import java.util.ResourceBundle.Control;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import org.xml.sax.SAXNotRecognizedException;
@ -64,12 +67,22 @@ public class CLDRConverter {
static final String TIMEZONE_ID_PREFIX = "timezone.id.";
static final String ZONE_NAME_PREFIX = "timezone.displayname.";
static final String METAZONE_ID_PREFIX = "metazone.id.";
static final String PARENT_LOCALE_PREFIX = "parentLocale.";
private static SupplementDataParseHandler handlerSuppl;
static NumberingSystemsParseHandler handlerNumbering;
static MetaZonesParseHandler handlerMetaZones;
private static BundleGenerator bundleGenerator;
// java.base module related
static boolean isBaseModule = false;
static final Set<Locale> BASE_LOCALES = new HashSet<>();
// "parentLocales" map
private static final Map<String, SortedSet<String>> parentLocalesMap = new HashMap<>();
private static final ResourceBundle.Control defCon =
ResourceBundle.Control.getControl(ResourceBundle.Control.FORMAT_DEFAULT);
static enum DraftType {
UNCONFIRMED,
PROVISIONAL,
@ -142,6 +155,16 @@ public class CLDRConverter {
}
break;
case "-baselocales":
// base locales
setupBaseLocales(args[++i]);
break;
case "-basemodule":
// indicates java.base module resource generation
isBaseModule = true;
break;
case "-o":
// output directory
DESTINATION_DIR = args[++i];
@ -179,8 +202,15 @@ public class CLDRConverter {
NUMBERING_SOURCE_FILE = CLDR_BASE + "common/supplemental/numberingSystems.xml";
METAZONES_SOURCE_FILE = CLDR_BASE + "common/supplemental/metaZones.xml";
if (BASE_LOCALES.isEmpty()) {
setupBaseLocales("en-US");
}
bundleGenerator = new ResourceBundleGenerator();
// Parse data independent of locales
parseSupplemental();
List<Bundle> bundles = readBundleList();
convertBundles(bundles);
}
@ -192,6 +222,9 @@ public class CLDRConverter {
+ "\t-draft [approved | provisional | unconfirmed]%n"
+ "\t\t draft level for using data (default: approved)%n"
+ "\t-base dir base directory for CLDR input files%n"
+ "\t-basemodule generates bundles that go into java.base module%n"
+ "\t-baselocales loc(,loc)* locales that go into the base module%n"
+ "\t-o dir output directory (default: ./build/gensrc)%n"
+ "\t-o dir output directory (defaut: ./build/gensrc)%n"
+ "\t-utf8 use UTF-8 rather than \\uxxxx (for debug)%n");
}
@ -248,7 +281,6 @@ public class CLDRConverter {
}
private static List<Bundle> readBundleList() throws Exception {
ResourceBundle.Control defCon = ResourceBundle.Control.getControl(ResourceBundle.Control.FORMAT_DEFAULT);
List<Bundle> retList = new ArrayList<>();
Path path = FileSystems.getDefault().getPath(SOURCE_FILE_DIR);
try (DirectoryStream<Path> dirStr = Files.newDirectoryStream(path)) {
@ -257,7 +289,7 @@ public class CLDRConverter {
if (fileName.endsWith(".xml")) {
String id = fileName.substring(0, fileName.indexOf('.'));
Locale cldrLoc = Locale.forLanguageTag(toLanguageTag(id));
List<Locale> candList = defCon.getCandidateLocales("", cldrLoc);
List<Locale> candList = applyParentLocales("", defCon.getCandidateLocales("", cldrLoc));
StringBuilder sb = new StringBuilder();
for (Locale loc : candList) {
if (!loc.equals(Locale.ROOT)) {
@ -269,9 +301,9 @@ public class CLDRConverter {
sb.append("root");
}
Bundle b = new Bundle(id, sb.toString(), null, null);
// Insert the bundle for en at the top so that it will get
// Insert the bundle for root at the top so that it will get
// processed first.
if ("en".equals(id)) {
if ("root".equals(id)) {
retList.add(0, b);
} else {
retList.add(b);
@ -282,7 +314,7 @@ public class CLDRConverter {
return retList;
}
private static Map<String, Map<String, Object>> cldrBundles = new HashMap<>();
private static final Map<String, Map<String, Object>> cldrBundles = new HashMap<>();
static Map<String, Object> getCLDRBundle(String id) throws Exception {
Map<String, Object> bundle = cldrBundles.get(id);
@ -319,12 +351,19 @@ public class CLDRConverter {
return bundle;
}
private static void convertBundles(List<Bundle> bundles) throws Exception {
// Parsers for data in "supplemental" directory
//
private static void parseSupplemental() throws Exception {
// Parse SupplementalData file and store the information in the HashMap
// Calendar information such as firstDay and minDay are stored in
// supplementalData.xml as of CLDR1.4. Individual territory is listed
// with its ISO 3166 country code while default is listed using UNM49
// 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();
@ -332,8 +371,14 @@ public class CLDRConverter {
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.
info("..... Parsing numberingSystem.xml .....");
SAXParserFactory numberingParser = SAXParserFactory.newInstance();
numberingParser.setValidating(true);
SAXParser parserNumbering = numberingParser.newSAXParser();
@ -343,6 +388,7 @@ public class CLDRConverter {
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();
@ -350,14 +396,23 @@ public class CLDRConverter {
handlerMetaZones = new MetaZonesParseHandler();
File fileMetaZones = new File(METAZONES_SOURCE_FILE);
parserNumbering.parse(fileMetaZones, handlerMetaZones);
}
private static void convertBundles(List<Bundle> bundles) throws Exception {
// For generating information on supported locales.
Map<String, SortedSet<String>> metaInfo = new HashMap<>();
metaInfo.put("LocaleNames", new TreeSet<String>());
metaInfo.put("CurrencyNames", new TreeSet<String>());
metaInfo.put("TimeZoneNames", new TreeSet<String>());
metaInfo.put("CalendarData", new TreeSet<String>());
metaInfo.put("FormatData", new TreeSet<String>());
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<>());
// parent locales map. The mappings are put in base metaInfo file
// for now.
if (isBaseModule) {
metaInfo.putAll(parentLocalesMap);
}
for (Bundle bundle : bundles) {
// Get the target map, which contains all the data that should be
@ -367,21 +422,7 @@ public class CLDRConverter {
EnumSet<Bundle.Type> bundleTypes = bundle.getBundleTypes();
// Fill in any missing resources in the base bundle from en and en-US data.
// This is because CLDR root.xml is supposed to be language neutral and doesn't
// provide some resource data. Currently, the runtime assumes that there are all
// resources though the parent resource bundle chain.
if (bundle.isRoot()) {
Map<String, Object> enData = new HashMap<>();
// Create a superset of en-US and en bundles data in order to
// fill in any missing resources in the base bundle.
enData.putAll(Bundle.getBundle("en").getTargetMap());
enData.putAll(Bundle.getBundle("en_US").getTargetMap());
for (String key : enData.keySet()) {
if (!targetMap.containsKey(key)) {
targetMap.put(key, enData.get(key));
}
}
// Add DateTimePatternChars because CLDR no longer supports localized patterns.
targetMap.put("DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ");
}
@ -418,60 +459,56 @@ public class CLDRConverter {
}
if (bundleTypes.contains(Bundle.Type.FORMATDATA)) {
Map<String, Object> formatDataMap = extractFormatData(targetMap, bundle.getID());
// LocaleData.getAvailableLocales depends on having FormatData bundles around
if (!formatDataMap.isEmpty() || bundle.isRoot()) {
metaInfo.get("FormatData").add(toLanguageTag(bundle.getID()));
bundleGenerator.generateBundle("text", "FormatData", bundle.getID(), true, formatDataMap, BundleType.PLAIN);
}
}
// For testing
SortedSet<String> allLocales = new TreeSet<>();
allLocales.addAll(metaInfo.get("CurrencyNames"));
allLocales.addAll(metaInfo.get("LocaleNames"));
allLocales.addAll(metaInfo.get("CalendarData"));
allLocales.addAll(metaInfo.get("FormatData"));
metaInfo.put("AvailableLocales", allLocales);
// For AvailableLocales
metaInfo.get("AvailableLocales").add(toLanguageTag(bundle.getID()));
}
bundleGenerator.generateMetaInfo(metaInfo);
}
static final Map<String, String> aliases = new HashMap<>();
/**
* Translate the aliases into the real entries in the bundle map.
*/
static void handleAliases(Map<String, Object> bundleMap) {
Set bundleKeys = bundleMap.keySet();
try {
for (String key : aliases.keySet()) {
String targetKey = aliases.get(key);
if (bundleKeys.contains(targetKey)) {
bundleMap.putIfAbsent(key, bundleMap.get(targetKey));
}
}
} catch (Exception ex) {
Logger.getLogger(CLDRConverter.class.getName()).log(Level.SEVERE, null, ex);
}
}
/*
* Returns the language portion of the given id.
* If id is "root", "" is returned.
*/
static String getLanguageCode(String id) {
int index = id.indexOf('_');
String lang = null;
if (index != -1) {
lang = id.substring(0, index);
} else {
lang = "root".equals(id) ? "" : id;
}
return lang;
return "root".equals(id) ? "" : Locale.forLanguageTag(id.replaceAll("_", "-")).getLanguage();
}
/**
* Examine if the id includes the country (territory) code. If it does, it returns
* the country code.
* Otherwise, it returns null. eg. when the id is "zh_Hans_SG", it return "SG".
* For now, it does not return US M.49 code, e.g., '001', as those three digit numbers cannot
* be translated into package names.
*/
private static String getCountryCode(String id) {
//Truncate a variant code with '@' if there is any
//(eg. de_DE@collation=phonebook,currency=DOM)
if (id.indexOf('@') != -1) {
id = id.substring(0, id.indexOf('@'));
}
String[] tokens = id.split("_");
for (int index = 1; index < tokens.length; ++index) {
if (tokens[index].length() == 2
&& Character.isLetter(tokens[index].charAt(0))
&& Character.isLetter(tokens[index].charAt(1))) {
return tokens[index];
}
}
return null;
static String getCountryCode(String id) {
String ctry = Locale.forLanguageTag(id.replaceAll("_", "-")).getCountry();
return ctry.length() == 2 ? ctry : null;
}
private static class KeyComparator implements Comparator<String> {
@ -598,6 +635,9 @@ public class CLDRConverter {
private static Map<String, Object> extractFormatData(Map<String, Object> map, String id) {
Map<String, Object> formatData = new LinkedHashMap<>();
for (CalendarType calendarType : CalendarType.values()) {
if (calendarType == CalendarType.GENERIC) {
continue;
}
String prefix = calendarType.keyElementName();
for (String element : FORMAT_DATA_ELEMENTS) {
String key = prefix + element;
@ -605,28 +645,15 @@ public class CLDRConverter {
copyIfPresent(map, key, formatData);
}
}
// Workaround for islamic-umalqura name support (JDK-8015986)
switch (id) {
case "ar":
map.put(CLDRConverter.CALENDAR_NAME_PREFIX
+ CalendarType.ISLAMIC_UMALQURA.lname(),
// derived from CLDR 24 draft
"\u0627\u0644\u062a\u0642\u0648\u064a\u0645 "
+"\u0627\u0644\u0625\u0633\u0644\u0627\u0645\u064a "
+"[\u0623\u0645 \u0627\u0644\u0642\u0631\u0649]");
break;
case "en":
map.put(CLDRConverter.CALENDAR_NAME_PREFIX
+ CalendarType.ISLAMIC_UMALQURA.lname(),
// derived from CLDR 24 draft
"Islamic Calendar [Umm al-Qura]");
break;
}
// Copy available calendar names
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);
@ -745,4 +772,43 @@ public class CLDRConverter {
}
return tag.replaceAll("-", "_");
}
private static void setupBaseLocales(String localeList) {
Arrays.stream(localeList.split(","))
.map(Locale::forLanguageTag)
.map(l -> Control.getControl(Control.FORMAT_DEFAULT)
.getCandidateLocales("", l))
.forEach(BASE_LOCALES::addAll);
}
// applying parent locale rules to the passed candidates list
// This has to match with the one in sun.util.cldr.CLDRLocaleProviderAdapter
private static Map<Locale, Locale> childToParentLocaleMap = null;
private static List<Locale> applyParentLocales(String baseName, List<Locale> candidates) {
if (Objects.isNull(childToParentLocaleMap)) {
childToParentLocaleMap = new HashMap<>();
parentLocalesMap.keySet().forEach(key -> {
String parent = key.substring(PARENT_LOCALE_PREFIX.length()).replaceAll("_", "-");
parentLocalesMap.get(key).stream().forEach(child -> {
childToParentLocaleMap.put(Locale.forLanguageTag(child),
"root".equals(parent) ? Locale.ROOT : Locale.forLanguageTag(parent));
});
});
}
// check irregular parents
for (int i = 0; i < candidates.size(); i++) {
Locale l = candidates.get(i);
Locale p = childToParentLocaleMap.get(l);
if (!l.equals(Locale.ROOT) &&
Objects.nonNull(p) &&
!candidates.get(i+1).equals(p)) {
List<Locale> applied = candidates.subList(0, i+1);
applied.addAll(applyParentLocales(baseName, defCon.getCandidateLocales(baseName, p)));
return applied;
}
}
return candidates;
}
}

12
jdk/make/src/classes/build/tools/cldrconverter/CalendarType.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -29,19 +29,21 @@ import java.util.Locale;
/**
* Constants for the Calendars supported by JRE.
* Note that "GENERIC" calendar data will NOT be extracted to JDK's ResourceBundles.
*/
enum CalendarType {
GREGORIAN("gregory"), BUDDHIST, JAPANESE, ROC,
ISLAMIC, ISLAMIC_CIVIL("islamicc"), ISLAMIC_UMALQURA("islamic-umalqura");
GENERIC, GREGORIAN("gregory"), BUDDHIST, JAPANESE, ROC,
ISLAMIC, ISLAMIC_CIVIL("islamic-civil"), ISLAMIC_UMALQURA("islamic-umalqura");
private static final int[][] ERA_DATA = {
// start index, array length
{0, 2}, // generic
{0, 2}, // gregorian
{0, 1}, // buddhist
{232, 4}, // japanese (eras from Meiji)
{0, 2}, // roc (Minguo)
{0, 1}, // islamic (Hijrah)
{0, 1}, // islamicc (same as islamic)
{0, 1}, // islamic-civil (same as islamic)
{0, 1}, // islamic-umalqura
};
@ -87,7 +89,7 @@ enum CalendarType {
static CalendarType forName(String name) {
for (CalendarType type : values()) {
if (type.lname.equals(name)) {
if (type.lname.equals(name) || type.uname.equals(name)) {
return type;
}
}

61
jdk/make/src/classes/build/tools/cldrconverter/CopyrightHeaders.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -41,41 +41,46 @@ class CopyrightHeaders {
" * Copyright (c) 2012, %d, Oracle and/or its affiliates. All rights reserved.\n" +
" */\n";
// Last updated: - 1/16/2015, 1:42:31 PM
private static final String UNICODE =
"/*\n" +
" * COPYRIGHT AND PERMISSION NOTICE\n" +
" *\n" +
" * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under\n" +
" * the Terms of Use in http://www.unicode.org/copyright.html.\n" +
" * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.\n" +
" * Distributed under the Terms of Use in \n" +
" * http://www.unicode.org/copyright.html.\n" +
" *\n" +
" * Permission is hereby granted, free of charge, to any person obtaining a copy\n" +
" * of the Unicode data files and any associated documentation (the \"Data\n" +
" * Files\") or Unicode software and any associated documentation (the\n" +
" * \"Software\") to deal in the Data Files or Software without restriction,\n" +
" * including without limitation the rights to use, copy, modify, merge,\n" +
" * publish, distribute, and/or sell copies of the Data Files or Software, and\n" +
" * to permit persons to whom the Data Files or Software are furnished to do so,\n" +
" * provided that (a) the above copyright notice(s) and this permission notice\n" +
" * appear with all copies of the Data Files or Software, (b) both the above\n" +
" * copyright notice(s) and this permission notice appear in associated\n" +
" * documentation, and (c) there is clear notice in each modified Data File or\n" +
" * in the Software as well as in the documentation associated with the Data\n" +
" * File(s) or Software that the data or software has been modified.\n" +
" * Permission is hereby granted, free of charge, to any person obtaining\n" +
" * a copy of the Unicode data files and any associated documentation\n" +
" * (the \"Data Files\") or Unicode software and any associated documentation\n" +
" * (the \"Software\") to deal in the Data Files or Software\n" +
" * without restriction, including without limitation the rights to use,\n" +
" * copy, modify, merge, publish, distribute, and/or sell copies of\n" +
" * the Data Files or Software, and to permit persons to whom the Data Files\n" +
" * or Software are furnished to do so, provided that\n" +
" * (a) this copyright and permission notice appear with all copies \n" +
" * of the Data Files or Software,\n" +
" * (b) this copyright and permission notice appear in associated \n" +
" * documentation, and\n" +
" * (c) there is clear notice in each modified Data File or in the Software\n" +
" * as well as in the documentation associated with the Data File(s) or\n" +
" * Software that the data or software has been modified.\n" +
" *\n" +
" * THE DATA FILES AND SOFTWARE ARE PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY\n" +
" * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\n" +
" * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF\n" +
" * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS\n" +
" * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR\n" +
" * CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,\n" +
" * THE DATA FILES AND SOFTWARE ARE PROVIDED \"AS IS\", WITHOUT WARRANTY OF\n" +
" * ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE\n" +
" * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\n" +
" * NONINFRINGEMENT OF THIRD PARTY RIGHTS.\n" +
" * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS\n" +
" * NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL\n" +
" * DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,\n" +
" * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER\n" +
" * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE\n" +
" * OF THE DATA FILES OR SOFTWARE.\n" +
" * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR\n" +
" * PERFORMANCE OF THE DATA FILES OR SOFTWARE.\n" +
" *\n" +
" * Except as contained in this notice, the name of a copyright holder shall not\n" +
" * be used in advertising or otherwise to promote the sale, use or other\n" +
" * dealings in these Data Files or Software without prior written authorization\n" +
" * of the copyright holder.\n" +
" * Except as contained in this notice, the name of a copyright holder\n" +
" * shall not be used in advertising or otherwise to promote the sale,\n" +
" * use or other dealings in these Data Files or Software without prior\n" +
" * written authorization of the copyright holder.\n" +
" */\n";
private static String OPENJDK2012 =

303
jdk/make/src/classes/build/tools/cldrconverter/LDMLParseHandler.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -29,9 +29,11 @@ import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@ -47,6 +49,8 @@ class LDMLParseHandler extends AbstractLDMLHandler<Object> {
private String zoneNameStyle; // "long" or "short" for time zone names
private String zonePrefix;
private final String id;
private String currentContext = ""; // "format"/"stand-alone"
private String currentWidth = ""; // "wide"/"narrow"/"abbreviated"
LDMLParseHandler(String id) {
this.id = id;
@ -78,20 +82,17 @@ class LDMLParseHandler extends AbstractLDMLHandler<Object> {
pushIgnoredContainer(qName);
}
break;
case "language":
// for LocaleNames
// copy string
pushStringEntry(qName, attributes, CLDRConverter.LOCALE_NAME_PREFIX + attributes.getValue("type"));
break;
case "script":
// for LocaleNames
// copy string
pushStringEntry(qName, attributes, CLDRConverter.LOCALE_NAME_PREFIX + attributes.getValue("type"));
break;
case "territory":
case "variant":
// for LocaleNames
// copy string
pushStringEntry(qName, attributes, CLDRConverter.LOCALE_NAME_PREFIX + attributes.getValue("type"));
pushStringEntry(qName, attributes,
CLDRConverter.LOCALE_NAME_PREFIX +
(qName.equals("variant") ? "%%" : "") +
attributes.getValue("type"));
break;
//
@ -112,9 +113,10 @@ class LDMLParseHandler extends AbstractLDMLHandler<Object> {
// Calendar or currency
case "displayName":
{
if (currentCalendarType != null) {
if (currentContainer.getqName().equals("field")) {
pushStringEntry(qName, attributes,
currentCalendarType.keyElementName() + "field." + getContainerKey());
(currentCalendarType != null ? currentCalendarType.keyElementName() : "")
+ "field." + getContainerKey());
} else {
// for CurrencyNames
// need to get the key from the containing <currency> element
@ -149,10 +151,8 @@ class LDMLParseHandler extends AbstractLDMLHandler<Object> {
}
break;
case "fields":
if (currentCalendarType != null) {
{
pushContainer(qName, attributes);
} else {
pushIgnoredContainer(qName);
}
break;
case "field":
@ -183,6 +183,7 @@ class LDMLParseHandler extends AbstractLDMLHandler<Object> {
// need to keep stand-alone and format, to allow for inheritance in CLDR
String type = attributes.getValue("type");
if ("stand-alone".equals(type) || "format".equals(type)) {
currentContext = type;
pushKeyContainer(qName, attributes, type);
} else {
pushIgnoredContainer(qName);
@ -194,8 +195,13 @@ class LDMLParseHandler extends AbstractLDMLHandler<Object> {
// for FormatData
// create string array for the two types that the JRE knows
// keep info about the context type so we can sort out inheritance later
if (currentCalendarType == null) {
pushIgnoredContainer(qName);
break;
}
String prefix = (currentCalendarType == null) ? "" : currentCalendarType.keyElementName();
switch (attributes.getValue("type")) {
currentWidth = attributes.getValue("type");
switch (currentWidth) {
case "wide":
pushStringArrayEntry(qName, attributes, prefix + "MonthNames/" + getContainerKey(), 13);
break;
@ -222,6 +228,7 @@ class LDMLParseHandler extends AbstractLDMLHandler<Object> {
// need to keep stand-alone and format, to allow for multiple inheritance in CLDR
String type = attributes.getValue("type");
if ("stand-alone".equals(type) || "format".equals(type)) {
currentContext = type;
pushKeyContainer(qName, attributes, type);
} else {
pushIgnoredContainer(qName);
@ -234,7 +241,8 @@ class LDMLParseHandler extends AbstractLDMLHandler<Object> {
// create string array for the two types that the JRE knows
// keep info about the context type so we can sort out inheritance later
String prefix = (currentCalendarType == null) ? "" : currentCalendarType.keyElementName();
switch (attributes.getValue("type")) {
currentWidth = attributes.getValue("type");
switch (currentWidth) {
case "wide":
pushStringArrayEntry(qName, attributes, prefix + "DayNames/" + getContainerKey(), 7);
break;
@ -263,6 +271,7 @@ class LDMLParseHandler extends AbstractLDMLHandler<Object> {
{
String type = attributes.getValue("type");
if ("stand-alone".equals(type) || "format".equals(type)) {
currentContext = type;
pushKeyContainer(qName, attributes, type);
} else {
pushIgnoredContainer(qName);
@ -272,7 +281,8 @@ class LDMLParseHandler extends AbstractLDMLHandler<Object> {
case "dayPeriodWidth":
// for FormatData
// create string array entry for am/pm. only keeping wide
switch (attributes.getValue("type")) {
currentWidth = attributes.getValue("type");
switch (currentWidth) {
case "wide":
pushStringArrayEntry(qName, attributes, "AmPmMarkers/" + getContainerKey(), 2);
break;
@ -362,6 +372,7 @@ class LDMLParseHandler extends AbstractLDMLHandler<Object> {
// need to keep stand-alone and format, to allow for inheritance in CLDR
String type = attributes.getValue("type");
if ("stand-alone".equals(type) || "format".equals(type)) {
currentContext = type;
pushKeyContainer(qName, attributes, type);
} else {
pushIgnoredContainer(qName);
@ -373,7 +384,8 @@ class LDMLParseHandler extends AbstractLDMLHandler<Object> {
// for FormatData
// keep info about the context type so we can sort out inheritance later
String prefix = (currentCalendarType == null) ? "" : currentCalendarType.keyElementName();
switch (attributes.getValue("type")) {
currentWidth = attributes.getValue("type");
switch (currentWidth) {
case "wide":
pushStringArrayEntry(qName, attributes, prefix + "QuarterNames/" + getContainerKey(), 4);
break;
@ -450,12 +462,20 @@ class LDMLParseHandler extends AbstractLDMLHandler<Object> {
case "currencyFormat":
// for FormatData
// copy string for later assembly into NumberPatterns
if (attributes.getValue("type").equals("standard")) {
pushStringEntry(qName, attributes, "NumberPatterns/currency");
} else {
pushIgnoredContainer(qName);
}
break;
case "percentFormat":
// for FormatData
// copy string for later assembly into NumberPatterns
if (attributes.getValue("type").equals("standard")) {
pushStringEntry(qName, attributes, "NumberPatterns/percent");
} else {
pushIgnoredContainer(qName);
}
break;
case "defaultNumberingSystem":
// default numbering system if multiple numbering systems are used.
@ -582,12 +602,12 @@ class LDMLParseHandler extends AbstractLDMLHandler<Object> {
pushStringEntry(qName, attributes, prefix + "DateTimePatterns/" + attributes.getValue("type") + "-date");
}
break;
case "dateTimeFormat":
case "dateTimeFormatLength":
{
// for FormatData
// copy string for later assembly into DateTimePatterns
String prefix = (currentCalendarType == null) ? "" : currentCalendarType.keyElementName();
pushStringEntry(qName, attributes, prefix + "DateTimePatterns/date-time");
pushStringEntry(qName, attributes, prefix + "DateTimePatterns/" + attributes.getValue("type") + "-dateTime");
}
break;
case "localizedPatternChars":
@ -599,6 +619,20 @@ class LDMLParseHandler extends AbstractLDMLHandler<Object> {
}
break;
// "alias" for root
case "alias":
{
if (id.equals("root") &&
!isIgnored(attributes) &&
currentCalendarType != null &&
!currentCalendarType.lname().startsWith("islamic-")) { // ignore Islamic variants
pushAliasEntry(qName, attributes, attributes.getValue("path"));
} else {
pushIgnoredContainer(qName);
}
}
break;
default:
// treat anything else as a container
pushContainer(qName, attributes);
@ -606,6 +640,184 @@ class LDMLParseHandler extends AbstractLDMLHandler<Object> {
}
}
private static final String[] CONTEXTS = {"stand-alone", "format"};
private static final String[] WIDTHS = {"wide", "narrow", "abbreviated"};
private static final String[] LENGTHS = {"full", "long", "medium", "short"};
private void populateWidthAlias(String type, Set<String> keys) {
for (String context : CONTEXTS) {
for (String width : WIDTHS) {
String keyName = toJDKKey(type+"Width", context, width);
if (keyName.length() > 0) {
keys.add(keyName + "," + context + "," + width);
}
}
}
}
private void populateFormatLengthAlias(String type, Set<String> keys) {
for (String length: LENGTHS) {
String keyName = toJDKKey(type+"FormatLength", currentContext, length);
if (keyName.length() > 0) {
keys.add(keyName + "," + currentContext + "," + length);
}
}
}
private Set<String> populateAliasKeys(String qName, String context, String width) {
HashSet<String> ret = new HashSet<>();
String keyName = qName;
switch (qName) {
case "monthWidth":
case "dayWidth":
case "quarterWidth":
case "dayPeriodWidth":
case "dateFormatLength":
case "timeFormatLength":
case "dateTimeFormatLength":
case "eraNames":
case "eraAbbr":
case "eraNarrow":
ret.add(toJDKKey(qName, context, width) + "," + context + "," + width);
break;
case "days":
populateWidthAlias("day", ret);
break;
case "months":
populateWidthAlias("month", ret);
break;
case "quarters":
populateWidthAlias("quarter", ret);
break;
case "dayPeriods":
populateWidthAlias("dayPeriod", ret);
break;
case "eras":
ret.add(toJDKKey("eraNames", context, width) + "," + context + "," + width);
ret.add(toJDKKey("eraAbbr", context, width) + "," + context + "," + width);
ret.add(toJDKKey("eraNarrow", context, width) + "," + context + "," + width);
break;
case "dateFormats":
populateFormatLengthAlias("date", ret);
break;
case "timeFormats":
populateFormatLengthAlias("time", ret);
break;
default:
break;
}
return ret;
}
private String translateWidthAlias(String qName, String context, String width) {
String keyName = qName;
String type = Character.toUpperCase(qName.charAt(0)) + qName.substring(1, qName.indexOf("Width"));
switch (width) {
case "wide":
keyName = type + "Names/" + context;
break;
case "abbreviated":
keyName = type + "Abbreviations/" + context;
break;
case "narrow":
keyName = type + "Narrows/" + context;
break;
default:
assert false;
}
return keyName;
}
private String toJDKKey(String containerqName, String context, String type) {
String keyName = containerqName;
switch (containerqName) {
case "monthWidth":
case "dayWidth":
case "quarterWidth":
keyName = translateWidthAlias(keyName, context, type);
break;
case "dayPeriodWidth":
switch (type) {
case "wide":
keyName = "AmPmMarkers/" + context;
break;
case "narrow":
keyName = "narrow.AmPmMarkers/" + context;
break;
case "abbreviated":
keyName = "";
break;
}
break;
case "dateFormatLength":
case "timeFormatLength":
case "dateTimeFormatLength":
keyName = "DateTimePatterns/" +
type + "-" +
keyName.substring(0, keyName.indexOf("FormatLength"));
break;
case "eraNames":
keyName = "long.Eras";
break;
case "eraAbbr":
keyName = "Eras";
break;
case "eraNarrow":
keyName = "narrow.Eras";
break;
case "dateFormats":
case "timeFormats":
case "days":
case "months":
case "quarters":
case "dayPeriods":
case "eras":
break;
default:
keyName = "";
break;
}
return keyName;
}
private String getTarget(String qName, String path, String calType, String context, String width) {
// qName
int lastSlash = path.lastIndexOf('/');
qName = path.substring(lastSlash+1);
int bracket = qName.indexOf('[');
if (bracket != -1) {
qName = qName.substring(0, bracket);
}
// calType
String typeKey = "/calendar[@type='";
int start = path.indexOf(typeKey);
if (start != -1) {
calType = path.substring(start+typeKey.length(), path.indexOf("']", start));
}
// context
typeKey = "Context[@type='";
start = path.indexOf(typeKey);
if (start != -1) {
context = (path.substring(start+typeKey.length(), path.indexOf("']", start)));
}
// width
typeKey = "Width[@type='";
start = path.indexOf(typeKey);
if (start != -1) {
width = path.substring(start+typeKey.length(), path.indexOf("']", start));
}
return calType + "." + toJDKKey(qName, context, width);
}
@Override
public void endElement(String uri, String localName, String qName) throws SAXException {
assert qName.equals(currentContainer.getqName()) : "current=" + currentContainer.getqName() + ", param=" + qName;
@ -628,6 +840,7 @@ class LDMLParseHandler extends AbstractLDMLHandler<Object> {
case "timeZoneNames":
zonePrefix = null;
break;
case "generic":
case "standard":
case "daylight":
@ -638,8 +851,52 @@ class LDMLParseHandler extends AbstractLDMLHandler<Object> {
valmap.put(entry.getKey(), (String) entry.getValue());
}
break;
case "monthWidth":
case "dayWidth":
case "dayPeriodWidth":
case "quarterWidth":
currentWidth = "";
putIfEntry();
break;
case "monthContext":
case "dayContext":
case "dayPeriodContext":
case "quarterContext":
currentContext = "";
putIfEntry();
break;
default:
if (currentContainer instanceof Entry) {
putIfEntry();
}
currentContainer = currentContainer.getParent();
}
private void putIfEntry() {
if (currentContainer instanceof AliasEntry) {
Entry<?> entry = (Entry<?>) currentContainer;
String containerqName = entry.getParent().getqName();
Set<String> keyNames = populateAliasKeys(containerqName, currentContext, currentWidth);
if (!keyNames.isEmpty()) {
for (String keyName : keyNames) {
String[] tmp = keyName.split(",", 3);
String calType = currentCalendarType.lname();
String src = calType+"."+tmp[0];
String target = getTarget(containerqName,
entry.getKey(),
calType,
tmp[1].length()>0 ? tmp[1] : currentContext,
tmp[2].length()>0 ? tmp[2] : currentWidth);
if (target.substring(target.lastIndexOf('.')+1).equals(containerqName)) {
target = target.substring(0, target.indexOf('.'))+"."+tmp[0];
}
CLDRConverter.aliases.put(src.replaceFirst("^gregorian.", ""),
target.replaceFirst("^gregorian.", ""));
}
}
} else if (currentContainer instanceof Entry) {
Entry<?> entry = (Entry<?>) currentContainer;
Object value = entry.getValue();
if (value != null) {
@ -647,6 +904,4 @@ class LDMLParseHandler extends AbstractLDMLHandler<Object> {
}
}
}
currentContainer = currentContainer.getParent();
}
}

173
jdk/make/src/classes/build/tools/cldrconverter/ResourceBundleGenerator.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -30,22 +30,62 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.util.Formatter;
import java.util.HashSet;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Locale;
import java.util.Objects;
import java.util.Set;
import java.util.SortedSet;
class ResourceBundleGenerator implements BundleGenerator {
// preferred timezones - keeping compatibility with JDK1.1 3 letter abbreviations
private static final String[] preferredTZIDs = {
"America/Los_Angeles",
"America/Denver",
"America/Phoenix",
"America/Chicago",
"America/New_York",
"America/Indianapolis",
"Pacific/Honolulu",
"America/Anchorage",
"America/Halifax",
"America/Sitka",
"America/St_Johns",
"Europe/Paris",
// Although CLDR does not support abbreviated zones, handle "GMT" as a
// special case here, as it is specified in the javadoc.
"GMT",
"Africa/Casablanca",
"Asia/Jerusalem",
"Asia/Tokyo",
"Europe/Bucharest",
"Asia/Shanghai",
};
// For duplicated values
private static final String META_VALUE_PREFIX = "metaValue_";
@Override
public void generateBundle(String packageName, String baseName, String localeID, boolean useJava,
Map<String, ?> map, BundleType type) throws IOException {
String suffix = useJava ? ".java" : ".properties";
String lang = CLDRConverter.getLanguageCode(localeID);
String ctry = CLDRConverter.getCountryCode(localeID);
String dirName = CLDRConverter.DESTINATION_DIR + File.separator + "sun" + File.separator
+ packageName + File.separator + "resources" + File.separator + "cldr";
if (lang.length() > 0) {
dirName = dirName + File.separator + lang;
packageName = packageName + ".resources.cldr." + lang;
if (CLDRConverter.isBaseModule ^ isBaseLocale(localeID)) {
return;
}
dirName = dirName + File.separator + lang +
(ctry != null && ctry.length() > 0 ? File.separator + ctry : "");
packageName = packageName + ".resources.cldr." + lang +
(ctry != null && ctry.length() > 0 ? "." + ctry : "");
} else {
if (!CLDRConverter.isBaseModule) {
return;
}
packageName = packageName + ".resources.cldr";
}
File dir = new File(dirName);
@ -89,6 +129,65 @@ class ResourceBundleGenerator implements BundleGenerator {
for (String key : metaKeys) {
map.remove(key);
}
// Make it preferred ordered
LinkedHashMap<String, Object> newMap = new LinkedHashMap<>();
for (String preferred : preferredTZIDs) {
if (map.containsKey(preferred)) {
newMap.put(preferred, map.remove(preferred));
} else if ("GMT".equals(preferred) &&
metaKeys.contains(CLDRConverter.METAZONE_ID_PREFIX+preferred)) {
newMap.put(preferred, preferred);
}
}
newMap.putAll(map);
map = newMap;
} else {
// generic reduction of duplicated values
Map<String, Object> newMap = null;
for (String key : map.keySet()) {
Object val = map.get(key);
String metaVal = null;
for (Map.Entry<String, ?> entry : map.entrySet()) {
String k = entry.getKey();
if (!k.equals(key) &&
Objects.deepEquals(val, entry.getValue()) &&
!(Objects.nonNull(newMap) && newMap.containsKey(k))) {
if (Objects.isNull(newMap)) {
newMap = new HashMap<>();
fmt = new Formatter();
}
if (Objects.isNull(metaVal)) {
metaVal = META_VALUE_PREFIX + key.replaceAll("\\.", "_");
if (val instanceof String[]) {
fmt.format(" final String[] %s = new String[] {\n", metaVal);
for (String s : (String[])val) {
fmt.format(" \"%s\",\n", CLDRConverter.saveConvert(s, useJava));
}
fmt.format(" };\n");
} else {
fmt.format(" final String %s = \"%s\";\n", metaVal, CLDRConverter.saveConvert((String)val, useJava));
}
}
newMap.put(k, metaVal);
}
}
if (Objects.nonNull(metaVal)) {
newMap.put(key, metaVal);
}
}
if (Objects.nonNull(newMap)) {
for (String key : map.keySet()) {
newMap.putIfAbsent(key, map.get(key));
}
map = newMap;
}
}
try (PrintWriter out = new PrintWriter(file, encoding)) {
@ -114,7 +213,8 @@ class ResourceBundleGenerator implements BundleGenerator {
if (value == null) {
CLDRConverter.warning("null value for " + key);
} else if (value instanceof String) {
if (type == BundleType.TIMEZONE) {
if (type == BundleType.TIMEZONE ||
((String)value).startsWith(META_VALUE_PREFIX)) {
out.printf(" { \"%s\", %s },\n", key, CLDRConverter.saveConvert((String) value, useJava));
} else {
out.printf(" { \"%s\", \"%s\" },\n", key, CLDRConverter.saveConvert((String) value, useJava));
@ -139,18 +239,22 @@ class ResourceBundleGenerator implements BundleGenerator {
}
}
private static final String METAINFO_CLASS = "CLDRLocaleDataMetaInfo";
@Override
public void generateMetaInfo(Map<String, SortedSet<String>> metaInfo) throws IOException {
String dirName = CLDRConverter.DESTINATION_DIR + File.separator + "sun" + File.separator + "util" +
File.separator + "resources" + File.separator + "cldr" + File.separator +
"provider" + File.separator ;
File.separator +
(CLDRConverter.isBaseModule ? "cldr" + File.separator + File.separator :
"resources" + File.separator + "cldr" + File.separator + "provider" + File.separator);
File dir = new File(dirName);
if (!dir.exists()) {
dir.mkdirs();
}
File file = new File(dir, METAINFO_CLASS + ".java");
String className =
(CLDRConverter.isBaseModule ? "CLDRBaseLocaleDataMetaInfo" :
"CLDRLocaleDataMetaInfo_" +
CLDRConverter.DESTINATION_DIR.substring(CLDRConverter.DESTINATION_DIR.lastIndexOf('/')+1)
.replaceAll("\\.", "_"));
File file = new File(dir, className + ".java");
if (!file.exists()) {
file.createNewFile();
}
@ -159,34 +263,71 @@ class ResourceBundleGenerator implements BundleGenerator {
try (PrintWriter out = new PrintWriter(file, "us-ascii")) {
out.println(CopyrightHeaders.getOpenJDKCopyright());
out.println("package sun.util.resources.cldr.provider;\n\n"
out.println((CLDRConverter.isBaseModule ? "package sun.util.cldr;\n\n" :
"package sun.util.resources.cldr.provider;\n\n")
+ "import java.util.HashMap;\n"
+ "import java.util.Map;\n"
+ "import java.util.ListResourceBundle;\n"
+ "import sun.util.locale.provider.LocaleProviderAdapter;\n"
+ "import sun.util.locale.provider.LocaleDataMetaInfo;\n");
out.printf("public class %s extends ListResourceBundle implements LocaleDataMetaInfo {\n", METAINFO_CLASS);
out.printf("public class %s extends ListResourceBundle implements LocaleDataMetaInfo {\n", className);
out.println(" @Override\n" +
" protected final Object[][] getContents() {\n" +
" final Object[][] data = new Object[][] {");
for (String key : metaInfo.keySet()) {
out.printf(" { \"%s\",\n", key);
out.printf(" \"%s\" },\n", toLocaleList(metaInfo.get(key)));
out.printf(" \"%s\" },\n",
toLocaleList(key.equals("FormatData") ? metaInfo.get("AvailableLocales") :
metaInfo.get(key),
key.startsWith(CLDRConverter.PARENT_LOCALE_PREFIX)));
}
out.println(" };\n return data;\n }\n\n");
out.println(" public LocaleProviderAdapter.Type getType() {\n" +
out.println(" @Override\n" +
" public LocaleProviderAdapter.Type getType() {\n" +
" return LocaleProviderAdapter.Type.CLDR;\n" +
" }\n\n");
out.println(" public String availableLanguageTags(String category) {\n" +
out.println(" @Override\n" +
" public String availableLanguageTags(String category) {\n" +
" return getString(category);\n" +
" };\n}");
" };\n\n");
if (CLDRConverter.isBaseModule) {
out.printf(" public Map<String, String> parentLocales() {\n" +
" Map<String, String> ret = new HashMap<>();\n" +
" keySet().stream()\n" +
" .filter(key -> key.startsWith(\"%s\"))\n" +
" .forEach(key -> ret.put(key.substring(%d), getString(key)));\n" +
" return ret.isEmpty() ? null : ret;\n" +
" };\n}",
CLDRConverter.PARENT_LOCALE_PREFIX,
CLDRConverter.PARENT_LOCALE_PREFIX.length());
} else {
out.println("}");
}
}
}
private static String toLocaleList(SortedSet<String> set) {
private static final Locale.Builder LOCALE_BUILDER = new Locale.Builder();
private static boolean isBaseLocale(String localeID) {
localeID = localeID.replaceAll("-", "_");
// ignore script here
Locale locale = LOCALE_BUILDER
.clear()
.setLanguage(CLDRConverter.getLanguageCode(localeID))
.setRegion(CLDRConverter.getCountryCode(localeID))
.build();
return CLDRConverter.BASE_LOCALES.contains(locale);
}
private static String toLocaleList(SortedSet<String> set, boolean all) {
StringBuilder sb = new StringBuilder(set.size() * 6);
for (String id : set) {
if (!"root".equals(id)) {
if (!all && CLDRConverter.isBaseModule ^ isBaseLocale(id)) {
continue;
}
if (sb.length() > 0) {
sb.append(' ');
}

29
jdk/make/src/classes/build/tools/cldrconverter/SupplementDataParseHandler.java
View File

@ -51,12 +51,21 @@ class SupplementDataParseHandler extends AbstractLDMLHandler<Object> {
// When parsing the locale neutral file (supplementalData.xml),
// we need to rely on the country code because
// the weekData is listed using country code.
//
// weekData are generated per each country
private final Map<String, Object> firstDayMap;
private final Map<String, Object> minDaysMap;
// Parent locales. These information will only be
// generated towards the base meta info, with the format of
//
// parentLocale.<parent_locale_id>=<child_locale_id>(" "<child_locale_id>)+
private final Map<String, String> parentLocalesMap;
SupplementDataParseHandler() {
firstDayMap = new HashMap<>();
minDaysMap = new HashMap<>();
parentLocalesMap = new HashMap<>();
}
/**
@ -68,16 +77,23 @@ class SupplementDataParseHandler extends AbstractLDMLHandler<Object> {
* although this should not happen because supplementalData.xml includes
* default value for the world ("001") for firstDay and minDays.
*/
Map<String, Object> getData(String country) {
Map<String, Object> getData(String id) {
Map<String, Object> values = new HashMap<>();
String countryData = getWeekData(country, JAVA_FIRSTDAY, firstDayMap);
if ("root".equals(id)) {
parentLocalesMap.keySet().forEach(key -> {
values.put(CLDRConverter.PARENT_LOCALE_PREFIX+key,
parentLocalesMap.get(key));
});
} else {
String countryData = getWeekData(id, JAVA_FIRSTDAY, firstDayMap);
if (countryData != null) {
values.put(JAVA_FIRSTDAY, countryData);
}
String minDaysData = getWeekData(country, JAVA_MINDAY, minDaysMap);
String minDaysData = getWeekData(id, JAVA_MINDAY, minDaysMap);
if (minDaysData != null) {
values.put(JAVA_MINDAY, minDaysData);
}
}
return values.isEmpty() ? null : values;
}
@ -144,6 +160,13 @@ class SupplementDataParseHandler extends AbstractLDMLHandler<Object> {
minDaysMap.put(attributes.getValue("territories"), attributes.getValue("count"));
}
break;
case "parentLocale":
if (!isIgnored(attributes)) {
parentLocalesMap.put(
attributes.getValue("parent").replaceAll("_", "-"),
attributes.getValue("locales").replaceAll("_", "-"));
}
break;
default:
// treat anything else as a container
pushContainer(qName, attributes);

33
jdk/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java
View File

@ -112,29 +112,36 @@ import java.util.Locale;
* provider returns null instead of a name, the lookup will proceed as
* described above as if the locale was not supported.
* <p>
* Starting from JDK8, the search order of locale sensitive services can
* The search order of locale sensitive services can
* be configured by using the "java.locale.providers" system property.
* This system property declares the user's preferred order for looking up
* the locale sensitive services separated by a comma. It is only read at
* the Java runtime startup, so the later call to System.setProperty() won't
* affect the order.
* <p>
* Java Runtime Environment provides the following four locale providers:
* <ul>
* <li> "CLDR": A provider based on Unicode Consortium's
* <a href="http://cldr.unicode.org/">CLDR Project</a>.
* <li> "JRE": represents the locale sensitive services that is compatible
* with the prior JDK releases (same with JDK8's "JRE").
* <li> "SPI": represents the locale sensitive services implementing the subclasses of
* this {@code LocaleServiceProvider} class.
* <li> "HOST": A provider that reflects the user's custom settings in the
* underlying operating system. This provider may not be available, depending
* on the Java Runtime Environment implementation.
* </ul>
* <p>
* For example, if the following is specified in the property:
* <pre>
* java.locale.providers=SPI,JRE
* java.locale.providers=SPI,CLDR,JRE
* </pre>
* where "SPI" represents the locale sensitive services implemented in the
* installed SPI providers, and "JRE" represents the locale sensitive services
* in the Java Runtime Environment, the locale sensitive services in the SPI
* providers are looked up first.
* the locale sensitive services in the SPI providers are looked up first. If the
* desired locale sensitive service is not available, then the runtime looks for CLDR,
* JRE in that order.
* <p>
* There are two other possible locale sensitive service providers, i.e., "CLDR"
* which is a provider based on Unicode Consortium's
* <a href="http://cldr.unicode.org/">CLDR Project</a>, and "HOST" which is a
* provider that reflects the user's custom settings in the underlying operating
* system. These two providers may not be available, depending on the Java Runtime
* Environment implementation. Specifying "JRE,SPI" is identical to the default
* behavior, which is compatibile with the prior releases.
* The default order for looking up the preferred locale providers is "CLDR,JRE,SPI",
* so specifying "CLDR,JRE,SPI" is identical to the default behavior.
*
* @since 1.6
*/

3
jdk/src/java.base/share/classes/sun/text/resources/FormatData.java
View File

@ -858,9 +858,6 @@ public class FormatData extends ParallelListResourceBundle {
}
},
{ "DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ" },
// Workaround for islamic-umalqura name support (JDK-8015986)
{ "calendarname.islamic-umalqura", "Islamic Umm al-Qura Calendar" },
};
}
}

319
jdk/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -26,37 +26,41 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
* the Terms of Use in http://www.unicode.org/copyright.html.
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of the Unicode data files and any associated documentation (the "Data
* Files") or Unicode software and any associated documentation (the
* "Software") to deal in the Data Files or Software without restriction,
* including without limitation the rights to use, copy, modify, merge,
* publish, distribute, and/or sell copies of the Data Files or Software, and
* to permit persons to whom the Data Files or Software are furnished to do so,
* provided that (a) the above copyright notice(s) and this permission notice
* appear with all copies of the Data Files or Software, (b) both the above
* copyright notice(s) and this permission notice appear in associated
* documentation, and (c) there is clear notice in each modified Data File or
* in the Software as well as in the documentation associated with the Data
* File(s) or Software that the data or software has been modified.
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of the Unicode data files and any associated documentation
* (the "Data Files") or Unicode software and any associated documentation
* (the "Software") to deal in the Data Files or Software
* without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, and/or sell copies of
* the Data Files or Software, and to permit persons to whom the Data Files
* or Software are furnished to do so, provided that
* (a) this copyright and permission notice appear with all copies
* of the Data Files or Software,
* (b) this copyright and permission notice appear in associated
* documentation, and
* (c) there is clear notice in each modified Data File or in the Software
* as well as in the documentation associated with the Data File(s) or
* Software that the data or software has been modified.
*
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
* KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR
* CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
* ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT OF THIRD PARTY RIGHTS.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
* NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
* DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THE DATA FILES OR SOFTWARE.
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THE DATA FILES OR SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder shall not
* be used in advertising or otherwise to promote the sale, use or other
* dealings in these Data Files or Software without prior written authorization
* of the copyright holder.
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in these Data Files or Software without prior
* written authorization of the copyright holder.
*/
// Note: this file has been generated by a tool.
@ -68,6 +72,21 @@ import sun.util.resources.OpenListResourceBundle;
public class JavaTimeSupplementary extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
final String[] rocMonthNarrows = {
"1",
"2",
"3",
"4",
"5",
"6",
"7",
"8",
"9",
"10",
"11",
"12",
"",
};
return new Object[][] {
{ "QuarterAbbreviations",
new String[] {
@ -93,22 +112,6 @@ public class JavaTimeSupplementary extends OpenListResourceBundle {
"4",
}
},
{ "calendarname.buddhist",
"Buddhist Calendar" },
{ "calendarname.gregorian",
"Gregorian Calendar" },
{ "calendarname.gregory",
"Gregorian Calendar" },
{ "calendarname.islamic",
"Islamic Calendar" },
{ "calendarname.islamic-civil",
"Islamic-Civil Calendar" },
{ "calendarname.islamicc",
"Islamic-Civil Calendar" },
{ "calendarname.japanese",
"Japanese Calendar" },
{ "calendarname.roc",
"Minguo Calendar" },
{ "field.dayperiod",
"Dayperiod" },
{ "field.era",
@ -129,12 +132,51 @@ public class JavaTimeSupplementary extends OpenListResourceBundle {
"Year" },
{ "field.zone",
"Zone" },
{ "islamic.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "islamic.DatePatterns",
new String[] {
"EEEE, MMMM d, y GGGG",
"MMMM d, y GGGG",
"MMM d, y GGGG",
"M/d/yy GGGG",
"GGGG y MMMM d, EEEE",
"GGGG y MMMM d",
"GGGG y MMM d",
"G y-MM-dd",
}
},
{ "islamic.DayAbbreviations",
new String[] {
"Sun",
"Mon",
"Tue",
"Wed",
"Thu",
"Fri",
"Sat",
}
},
{ "islamic.DayNames",
new String[] {
"Sun",
"Mon",
"Tue",
"Wed",
"Thu",
"Fri",
"Sat",
}
},
{ "islamic.DayNarrows",
new String[] {
"S",
"M",
"T",
"W",
"T",
"F",
"S",
}
},
{ "islamic.Eras",
@ -178,20 +220,47 @@ public class JavaTimeSupplementary extends OpenListResourceBundle {
}
},
{ "islamic.MonthNarrows",
rocMonthNarrows },
{ "islamic.QuarterNames",
new String[] {
"Q1",
"Q2",
"Q3",
"Q4",
}
},
{ "islamic.QuarterNarrows",
new String[] {
"1",
"2",
"3",
"4",
"5",
"6",
"7",
"8",
"9",
"10",
"11",
"12",
}
},
{ "islamic.TimePatterns",
new String[] {
"HH:mm:ss zzzz",
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
}
},
{ "islamic.long.Eras",
new String[] {
"",
"AH",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"a",
"p",
}
},
{ "islamic.narrow.Eras",
new String[] {
"",
"AH",
}
},
{ "islamic.short.Eras",
@ -202,10 +271,16 @@ public class JavaTimeSupplementary extends OpenListResourceBundle {
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"EEEE, G y MMMM dd",
"G y MMMM d, EEEE",
"G y MMMM d",
"G y MMM d",
"GGGGG yyyy-MM-dd",
"GGGGG y-MM-dd",
}
},
{ "java.time.buddhist.long.Eras",
new String[] {
"BC",
"BE",
}
},
{ "java.time.buddhist.short.Eras",
@ -216,10 +291,10 @@ public class JavaTimeSupplementary extends OpenListResourceBundle {
},
{ "java.time.islamic.DatePatterns",
new String[] {
"EEEE, MMMM d, y G",
"MMMM d, y G",
"MMM d, y G",
"M/d/yy G",
"G y MMMM d, EEEE",
"G y MMMM d",
"G y MMM d",
"GGGGG y-MM-dd",
}
},
{ "java.time.japanese.DatePatterns",
@ -248,12 +323,18 @@ public class JavaTimeSupplementary extends OpenListResourceBundle {
"Heisei",
}
},
{ "java.time.long.Eras",
new String[] {
"BCE",
"CE",
}
},
{ "java.time.roc.DatePatterns",
new String[] {
"EEEE, G y MMMM dd",
"G y MMMM d, EEEE",
"G y MMMM d",
"G y MMM d",
"GGGGG yyy-MM-dd",
"GGGGG y-MM-dd",
}
},
{ "java.time.short.Eras",
@ -262,12 +343,40 @@ public class JavaTimeSupplementary extends OpenListResourceBundle {
"AD",
}
},
{ "roc.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "roc.DatePatterns",
new String[] {
"EEEE, GGGG y MMMM dd",
"GGGG y MMMM d, EEEE",
"GGGG y MMMM d",
"GGGG y MMM d",
"G yyy-MM-dd",
"G y-MM-dd",
}
},
{ "roc.DayNames",
new String[] {
"Sun",
"Mon",
"Tue",
"Wed",
"Thu",
"Fri",
"Sat",
}
},
{ "roc.DayNarrows",
new String[] {
"S",
"M",
"T",
"W",
"T",
"F",
"S",
}
},
{ "roc.Eras",
@ -276,6 +385,84 @@ public class JavaTimeSupplementary extends OpenListResourceBundle {
"R.O.C.",
}
},
{ "roc.MonthAbbreviations",
new String[] {
"M01",
"M02",
"M03",
"M04",
"M05",
"M06",
"M07",
"M08",
"M09",
"M10",
"M11",
"M12",
"",
}
},
{ "roc.MonthNames",
new String[] {
"M01",
"M02",
"M03",
"M04",
"M05",
"M06",
"M07",
"M08",
"M09",
"M10",
"M11",
"M12",
"",
}
},
{ "roc.MonthNarrows",
rocMonthNarrows },
{ "roc.QuarterNames",
new String[] {
"Q1",
"Q2",
"Q3",
"Q4",
}
},
{ "roc.QuarterNarrows",
new String[] {
"1",
"2",
"3",
"4",
}
},
{ "roc.TimePatterns",
new String[] {
"HH:mm:ss zzzz",
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
}
},
{ "roc.long.Eras",
new String[] {
"Before R.O.C.",
"R.O.C.",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"a",
"p",
}
},
{ "roc.narrow.Eras",
new String[] {
"Before R.O.C.",
"R.O.C.",
}
},
{ "roc.short.Eras",
new String[] {
"Before R.O.C.",

270
jdk/src/java.base/share/classes/sun/text/resources/en/JavaTimeSupplementary_en.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -26,37 +26,41 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
* the Terms of Use in http://www.unicode.org/copyright.html.
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of the Unicode data files and any associated documentation (the "Data
* Files") or Unicode software and any associated documentation (the
* "Software") to deal in the Data Files or Software without restriction,
* including without limitation the rights to use, copy, modify, merge,
* publish, distribute, and/or sell copies of the Data Files or Software, and
* to permit persons to whom the Data Files or Software are furnished to do so,
* provided that (a) the above copyright notice(s) and this permission notice
* appear with all copies of the Data Files or Software, (b) both the above
* copyright notice(s) and this permission notice appear in associated
* documentation, and (c) there is clear notice in each modified Data File or
* in the Software as well as in the documentation associated with the Data
* File(s) or Software that the data or software has been modified.
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of the Unicode data files and any associated documentation
* (the "Data Files") or Unicode software and any associated documentation
* (the "Software") to deal in the Data Files or Software
* without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, and/or sell copies of
* the Data Files or Software, and to permit persons to whom the Data Files
* or Software are furnished to do so, provided that
* (a) this copyright and permission notice appear with all copies
* of the Data Files or Software,
* (b) this copyright and permission notice appear in associated
* documentation, and
* (c) there is clear notice in each modified Data File or in the Software
* as well as in the documentation associated with the Data File(s) or
* Software that the data or software has been modified.
*
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
* KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR
* CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
* ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT OF THIRD PARTY RIGHTS.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
* NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
* DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THE DATA FILES OR SOFTWARE.
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THE DATA FILES OR SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder shall not
* be used in advertising or otherwise to promote the sale, use or other
* dealings in these Data Files or Software without prior written authorization
* of the copyright holder.
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in these Data Files or Software without prior
* written authorization of the copyright holder.
*/
// Note: this file has been generated by a tool.
@ -69,14 +73,6 @@ public class JavaTimeSupplementary_en extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
return new Object[][] {
{ "QuarterAbbreviations",
new String[] {
"Q1",
"Q2",
"Q3",
"Q4",
}
},
{ "QuarterNames",
new String[] {
"1st quarter",
@ -94,31 +90,15 @@ public class JavaTimeSupplementary_en extends OpenListResourceBundle {
{ "calendarname.islamic",
"Islamic Calendar" },
{ "calendarname.islamic-civil",
"Islamic-Civil Calendar" },
{ "calendarname.islamicc",
"Islamic-Civil Calendar" },
"Islamic Calendar (tabular, civil epoch)" },
{ "calendarname.islamic-umalqura",
"Islamic Calendar (Umm al-Qura)" },
{ "calendarname.japanese",
"Japanese Calendar" },
{ "calendarname.roc",
"Minguo Calendar" },
{ "field.dayperiod",
"AM/PM" },
{ "field.era",
"Era" },
{ "field.hour",
"Hour" },
{ "field.minute",
"Minute" },
{ "field.month",
"Month" },
{ "field.second",
"Second" },
{ "field.week",
"Week" },
{ "field.weekday",
"Day of the Week" },
{ "field.year",
"Year" },
{ "field.zone",
"Time Zone" },
{ "islamic.DatePatterns",
@ -126,7 +106,42 @@ public class JavaTimeSupplementary_en extends OpenListResourceBundle {
"EEEE, MMMM d, y GGGG",
"MMMM d, y GGGG",
"MMM d, y GGGG",
"M/d/yy GGGG",
"M/d/y G",
}
},
{ "islamic.DayNames",
new String[] {
"Sunday",
"Monday",
"Tuesday",
"Wednesday",
"Thursday",
"Friday",
"Saturday",
}
},
{ "islamic.QuarterAbbreviations",
new String[] {
"Q1",
"Q2",
"Q3",
"Q4",
}
},
{ "islamic.QuarterNames",
new String[] {
"1st quarter",
"2nd quarter",
"3rd quarter",
"4th quarter",
}
},
{ "islamic.TimePatterns",
new String[] {
"h:mm:ss a zzzz",
"h:mm:ss a z",
"h:mm:ss a",
"h:mm a",
}
},
{ "java.time.buddhist.DatePatterns",
@ -134,7 +149,13 @@ public class JavaTimeSupplementary_en extends OpenListResourceBundle {
"EEEE, MMMM d, y G",
"MMMM d, y G",
"MMM d, y G",
"M/d/yy GGGGG",
"M/d/y GGGGG",
}
},
{ "java.time.buddhist.short.Eras",
new String[] {
"BC",
"BE",
}
},
{ "java.time.islamic.DatePatterns",
@ -142,7 +163,7 @@ public class JavaTimeSupplementary_en extends OpenListResourceBundle {
"EEEE, MMMM d, y G",
"MMMM d, y G",
"MMM d, y G",
"M/d/yy G",
"M/d/y GGGGG",
}
},
{ "java.time.japanese.DatePatterns",
@ -150,7 +171,7 @@ public class JavaTimeSupplementary_en extends OpenListResourceBundle {
"EEEE, MMMM d, y G",
"MMMM d, y G",
"MMM d, y G",
"M/d/yy GGGGG",
"M/d/y GGGGG",
}
},
{ "java.time.long.Eras",
@ -164,13 +185,7 @@ public class JavaTimeSupplementary_en extends OpenListResourceBundle {
"EEEE, MMMM d, y G",
"MMMM d, y G",
"MMM d, y G",
"M/d/yy GGGGG",
}
},
{ "java.time.short.Eras",
new String[] {
"BC",
"AD",
"M/d/y GGGGG",
}
},
{ "roc.DatePatterns",
@ -178,7 +193,128 @@ public class JavaTimeSupplementary_en extends OpenListResourceBundle {
"EEEE, MMMM d, y GGGG",
"MMMM d, y GGGG",
"MMM d, y GGGG",
"M/d/yy G",
"M/d/y G",
}
},
{ "roc.DayAbbreviations",
new String[] {
"Sun",
"Mon",
"Tue",
"Wed",
"Thu",
"Fri",
"Sat",
}
},
{ "roc.DayNames",
new String[] {
"Sunday",
"Monday",
"Tuesday",
"Wednesday",
"Thursday",
"Friday",
"Saturday",
}
},
{ "roc.Eras",
new String[] {
"Before R.O.C.",
"Minguo",
}
},
{ "roc.MonthAbbreviations",
new String[] {
"Jan",
"Feb",
"Mar",
"Apr",
"May",
"Jun",
"Jul",
"Aug",
"Sep",
"Oct",
"Nov",
"Dec",
"",
}
},
{ "roc.MonthNames",
new String[] {
"January",
"February",
"March",
"April",
"May",
"June",
"July",
"August",
"September",
"October",
"November",
"December",
"",
}
},
{ "roc.MonthNarrows",
new String[] {
"J",
"F",
"M",
"A",
"M",
"J",
"J",
"A",
"S",
"O",
"N",
"D",
"",
}
},
{ "roc.QuarterAbbreviations",
new String[] {
"Q1",
"Q2",
"Q3",
"Q4",
}
},
{ "roc.QuarterNames",
new String[] {
"1st quarter",
"2nd quarter",
"3rd quarter",
"4th quarter",
}
},
{ "roc.TimePatterns",
new String[] {
"h:mm:ss a zzzz",
"h:mm:ss a z",
"h:mm:ss a",
"h:mm a",
}
},
{ "roc.long.Eras",
new String[] {
"Before R.O.C.",
"Minguo",
}
},
{ "roc.narrow.Eras",
new String[] {
"Before R.O.C.",
"Minguo",
}
},
{ "roc.short.Eras",
new String[] {
"Before R.O.C.",
"Minguo",
}
},
};

106
jdk/src/java.base/share/classes/sun/text/resources/en/JavaTimeSupplementary_en_SG.java
View File

@ -1,106 +0,0 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
* the Terms of Use in http://www.unicode.org/copyright.html.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of the Unicode data files and any associated documentation (the "Data
* Files") or Unicode software and any associated documentation (the
* "Software") to deal in the Data Files or Software without restriction,
* including without limitation the rights to use, copy, modify, merge,
* publish, distribute, and/or sell copies of the Data Files or Software, and
* to permit persons to whom the Data Files or Software are furnished to do so,
* provided that (a) the above copyright notice(s) and this permission notice
* appear with all copies of the Data Files or Software, (b) both the above
* copyright notice(s) and this permission notice appear in associated
* documentation, and (c) there is clear notice in each modified Data File or
* in the Software as well as in the documentation associated with the Data
* File(s) or Software that the data or software has been modified.
*
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
* KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR
* CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THE DATA FILES OR SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder shall not
* be used in advertising or otherwise to promote the sale, use or other
* dealings in these Data Files or Software without prior written authorization
* of the copyright holder.
*/
// Note: this file has been generated by a tool.
package sun.text.resources.en;
import sun.util.resources.OpenListResourceBundle;
public class JavaTimeSupplementary_en_SG extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
return new Object[][] {
{ "java.time.buddhist.DatePatterns",
new String[] {
"EEEE, d MMMM, y G",
"d MMMM, y G",
"d MMM, y G",
"d/M/yy GGGGG",
}
},
{ "java.time.japanese.DatePatterns",
new String[] {
"EEEE, d MMMM, y G",
"d MMMM, y G",
"d MMM, y G",
"d/M/yy GGGGG",
}
},
{ "java.time.roc.DatePatterns",
new String[] {
"EEEE, d MMMM, y G",
"d MMMM, y G",
"d MMM, y G",
"d/M/yy GGGGG",
}
},
{ "roc.DatePatterns",
new String[] {
"EEEE, d MMMM, y GGGG",
"d MMMM, y GGGG",
"d MMM, y GGGG",
"d/M/yy G",
}
},
};
}
}

2
jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_US.java → jdk/src/java.base/share/classes/sun/text/resources/en/US/FormatData_en_US.java
View File

@ -38,7 +38,7 @@
*
*/
package sun.text.resources.en;
package sun.text.resources.en.US;
import sun.util.resources.ParallelListResourceBundle;

71
jdk/src/java.base/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -30,9 +30,14 @@ import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.text.spi.BreakIteratorProvider;
import java.text.spi.CollatorProvider;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.ServiceLoader;
import java.util.Set;
import java.util.StringTokenizer;
@ -48,11 +53,16 @@ import sun.util.locale.provider.LocaleDataMetaInfo;
*/
public class CLDRLocaleProviderAdapter extends JRELocaleProviderAdapter {
private final LocaleDataMetaInfo metaInfo;
private static final CLDRBaseLocaleDataMetaInfo baseMetaInfo = new CLDRBaseLocaleDataMetaInfo();
// Assumption: CLDR has only one non-Base module.
private final LocaleDataMetaInfo nonBaseMetaInfo;
// parent locales map
private static volatile Map<Locale, Locale> parentLocalesMap = null;
public CLDRLocaleProviderAdapter() {
try {
metaInfo = AccessController.doPrivileged(new PrivilegedExceptionAction<LocaleDataMetaInfo>() {
nonBaseMetaInfo = AccessController.doPrivileged(new PrivilegedExceptionAction<LocaleDataMetaInfo>() {
@Override
public LocaleDataMetaInfo run() {
for (LocaleDataMetaInfo ldmi : ServiceLoader.loadInstalled(LocaleDataMetaInfo.class)) {
@ -70,7 +80,7 @@ public class CLDRLocaleProviderAdapter extends JRELocaleProviderAdapter {
throw new UnsupportedOperationException(e);
}
if (metaInfo == null) {
if (nonBaseMetaInfo == null) {
throw new UnsupportedOperationException("CLDR locale data could not be found.");
}
}
@ -107,7 +117,16 @@ public class CLDRLocaleProviderAdapter extends JRELocaleProviderAdapter {
@Override
protected Set<String> createLanguageTagSet(String category) {
String supportedLocaleString = metaInfo.availableLanguageTags(category);
// Directly call Base tags, as we know it's in the base module.
String supportedLocaleString = baseMetaInfo.availableLanguageTags(category);
String nonBaseTags = nonBaseMetaInfo.availableLanguageTags(category);
if (nonBaseTags != null) {
if (supportedLocaleString != null) {
supportedLocaleString += " " + nonBaseTags;
} else {
supportedLocaleString = nonBaseTags;
}
}
if (supportedLocaleString == null) {
return Collections.emptySet();
}
@ -118,4 +137,46 @@ public class CLDRLocaleProviderAdapter extends JRELocaleProviderAdapter {
}
return tagset;
}
// Implementation of ResourceBundleBasedAdapter
@Override
public List<Locale> getCandidateLocales(String baseName, Locale locale) {
List<Locale> candidates = super.getCandidateLocales(baseName, locale);
return applyParentLocales(baseName, candidates);
}
private List<Locale> applyParentLocales(String baseName, List<Locale> candidates) {
if (Objects.isNull(parentLocalesMap)) {
Map<Locale, Locale> map = new HashMap<>();
Map<String, String> parentLocales = baseMetaInfo.parentLocales();
parentLocales.keySet().forEach(parent -> {
Arrays.asList(parentLocales.get(parent).split(" ")).stream().forEach(child -> {
map.put(Locale.forLanguageTag(child),
"root".equals(parent) ? Locale.ROOT : Locale.forLanguageTag(parent));
});
});
parentLocalesMap = Collections.unmodifiableMap(map);
}
// check irregular parents
for (int i = 0; i < candidates.size(); i++) {
Locale l = candidates.get(i);
Locale p = parentLocalesMap.get(l);
if (!l.equals(Locale.ROOT) &&
Objects.nonNull(p) &&
!candidates.get(i+1).equals(p)) {
List<Locale> applied = candidates.subList(0, i+1);
applied.addAll(applyParentLocales(baseName, super.getCandidateLocales(baseName, p)));
return applied;
}
}
return candidates;
}
@Override
public boolean isSupportedProviderLocale(Locale locale, Set<String> langtags) {
return Locale.ROOT.equals(locale) ||
langtags.contains(locale.stripExtensions().toLanguageTag());
}
}

2
jdk/src/java.base/share/classes/sun/util/locale/provider/BreakIteratorProviderImpl.java
View File

@ -186,6 +186,6 @@ public class BreakIteratorProviderImpl extends BreakIteratorProvider
@Override
public boolean isSupportedLocale(Locale locale) {
return LocaleProviderAdapter.isSupportedLocale(locale, type, langtags);
return LocaleProviderAdapter.forType(type).isSupportedProviderLocale(locale, langtags);
}
}

20
jdk/src/java.base/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java
View File

@ -63,6 +63,14 @@ public class CalendarNameProviderImpl extends CalendarNameProvider implements Av
if (key != null) {
LocaleResources lr = LocaleProviderAdapter.forType(type).getLocaleResources(locale);
String[] strings = javatime ? lr.getJavaTimeNames(key) : lr.getCalendarNames(key);
// If standalone names are requested and no "standalone." resources are found,
// try the default ones instead.
if (strings == null && key.indexOf("standalone.") != -1) {
key = key.replaceFirst("standalone.", "");
strings = javatime ? lr.getJavaTimeNames(key) : lr.getCalendarNames(key);
}
if (strings != null && strings.length > 0) {
if (field == DAY_OF_WEEK || field == YEAR) {
--value;
@ -118,6 +126,14 @@ public class CalendarNameProviderImpl extends CalendarNameProvider implements Av
if (key != null) {
LocaleResources lr = LocaleProviderAdapter.forType(type).getLocaleResources(locale);
String[] strings = javatime ? lr.getJavaTimeNames(key) : lr.getCalendarNames(key);
// If standalone names are requested and no "standalone." resources are found,
// try the default ones instead.
if (strings == null && key.indexOf("standalone.") != -1) {
key = key.replaceFirst("standalone.", "");
strings = javatime ? lr.getJavaTimeNames(key) : lr.getCalendarNames(key);
}
if (strings != null) {
if (!hasDuplicates(strings)) {
if (field == YEAR) {
@ -281,8 +297,8 @@ public class CalendarNameProviderImpl extends CalendarNameProvider implements Av
break;
case DAY_OF_WEEK:
// support standalone narrow day names
if (isStandalone && isNarrow) {
// support standalone day names
if (isStandalone) {
key.append("standalone.");
}
key.append("Day").append(toStyleName(baseStyle));

2
jdk/src/java.base/share/classes/sun/util/locale/provider/CollatorProviderImpl.java
View File

@ -75,7 +75,7 @@ public class CollatorProviderImpl extends CollatorProvider implements AvailableL
@Override
public boolean isSupportedLocale(Locale locale) {
return LocaleProviderAdapter.isSupportedLocale(locale, type, langtags);
return LocaleProviderAdapter.forType(type).isSupportedProviderLocale(locale, langtags);
}
/**

2
jdk/src/java.base/share/classes/sun/util/locale/provider/DateFormatProviderImpl.java
View File

@ -63,7 +63,7 @@ public class DateFormatProviderImpl extends DateFormatProvider implements Availa
@Override
public boolean isSupportedLocale(Locale locale) {
return LocaleProviderAdapter.isSupportedLocale(locale, type, langtags);
return LocaleProviderAdapter.forType(type).isSupportedProviderLocale(locale, langtags);
}
/**

2
jdk/src/java.base/share/classes/sun/util/locale/provider/DateFormatSymbolsProviderImpl.java
View File

@ -60,7 +60,7 @@ public class DateFormatSymbolsProviderImpl extends DateFormatSymbolsProvider imp
@Override
public boolean isSupportedLocale(Locale locale) {
return LocaleProviderAdapter.isSupportedLocale(locale, type, langtags);
return LocaleProviderAdapter.forType(type).isSupportedProviderLocale(locale, langtags);
}
/**

2
jdk/src/java.base/share/classes/sun/util/locale/provider/DecimalFormatSymbolsProviderImpl.java
View File

@ -60,7 +60,7 @@ public class DecimalFormatSymbolsProviderImpl extends DecimalFormatSymbolsProvid
@Override
public boolean isSupportedLocale(Locale locale) {
return LocaleProviderAdapter.isSupportedLocale(locale, type, langtags);
return LocaleProviderAdapter.forType(type).isSupportedProviderLocale(locale, langtags);
}
/**

5
jdk/src/java.base/share/classes/sun/util/locale/provider/FallbackLocaleProviderAdapter.java
View File

@ -66,4 +66,9 @@ public class FallbackLocaleProviderAdapter extends JRELocaleProviderAdapter {
protected Set<String> createLanguageTagSet(String category) {
return rootTagSet;
}
@Override
public boolean isSupportedProviderLocale(Locale locale, Set<String>langtags) {
return Locale.ROOT.equals(locale);
}
}

37
jdk/src/java.base/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java
View File

@ -36,7 +36,9 @@ import java.text.spi.DecimalFormatSymbolsProvider;
import java.text.spi.NumberFormatProvider;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
import java.util.ServiceLoader;
import java.util.Set;
import java.util.StringTokenizer;
@ -379,6 +381,13 @@ public class JRELocaleProviderAdapter extends LocaleProviderAdapter implements R
return localeData;
}
@Override
public List<Locale> getCandidateLocales(String baseName, Locale locale) {
return ResourceBundle.Control
.getNoFallbackControl(ResourceBundle.Control.FORMAT_DEFAULT)
.getCandidateLocales(baseName, locale);
}
/**
* Returns a list of the installed locales. Currently, this simply returns
* the list of locales for which a sun.text.resources.FormatData bundle
@ -417,12 +426,12 @@ public class JRELocaleProviderAdapter extends LocaleProviderAdapter implements R
}
private static String createSupportedLocaleString(String category) {
// Directly call English tags, as we know it's in the base module.
String supportedLocaleString = EnLocaleDataMetaInfo.getSupportedLocaleString(category);
// Directly call Base tags, as we know it's in the base module.
String supportedLocaleString = BaseLocaleDataMetaInfo.getSupportedLocaleString(category);
// Use ServiceLoader to dynamically acquire installed locales' tags.
try {
String nonENTags = AccessController.doPrivileged(new PrivilegedExceptionAction<String>() {
String nonBaseTags = AccessController.doPrivileged(new PrivilegedExceptionAction<String>() {
@Override
public String run() {
String tags = null;
@ -443,8 +452,8 @@ public class JRELocaleProviderAdapter extends LocaleProviderAdapter implements R
}
});
if (nonENTags != null) {
supportedLocaleString += " " + nonENTags;
if (nonBaseTags != null) {
supportedLocaleString += " " + nonBaseTags;
}
} catch (Exception e) {
// catch any exception, and ignore them as if non-EN locales do not exist.
@ -497,4 +506,22 @@ public class JRELocaleProviderAdapter extends LocaleProviderAdapter implements R
}
return locales;
}
@Override
public boolean isSupportedProviderLocale(Locale locale, Set<String> langtags) {
if (Locale.ROOT.equals(locale)) {
return true;
}
locale = locale.stripExtensions();
if (langtags.contains(locale.toLanguageTag())) {
return true;
}
String oldname = locale.toString().replace('_', '-');
return langtags.contains(oldname) ||
"ja-JP-JP".equals(oldname) ||
"th-TH-TH".equals(oldname) ||
"no-NO-NY".equals(oldname);
}
}

2
jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleNameProviderImpl.java
View File

@ -60,7 +60,7 @@ public class LocaleNameProviderImpl extends LocaleNameProvider implements Availa
@Override
public boolean isSupportedLocale(Locale locale) {
return LocaleProviderAdapter.isSupportedLocale(locale, type, langtags);
return LocaleProviderAdapter.forType(type).isSupportedProviderLocale(locale, langtags);
}
/**

40
jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java
View File

@ -88,8 +88,7 @@ public abstract class LocaleProviderAdapter {
}
/**
* LocaleProviderAdapter preference list. The default list is intended
* to behave the same manner in JDK7.
* LocaleProviderAdapter preference list.
*/
private static final List<Type> adapterPreference;
@ -177,7 +176,14 @@ public abstract class LocaleProviderAdapter {
defaultLocaleProviderAdapter = Type.JRE;
}
} else {
// Default preference list
// Default preference list.
try {
cldrLocaleProviderAdapter = new CLDRLocaleProviderAdapter();
typeList.add(Type.CLDR);
defaultLocaleProviderAdapter = Type.CLDR;
} catch (UnsupportedOperationException e) {
LocaleServiceProviderPool.config(LocaleProviderAdapter.class, e.toString());
}
typeList.add(Type.JRE);
typeList.add(Type.SPI);
defaultLocaleProviderAdapter = Type.JRE;
@ -213,7 +219,10 @@ public abstract class LocaleProviderAdapter {
public static LocaleProviderAdapter getResourceBundleBased() {
for (Type type : getAdapterPreference()) {
if (type == Type.JRE || type == Type.CLDR || type == Type.FALLBACK) {
return forType(type);
LocaleProviderAdapter adapter = forType(type);
if (adapter != null) {
return adapter;
}
}
}
// Shouldn't happen.
@ -295,28 +304,9 @@ public abstract class LocaleProviderAdapter {
* A utility method for implementing the default LocaleServiceProvider.isSupportedLocale
* for the JRE, CLDR, and FALLBACK adapters.
*/
public static boolean isSupportedLocale(Locale locale, LocaleProviderAdapter.Type type, Set<String> langtags) {
public boolean isSupportedProviderLocale(Locale locale, Set<String> langtags) {
LocaleProviderAdapter.Type type = getAdapterType();
assert type == Type.JRE || type == Type.CLDR || type == Type.FALLBACK;
if (Locale.ROOT.equals(locale)) {
return true;
}
if (type == Type.FALLBACK) {
// no other locales except ROOT are supported for FALLBACK
return false;
}
locale = locale.stripExtensions();
if (langtags.contains(locale.toLanguageTag())) {
return true;
}
if (type == Type.JRE) {
String oldname = locale.toString().replace('_', '-');
return langtags.contains(oldname) ||
"ja-JP-JP".equals(oldname) ||
"th-TH-TH".equals(oldname) ||
"no-NO-NY".equals(oldname);
}
return false;
}

12
jdk/src/java.base/share/classes/sun/util/locale/provider/LocaleResources.java
View File

@ -402,11 +402,12 @@ public class LocaleResources {
if (timeStyle >= 0) {
if (dateStyle >= 0) {
String dateTimePattern = null;
int dateTimeStyle = Math.max(dateStyle, timeStyle);
if (prefix != null) {
dateTimePattern = getDateTimePattern(prefix, "DateTimePatterns", 0, calType);
dateTimePattern = getDateTimePattern(prefix, "DateTimePatterns", dateTimeStyle, calType);
}
if (dateTimePattern == null) {
dateTimePattern = getDateTimePattern(null, "DateTimePatterns", 0, calType);
dateTimePattern = getDateTimePattern(null, "DateTimePatterns", dateTimeStyle, calType);
}
switch (dateTimePattern) {
case "{1} {0}":
@ -416,7 +417,7 @@ public class LocaleResources {
pattern = timePattern + " " + datePattern;
break;
default:
pattern = MessageFormat.format(dateTimePattern, timePattern, datePattern);
pattern = MessageFormat.format(dateTimePattern.replaceAll("'", "''"), timePattern, datePattern);
break;
}
} else {
@ -492,7 +493,10 @@ public class LocaleResources {
assert prefix != null;
return null;
}
return ((String[])value)[styleIndex];
// for DateTimePatterns. CLDR has multiple styles, while JRE has one.
String[] styles = (String[])value;
return (styles.length > 1 ? styles[styleIndex] : styles[0]);
}
private static class ResourceReference extends SoftReference<Object> {

2
jdk/src/java.base/share/classes/sun/util/locale/provider/NumberFormatProviderImpl.java
View File

@ -86,7 +86,7 @@ public class NumberFormatProviderImpl extends NumberFormatProvider implements Av
@Override
public boolean isSupportedLocale(Locale locale) {
return LocaleProviderAdapter.isSupportedLocale(locale, type, langtags);
return LocaleProviderAdapter.forType(type).isSupportedProviderLocale(locale, langtags);
}
/**

7
jdk/src/java.base/share/classes/sun/util/locale/provider/ResourceBundleBasedAdapter.java
View File

@ -25,6 +25,8 @@
package sun.util.locale.provider;
import java.util.List;
import java.util.Locale;
import sun.util.resources.LocaleData;
/**
@ -34,4 +36,9 @@ import sun.util.resources.LocaleData;
*/
public interface ResourceBundleBasedAdapter {
public LocaleData getLocaleData();
/**
* candidate locales customization
*/
public List<Locale> getCandidateLocales(String baseName, Locale locale);
}

29
jdk/src/java.base/share/classes/sun/util/locale/provider/TimeZoneNameProviderImpl.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -30,6 +30,7 @@ import java.util.Objects;
import java.util.Set;
import java.util.TimeZone;
import java.util.spi.TimeZoneNameProvider;
import sun.util.calendar.ZoneInfoFile;
/**
* Concrete implementation of the
@ -42,6 +43,7 @@ import java.util.spi.TimeZoneNameProvider;
public class TimeZoneNameProviderImpl extends TimeZoneNameProvider {
private final LocaleProviderAdapter.Type type;
private final Set<String> langtags;
private static final String CLDR_NO_INHERITANCE_MARKER = "\u2205\u2205\u2205";
TimeZoneNameProviderImpl(LocaleProviderAdapter.Type type, Set<String> langtags) {
this.type = type;
@ -62,7 +64,7 @@ public class TimeZoneNameProviderImpl extends TimeZoneNameProvider {
@Override
public boolean isSupportedLocale(Locale locale) {
return LocaleProviderAdapter.isSupportedLocale(locale, type, langtags);
return LocaleProviderAdapter.forType(type).isSupportedProviderLocale(locale, langtags);
}
/**
@ -121,7 +123,28 @@ public class TimeZoneNameProviderImpl extends TimeZoneNameProvider {
private String[] getDisplayNameArray(String id, Locale locale) {
Objects.requireNonNull(id);
Objects.requireNonNull(locale);
return LocaleProviderAdapter.forType(type).getLocaleResources(locale).getTimeZoneNames(id);
String[] ret =
LocaleProviderAdapter.forType(type).getLocaleResources(locale).getTimeZoneNames(id);
if (Objects.nonNull(ret) && type == LocaleProviderAdapter.Type.CLDR) {
// check for CLDR's "no inheritance marker"
for (int index = 0; index < ret.length; index++) {
TimeZone tz = null;
if (CLDR_NO_INHERITANCE_MARKER.equals(ret[index])) {
if (Objects.isNull(tz)) {
tz = TimeZone.getTimeZone(id);
}
int offset = tz.getRawOffset();
if (index == 3 || index == 4) { // daylight
offset += tz.getDSTSavings();
}
ret[index] = ZoneInfoFile.toCustomID(offset);
}
}
}
return ret;
}
/**

22
jdk/src/java.base/share/classes/sun/util/resources/LocaleData.java
View File

@ -51,6 +51,7 @@ import java.util.ResourceBundle;
import java.util.Set;
import sun.util.locale.provider.JRELocaleProviderAdapter;
import sun.util.locale.provider.LocaleProviderAdapter;
import sun.util.locale.provider.ResourceBundleBasedAdapter;
import static sun.util.locale.provider.LocaleProviderAdapter.Type.CLDR;
import static sun.util.locale.provider.LocaleProviderAdapter.Type.JRE;
@ -205,16 +206,19 @@ public class LocaleData {
*/
@Override
public List<Locale> getCandidateLocales(String baseName, Locale locale) {
List<Locale> candidates = super.getCandidateLocales(baseName, locale);
LocaleProviderAdapter.Type type = baseName.contains(DOTCLDR) ? CLDR : JRE;
LocaleProviderAdapter adapter = LocaleProviderAdapter.forType(type);
List<Locale> candidates = adapter instanceof ResourceBundleBasedAdapter ?
((ResourceBundleBasedAdapter)adapter).getCandidateLocales(baseName, locale) :
super.getCandidateLocales(baseName, locale);
// Weed out Locales which are known to have no resource bundles
int lastDot = baseName.lastIndexOf('.');
String category = (lastDot >= 0) ? baseName.substring(lastDot + 1) : baseName;
LocaleProviderAdapter.Type type = baseName.contains(DOTCLDR) ? CLDR : JRE;
LocaleProviderAdapter adapter = LocaleProviderAdapter.forType(type);
Set<String> langtags = ((JRELocaleProviderAdapter)adapter).getLanguageTagSet(category);
if (!langtags.isEmpty()) {
for (Iterator<Locale> itr = candidates.iterator(); itr.hasNext();) {
if (!LocaleProviderAdapter.isSupportedLocale(itr.next(), type, langtags)) {
if (!adapter.isSupportedProviderLocale(itr.next(), langtags)) {
itr.remove();
}
}
@ -247,17 +251,18 @@ public class LocaleData {
private static final String DOTCLDR = ".cldr";
/**
* Changes baseName to its per-language package name and
* Changes baseName to its per-language/country package name and
* calls the super class implementation. For example,
* if the baseName is "sun.text.resources.FormatData" and locale is ja_JP,
* the baseName is changed to "sun.text.resources.ja.FormatData". If
* the baseName is changed to "sun.text.resources.ja.JP.FormatData". If
* baseName contains "cldr", such as "sun.text.resources.cldr.FormatData",
* the name is changed to "sun.text.resources.cldr.jp.FormatData".
* the name is changed to "sun.text.resources.cldr.ja.JP.FormatData".
*/
@Override
public String toBundleName(String baseName, Locale locale) {
String newBaseName = baseName;
String lang = locale.getLanguage();
String ctry = locale.getCountry();
if (lang.length() > 0) {
if (baseName.startsWith(JRE.getUtilResourcesPackage())
|| baseName.startsWith(JRE.getTextResourcesPackage())) {
@ -268,7 +273,8 @@ public class LocaleData {
if (baseName.indexOf(DOTCLDR, index) > 0) {
index += DOTCLDR.length();
}
newBaseName = baseName.substring(0, index + 1) + lang
ctry = (ctry.length() == 2) ? ("." + ctry) : "";
newBaseName = baseName.substring(0, index + 1) + lang + ctry
+ baseName.substring(index);
}
}

0
jdk/src/java.base/share/classes/sun/util/resources/en/CurrencyNames_en_US.properties → jdk/src/java.base/share/classes/sun/util/resources/en/US/CurrencyNames_en_US.properties
View File

4
jdk/src/jdk.localedata/share/classes/META-INF/services/sun.util.locale.provider.LocaleDataMetaInfo
View File

@ -1,2 +1,2 @@
sun.util.resources.provider.NonEnLocaleDataMetaInfo
sun.util.resources.cldr.provider.CLDRLocaleDataMetaInfo
sun.util.resources.provider.NonBaseLocaleDataMetaInfo
sun.util.resources.cldr.provider.CLDRLocaleDataMetaInfo_jdk_localedata

4
jdk/src/jdk.localedata/share/classes/sun/text/resources/ar/FormatData_ar.java
View File

@ -264,10 +264,6 @@ public class FormatData_ar extends ParallelListResourceBundle {
}
},
{ "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" },
// Workaround for islamic-umalqura name support (JDK-8015986)
{ "calendarname.islamic-umalqura",
"\u0644\u062a\u0642\u0648\u064a\u0645 \u0627\u0644\u0647\u062c\u0631\u064a\u060c \u0623\u0645 \u0627\u0644\u0642\u0631\u0649" },
};
}
}

2
jdk/src/jdk.localedata/share/classes/sun/text/resources/ar/FormatData_ar_JO.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/ar/JO/FormatData_ar_JO.java
View File

@ -40,7 +40,7 @@
*
*/
package sun.text.resources.ar;
package sun.text.resources.ar.JO;
import sun.util.resources.ParallelListResourceBundle;

129
jdk/src/jdk.localedata/share/classes/sun/text/resources/ar/JO/JavaTimeSupplementary_ar_JO.java Normal file
View File

@ -0,0 +1,129 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of the Unicode data files and any associated documentation
* (the "Data Files") or Unicode software and any associated documentation
* (the "Software") to deal in the Data Files or Software
* without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, and/or sell copies of
* the Data Files or Software, and to permit persons to whom the Data Files
* or Software are furnished to do so, provided that
* (a) this copyright and permission notice appear with all copies
* of the Data Files or Software,
* (b) this copyright and permission notice appear in associated
* documentation, and
* (c) there is clear notice in each modified Data File or in the Software
* as well as in the documentation associated with the Data File(s) or
* Software that the data or software has been modified.
*
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
* ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT OF THIRD PARTY RIGHTS.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
* NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
* DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THE DATA FILES OR SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in these Data Files or Software without prior
* written authorization of the copyright holder.
*/
// Note: this file has been generated by a tool.
package sun.text.resources.ar.JO;
import sun.util.resources.OpenListResourceBundle;
public class JavaTimeSupplementary_ar_JO extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
return new Object[][] {
{ "roc.MonthAbbreviations",
new String[] {
"\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\u0627\u0646\u064a",
"\u0634\u0628\u0627\u0637",
"\u0622\u0630\u0627\u0631",
"\u0646\u064a\u0633\u0627\u0646",
"\u0623\u064a\u0627\u0631",
"\u062d\u0632\u064a\u0631\u0627\u0646",
"\u062a\u0645\u0648\u0632",
"\u0622\u0628",
"\u0623\u064a\u0644\u0648\u0644",
"\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u0623\u0648\u0644",
"\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u064a",
"\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644",
"",
}
},
{ "roc.MonthNames",
new String[] {
"\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\u0627\u0646\u064a",
"\u0634\u0628\u0627\u0637",
"\u0622\u0630\u0627\u0631",
"\u0646\u064a\u0633\u0627\u0646",
"\u0623\u064a\u0627\u0631",
"\u062d\u0632\u064a\u0631\u0627\u0646",
"\u062a\u0645\u0648\u0632",
"\u0622\u0628",
"\u0623\u064a\u0644\u0648\u0644",
"\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u0623\u0648\u0644",
"\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u064a",
"\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644",
"",
}
},
{ "roc.MonthNarrows",
new String[] {
"\u0643",
"\u0634",
"\u0622",
"\u0646",
"\u0623",
"\u062d",
"\u062a",
"\u0622",
"\u0623",
"\u062a",
"\u062a",
"\u0643",
"",
}
},
};
}
}

335
jdk/src/jdk.localedata/share/classes/sun/text/resources/ar/JavaTimeSupplementary_ar.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -26,37 +26,41 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
* the Terms of Use in http://www.unicode.org/copyright.html.
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of the Unicode data files and any associated documentation (the "Data
* Files") or Unicode software and any associated documentation (the
* "Software") to deal in the Data Files or Software without restriction,
* including without limitation the rights to use, copy, modify, merge,
* publish, distribute, and/or sell copies of the Data Files or Software, and
* to permit persons to whom the Data Files or Software are furnished to do so,
* provided that (a) the above copyright notice(s) and this permission notice
* appear with all copies of the Data Files or Software, (b) both the above
* copyright notice(s) and this permission notice appear in associated
* documentation, and (c) there is clear notice in each modified Data File or
* in the Software as well as in the documentation associated with the Data
* File(s) or Software that the data or software has been modified.
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of the Unicode data files and any associated documentation
* (the "Data Files") or Unicode software and any associated documentation
* (the "Software") to deal in the Data Files or Software
* without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, and/or sell copies of
* the Data Files or Software, and to permit persons to whom the Data Files
* or Software are furnished to do so, provided that
* (a) this copyright and permission notice appear with all copies
* of the Data Files or Software,
* (b) this copyright and permission notice appear in associated
* documentation, and
* (c) there is clear notice in each modified Data File or in the Software
* as well as in the documentation associated with the Data File(s) or
* Software that the data or software has been modified.
*
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
* KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR
* CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
* ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT OF THIRD PARTY RIGHTS.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
* NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
* DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THE DATA FILES OR SOFTWARE.
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THE DATA FILES OR SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder shall not
* be used in advertising or otherwise to promote the sale, use or other
* dealings in these Data Files or Software without prior written authorization
* of the copyright holder.
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in these Data Files or Software without prior
* written authorization of the copyright holder.
*/
// Note: this file has been generated by a tool.
@ -68,7 +72,19 @@ import sun.util.resources.OpenListResourceBundle;
public class JavaTimeSupplementary_ar extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
final String[] javatimebuddhistlongEras = {
"BC",
"\u0627\u0644\u062a\u0642\u0648\u064a\u0645 \u0627\u0644\u0628\u0648\u0630\u064a",
};
return new Object[][] {
{ "QuarterAbbreviations",
new String[] {
"\u0627\u0644\u0631\u0628\u0639 \u0627\u0644\u0623\u0648\u0644",
"\u0627\u0644\u0631\u0628\u0639 \u0627\u0644\u062b\u0627\u0646\u064a",
"\u0627\u0644\u0631\u0628\u0639 \u0627\u0644\u062b\u0627\u0644\u062b",
"\u0627\u0644\u0631\u0628\u0639 \u0627\u0644\u0631\u0627\u0628\u0639",
}
},
{ "QuarterNames",
new String[] {
"\u0627\u0644\u0631\u0628\u0639 \u0627\u0644\u0623\u0648\u0644",
@ -94,9 +110,9 @@ public class JavaTimeSupplementary_ar extends OpenListResourceBundle {
{ "calendarname.islamic",
"\u0627\u0644\u062a\u0642\u0648\u064a\u0645 \u0627\u0644\u0647\u062c\u0631\u064a" },
{ "calendarname.islamic-civil",
"\u062a\u0642\u0648\u064a\u0645 \u0627\u0633\u0644\u0627\u0645\u064a \u0645\u062f\u0646\u064a" },
{ "calendarname.islamicc",
"\u062a\u0642\u0648\u064a\u0645 \u0627\u0633\u0644\u0627\u0645\u064a \u0645\u062f\u0646\u064a" },
"\u0627\u0644\u062a\u0642\u0648\u064a\u0645 \u0627\u0644\u0625\u0633\u0644\u0627\u0645\u064a \u0627\u0644\u0645\u062f\u0646\u064a" },
{ "calendarname.islamic-umalqura",
"\u0627\u0644\u062a\u0642\u0648\u064a\u0645 \u0627\u0644\u0625\u0633\u0644\u0627\u0645\u064a (\u0623\u0645 \u0627\u0644\u0642\u0631\u0649)" },
{ "calendarname.japanese",
"\u0627\u0644\u062a\u0642\u0648\u064a\u0645 \u0627\u0644\u064a\u0627\u0628\u0627\u0646\u064a" },
{ "calendarname.roc",
@ -121,12 +137,51 @@ public class JavaTimeSupplementary_ar extends OpenListResourceBundle {
"\u0627\u0644\u0633\u0646\u0629" },
{ "field.zone",
"\u0627\u0644\u062a\u0648\u0642\u064a\u062a" },
{ "islamic.AmPmMarkers",
new String[] {
"\u0635",
"\u0645",
}
},
{ "islamic.DatePatterns",
new String[] {
"EEEE\u060c d MMMM y",
"d MMMM y",
"EEEE\u060c d MMMM\u060c y GGGG",
"d MMMM\u060c y GGGG",
"d MMM\u060c y GGGG",
"d\u200f/M\u200f/yyyy",
"d\u200f/M\u200f/y G",
}
},
{ "islamic.DayAbbreviations",
new String[] {
"\u0627\u0644\u0623\u062d\u062f",
"\u0627\u0644\u0627\u062b\u0646\u064a\u0646",
"\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621",
"\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621",
"\u0627\u0644\u062e\u0645\u064a\u0633",
"\u0627\u0644\u062c\u0645\u0639\u0629",
"\u0627\u0644\u0633\u0628\u062a",
}
},
{ "islamic.DayNames",
new String[] {
"\u0627\u0644\u0623\u062d\u062f",
"\u0627\u0644\u0627\u062b\u0646\u064a\u0646",
"\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621",
"\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621",
"\u0627\u0644\u062e\u0645\u064a\u0633",
"\u0627\u0644\u062c\u0645\u0639\u0629",
"\u0627\u0644\u0633\u0628\u062a",
}
},
{ "islamic.DayNarrows",
new String[] {
"\u062d",
"\u0646",
"\u062b",
"\u0631",
"\u062e",
"\u062c",
"\u0633",
}
},
{ "islamic.Eras",
@ -186,6 +241,56 @@ public class JavaTimeSupplementary_ar extends OpenListResourceBundle {
"",
}
},
{ "islamic.QuarterAbbreviations",
new String[] {
"\u0627\u0644\u0631\u0628\u0639 \u0627\u0644\u0623\u0648\u0644",
"\u0627\u0644\u0631\u0628\u0639 \u0627\u0644\u062b\u0627\u0646\u064a",
"\u0627\u0644\u0631\u0628\u0639 \u0627\u0644\u062b\u0627\u0644\u062b",
"\u0627\u0644\u0631\u0628\u0639 \u0627\u0644\u0631\u0627\u0628\u0639",
}
},
{ "islamic.QuarterNames",
new String[] {
"\u0627\u0644\u0631\u0628\u0639 \u0627\u0644\u0623\u0648\u0644",
"\u0627\u0644\u0631\u0628\u0639 \u0627\u0644\u062b\u0627\u0646\u064a",
"\u0627\u0644\u0631\u0628\u0639 \u0627\u0644\u062b\u0627\u0644\u062b",
"\u0627\u0644\u0631\u0628\u0639 \u0627\u0644\u0631\u0627\u0628\u0639",
}
},
{ "islamic.QuarterNarrows",
new String[] {
"\u0661",
"\u0662",
"\u0663",
"\u0664",
}
},
{ "islamic.TimePatterns",
new String[] {
"h:mm:ss a zzzz",
"h:mm:ss a z",
"h:mm:ss a",
"h:mm a",
}
},
{ "islamic.long.Eras",
new String[] {
"",
"\u0647\u0640",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"\u0635",
"\u0645",
}
},
{ "islamic.narrow.Eras",
new String[] {
"",
"\u0647\u0640",
}
},
{ "islamic.short.Eras",
new String[] {
"",
@ -197,21 +302,19 @@ public class JavaTimeSupplementary_ar extends OpenListResourceBundle {
"EEEE\u060c d MMMM\u060c y G",
"d MMMM\u060c y G",
"dd\u200f/MM\u200f/y G",
"d\u200f/M\u200f/y G",
"d\u200f/M\u200f/y GGGGG",
}
},
{ "java.time.buddhist.long.Eras",
javatimebuddhistlongEras },
{ "java.time.buddhist.short.Eras",
new String[] {
"BC",
"\u0627\u0644\u062a\u0642\u0648\u064a\u0645 \u0627\u0644\u0628\u0648\u0630\u064a",
}
},
javatimebuddhistlongEras },
{ "java.time.islamic.DatePatterns",
new String[] {
"EEEE\u060c d MMMM y",
"d MMMM y",
"EEEE\u060c d MMMM\u060c y G",
"d MMMM\u060c y G",
"d MMM\u060c y G",
"d\u200f/M\u200f/yyyy",
"d\u200f/M\u200f/y GGGGG",
}
},
{ "java.time.japanese.DatePatterns",
@ -219,7 +322,7 @@ public class JavaTimeSupplementary_ar extends OpenListResourceBundle {
"EEEE\u060c d MMMM\u060c y G",
"d MMMM\u060c y G",
"dd\u200f/MM\u200f/y G",
"d\u200f/M\u200f/y G",
"d\u200f/M\u200f/y GGGGG",
}
},
{ "java.time.japanese.long.Eras",
@ -251,7 +354,7 @@ public class JavaTimeSupplementary_ar extends OpenListResourceBundle {
"EEEE\u060c d MMMM\u060c y G",
"d MMMM\u060c y G",
"dd\u200f/MM\u200f/y G",
"d\u200f/M\u200f/y G",
"d\u200f/M\u200f/y GGGGG",
}
},
{ "java.time.short.Eras",
@ -260,12 +363,51 @@ public class JavaTimeSupplementary_ar extends OpenListResourceBundle {
"\u0645",
}
},
{ "roc.AmPmMarkers",
new String[] {
"\u0635",
"\u0645",
}
},
{ "roc.DatePatterns",
new String[] {
"EEEE\u060c d MMMM\u060c y GGGG",
"d MMMM\u060c y GGGG",
"dd\u200f/MM\u200f/y GGGG",
"d\u200f/M\u200f/y GGGG",
"d\u200f/M\u200f/y G",
}
},
{ "roc.DayAbbreviations",
new String[] {
"\u0627\u0644\u0623\u062d\u062f",
"\u0627\u0644\u0627\u062b\u0646\u064a\u0646",
"\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621",
"\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621",
"\u0627\u0644\u062e\u0645\u064a\u0633",
"\u0627\u0644\u062c\u0645\u0639\u0629",
"\u0627\u0644\u0633\u0628\u062a",
}
},
{ "roc.DayNames",
new String[] {
"\u0627\u0644\u0623\u062d\u062f",
"\u0627\u0644\u0627\u062b\u0646\u064a\u0646",
"\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621",
"\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621",
"\u0627\u0644\u062e\u0645\u064a\u0633",
"\u0627\u0644\u062c\u0645\u0639\u0629",
"\u0627\u0644\u0633\u0628\u062a",
}
},
{ "roc.DayNarrows",
new String[] {
"\u062d",
"\u0646",
"\u062b",
"\u0631",
"\u062e",
"\u062c",
"\u0633",
}
},
{ "roc.Eras",
@ -274,6 +416,107 @@ public class JavaTimeSupplementary_ar extends OpenListResourceBundle {
"\u062c\u0645\u0647\u0648\u0631\u064a\u0629 \u0627\u0644\u0635\u064a",
}
},
{ "roc.MonthAbbreviations",
new String[] {
"\u064a\u0646\u0627\u064a\u0631",
"\u0641\u0628\u0631\u0627\u064a\u0631",
"\u0645\u0627\u0631\u0633",
"\u0623\u0628\u0631\u064a\u0644",
"\u0645\u0627\u064a\u0648",
"\u064a\u0648\u0646\u064a\u0648",
"\u064a\u0648\u0644\u064a\u0648",
"\u0623\u063a\u0633\u0637\u0633",
"\u0633\u0628\u062a\u0645\u0628\u0631",
"\u0623\u0643\u062a\u0648\u0628\u0631",
"\u0646\u0648\u0641\u0645\u0628\u0631",
"\u062f\u064a\u0633\u0645\u0628\u0631",
"",
}
},
{ "roc.MonthNames",
new String[] {
"\u064a\u0646\u0627\u064a\u0631",
"\u0641\u0628\u0631\u0627\u064a\u0631",
"\u0645\u0627\u0631\u0633",
"\u0623\u0628\u0631\u064a\u0644",
"\u0645\u0627\u064a\u0648",
"\u064a\u0648\u0646\u064a\u0648",
"\u064a\u0648\u0644\u064a\u0648",
"\u0623\u063a\u0633\u0637\u0633",
"\u0633\u0628\u062a\u0645\u0628\u0631",
"\u0623\u0643\u062a\u0648\u0628\u0631",
"\u0646\u0648\u0641\u0645\u0628\u0631",
"\u062f\u064a\u0633\u0645\u0628\u0631",
"",
}
},
{ "roc.MonthNarrows",
new String[] {
"\u064a",
"\u0641",
"\u0645",
"\u0623",
"\u0648",
"\u0646",
"\u0644",
"\u063a",
"\u0633",
"\u0643",
"\u0628",
"\u062f",
"",
}
},
{ "roc.QuarterAbbreviations",
new String[] {
"\u0627\u0644\u0631\u0628\u0639 \u0627\u0644\u0623\u0648\u0644",
"\u0627\u0644\u0631\u0628\u0639 \u0627\u0644\u062b\u0627\u0646\u064a",
"\u0627\u0644\u0631\u0628\u0639 \u0627\u0644\u062b\u0627\u0644\u062b",
"\u0627\u0644\u0631\u0628\u0639 \u0627\u0644\u0631\u0627\u0628\u0639",
}
},
{ "roc.QuarterNames",
new String[] {
"\u0627\u0644\u0631\u0628\u0639 \u0627\u0644\u0623\u0648\u0644",
"\u0627\u0644\u0631\u0628\u0639 \u0627\u0644\u062b\u0627\u0646\u064a",
"\u0627\u0644\u0631\u0628\u0639 \u0627\u0644\u062b\u0627\u0644\u062b",
"\u0627\u0644\u0631\u0628\u0639 \u0627\u0644\u0631\u0627\u0628\u0639",
}
},
{ "roc.QuarterNarrows",
new String[] {
"\u0661",
"\u0662",
"\u0663",
"\u0664",
}
},
{ "roc.TimePatterns",
new String[] {
"h:mm:ss a zzzz",
"h:mm:ss a z",
"h:mm:ss a",
"h:mm a",
}
},
{ "roc.long.Eras",
new String[] {
"Before R.O.C.",
"\u062c\u0645\u0647\u0648\u0631\u064a\u0629 \u0627\u0644\u0635\u064a",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"\u0635",
"\u0645",
}
},
{ "roc.narrow.Eras",
new String[] {
"Before R.O.C.",
"\u062c\u0645\u0647\u0648\u0631\u064a\u0629 \u0627\u0644\u0635\u064a",
}
},
{ "roc.short.Eras",
new String[] {
"Before R.O.C.",

2
jdk/src/jdk.localedata/share/classes/sun/text/resources/ar/FormatData_ar_LB.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/ar/LB/FormatData_ar_LB.java
View File

@ -40,7 +40,7 @@
*
*/
package sun.text.resources.ar;
package sun.text.resources.ar.LB;
import sun.util.resources.ParallelListResourceBundle;

129
jdk/src/jdk.localedata/share/classes/sun/text/resources/ar/LB/JavaTimeSupplementary_ar_LB.java Normal file
View File

@ -0,0 +1,129 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of the Unicode data files and any associated documentation
* (the "Data Files") or Unicode software and any associated documentation
* (the "Software") to deal in the Data Files or Software
* without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, and/or sell copies of
* the Data Files or Software, and to permit persons to whom the Data Files
* or Software are furnished to do so, provided that
* (a) this copyright and permission notice appear with all copies
* of the Data Files or Software,
* (b) this copyright and permission notice appear in associated
* documentation, and
* (c) there is clear notice in each modified Data File or in the Software
* as well as in the documentation associated with the Data File(s) or
* Software that the data or software has been modified.
*
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
* ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT OF THIRD PARTY RIGHTS.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
* NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
* DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THE DATA FILES OR SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in these Data Files or Software without prior
* written authorization of the copyright holder.
*/
// Note: this file has been generated by a tool.
package sun.text.resources.ar.LB;
import sun.util.resources.OpenListResourceBundle;
public class JavaTimeSupplementary_ar_LB extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
return new Object[][] {
{ "roc.MonthAbbreviations",
new String[] {
"\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\u0627\u0646\u064a",
"\u0634\u0628\u0627\u0637",
"\u0622\u0630\u0627\u0631",
"\u0646\u064a\u0633\u0627\u0646",
"\u0623\u064a\u0627\u0631",
"\u062d\u0632\u064a\u0631\u0627\u0646",
"\u062a\u0645\u0648\u0632",
"\u0622\u0628",
"\u0623\u064a\u0644\u0648\u0644",
"\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u0623\u0648\u0644",
"\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u064a",
"\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644",
"",
}
},
{ "roc.MonthNames",
new String[] {
"\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\u0627\u0646\u064a",
"\u0634\u0628\u0627\u0637",
"\u0622\u0630\u0627\u0631",
"\u0646\u064a\u0633\u0627\u0646",
"\u0623\u064a\u0627\u0631",
"\u062d\u0632\u064a\u0631\u0627\u0646",
"\u062a\u0645\u0648\u0632",
"\u0622\u0628",
"\u0623\u064a\u0644\u0648\u0644",
"\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u0623\u0648\u0644",
"\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u064a",
"\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644",
"",
}
},
{ "roc.MonthNarrows",
new String[] {
"\u0643",
"\u0634",
"\u0622",
"\u0646",
"\u0623",
"\u062d",
"\u062a",
"\u0622",
"\u0623",
"\u062a",
"\u062a",
"\u0643",
"",
}
},
};
}
}

2
jdk/src/jdk.localedata/share/classes/sun/text/resources/ar/FormatData_ar_SY.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/ar/SY/FormatData_ar_SY.java
View File

@ -40,7 +40,7 @@
*
*/
package sun.text.resources.ar;
package sun.text.resources.ar.SY;
import sun.util.resources.ParallelListResourceBundle;

129
jdk/src/jdk.localedata/share/classes/sun/text/resources/ar/SY/JavaTimeSupplementary_ar_SY.java Normal file
View File

@ -0,0 +1,129 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of the Unicode data files and any associated documentation
* (the "Data Files") or Unicode software and any associated documentation
* (the "Software") to deal in the Data Files or Software
* without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, and/or sell copies of
* the Data Files or Software, and to permit persons to whom the Data Files
* or Software are furnished to do so, provided that
* (a) this copyright and permission notice appear with all copies
* of the Data Files or Software,
* (b) this copyright and permission notice appear in associated
* documentation, and
* (c) there is clear notice in each modified Data File or in the Software
* as well as in the documentation associated with the Data File(s) or
* Software that the data or software has been modified.
*
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
* ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT OF THIRD PARTY RIGHTS.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
* NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
* DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THE DATA FILES OR SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in these Data Files or Software without prior
* written authorization of the copyright holder.
*/
// Note: this file has been generated by a tool.
package sun.text.resources.ar.SY;
import sun.util.resources.OpenListResourceBundle;
public class JavaTimeSupplementary_ar_SY extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
return new Object[][] {
{ "roc.MonthAbbreviations",
new String[] {
"\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\u0627\u0646\u064a",
"\u0634\u0628\u0627\u0637",
"\u0622\u0630\u0627\u0631",
"\u0646\u064a\u0633\u0627\u0646",
"\u0623\u064a\u0627\u0631",
"\u062d\u0632\u064a\u0631\u0627\u0646",
"\u062a\u0645\u0648\u0632",
"\u0622\u0628",
"\u0623\u064a\u0644\u0648\u0644",
"\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u0623\u0648\u0644",
"\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u064a",
"\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644",
"",
}
},
{ "roc.MonthNames",
new String[] {
"\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\u0627\u0646\u064a",
"\u0634\u0628\u0627\u0637",
"\u0622\u0630\u0627\u0631",
"\u0646\u064a\u0633\u0627\u0646",
"\u0623\u064a\u0627\u0631",
"\u062d\u0632\u064a\u0631\u0627\u0646",
"\u062a\u0645\u0648\u0632",
"\u0622\u0628",
"\u0623\u064a\u0644\u0648\u0644",
"\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u0623\u0648\u0644",
"\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u064a",
"\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644",
"",
}
},
{ "roc.MonthNarrows",
new String[] {
"\u0643",
"\u0634",
"\u0622",
"\u0646",
"\u0623",
"\u062d",
"\u062a",
"\u0622",
"\u0623",
"\u062a",
"\u062a",
"\u0643",
"",
}
},
};
}
}

2
jdk/src/jdk.localedata/share/classes/sun/text/resources/be/FormatData_be_BY.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/be/BY/FormatData_be_BY.java
View File

@ -41,7 +41,7 @@
*
*/
package sun.text.resources.be;
package sun.text.resources.be.BY;
import sun.util.resources.ParallelListResourceBundle;

287
jdk/src/jdk.localedata/share/classes/sun/text/resources/be/JavaTimeSupplementary_be.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -26,37 +26,41 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
* the Terms of Use in http://www.unicode.org/copyright.html.
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of the Unicode data files and any associated documentation (the "Data
* Files") or Unicode software and any associated documentation (the
* "Software") to deal in the Data Files or Software without restriction,
* including without limitation the rights to use, copy, modify, merge,
* publish, distribute, and/or sell copies of the Data Files or Software, and
* to permit persons to whom the Data Files or Software are furnished to do so,
* provided that (a) the above copyright notice(s) and this permission notice
* appear with all copies of the Data Files or Software, (b) both the above
* copyright notice(s) and this permission notice appear in associated
* documentation, and (c) there is clear notice in each modified Data File or
* in the Software as well as in the documentation associated with the Data
* File(s) or Software that the data or software has been modified.
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of the Unicode data files and any associated documentation
* (the "Data Files") or Unicode software and any associated documentation
* (the "Software") to deal in the Data Files or Software
* without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, and/or sell copies of
* the Data Files or Software, and to permit persons to whom the Data Files
* or Software are furnished to do so, provided that
* (a) this copyright and permission notice appear with all copies
* of the Data Files or Software,
* (b) this copyright and permission notice appear in associated
* documentation, and
* (c) there is clear notice in each modified Data File or in the Software
* as well as in the documentation associated with the Data File(s) or
* Software that the data or software has been modified.
*
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
* KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR
* CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
* ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT OF THIRD PARTY RIGHTS.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
* NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
* DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THE DATA FILES OR SOFTWARE.
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THE DATA FILES OR SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder shall not
* be used in advertising or otherwise to promote the sale, use or other
* dealings in these Data Files or Software without prior written authorization
* of the copyright holder.
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in these Data Files or Software without prior
* written authorization of the copyright holder.
*/
// Note: this file has been generated by a tool.
@ -95,8 +99,6 @@ public class JavaTimeSupplementary_be extends OpenListResourceBundle {
"\u043c\u0443\u0441\u0443\u043b\u044c\u043c\u0430\u043d\u0441\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440" },
{ "calendarname.islamic-civil",
"\u043c\u0443\u0441\u0443\u043b\u044c\u043c\u0430\u043d\u0441\u043a\u0456 \u0441\u0432\u0435\u0446\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440" },
{ "calendarname.islamicc",
"\u043c\u0443\u0441\u0443\u043b\u044c\u043c\u0430\u043d\u0441\u043a\u0456 \u0441\u0432\u0435\u0446\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440" },
{ "calendarname.japanese",
"\u044f\u043f\u043e\u043d\u0441\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440" },
{ "field.dayperiod",
@ -117,8 +119,77 @@ public class JavaTimeSupplementary_be extends OpenListResourceBundle {
"\u0434\u0437\u0435\u043d\u044c \u0442\u044b\u0434\u043d\u044f" },
{ "field.year",
"\u0433\u043e\u0434" },
{ "field.zone",
"Zone" },
{ "islamic.AmPmMarkers",
new String[] {
"\u0434\u0430 \u043f\u0430\u043b\u0443\u0434\u043d\u044f",
"\u043f\u0430\u0441\u043b\u044f \u043f\u0430\u043b\u0443\u0434\u043d\u044f",
}
},
{ "islamic.DatePatterns",
new String[] {
"EEEE, d MMMM y GGGG",
"d MMMM y GGGG",
"d.M.y GGGG",
"d.M.y G",
}
},
{ "islamic.DayAbbreviations",
new String[] {
"\u043d\u0434",
"\u043f\u043d",
"\u0430\u045e",
"\u0441\u0440",
"\u0447\u0446",
"\u043f\u0442",
"\u0441\u0431",
}
},
{ "islamic.DayNames",
new String[] {
"\u043d\u044f\u0434\u0437\u0435\u043b\u044f",
"\u043f\u0430\u043d\u044f\u0434\u0437\u0435\u043b\u0430\u043a",
"\u0430\u045e\u0442\u043e\u0440\u0430\u043a",
"\u0441\u0435\u0440\u0430\u0434\u0430",
"\u0447\u0430\u0446\u0432\u0435\u0440",
"\u043f\u044f\u0442\u043d\u0456\u0446\u0430",
"\u0441\u0443\u0431\u043e\u0442\u0430",
}
},
{ "islamic.DayNarrows",
new String[] {
"\u043d",
"\u043f",
"\u0430",
"\u0441",
"\u0447",
"\u043f",
"\u0441",
}
},
{ "islamic.QuarterAbbreviations",
new String[] {
"1-\u0448\u044b \u043a\u0432.",
"2-\u0433\u0456 \u043a\u0432.",
"3-\u0446\u0456 \u043a\u0432.",
"4-\u0442\u044b \u043a\u0432.",
}
},
{ "islamic.QuarterNames",
new String[] {
"1-\u0448\u044b \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
"2-\u0433\u0456 \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
"3-\u0446\u0456 \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
"4-\u0442\u044b \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
}
},
{ "islamic.TimePatterns",
new String[] {
"HH.mm.ss zzzz",
"HH.mm.ss z",
"HH.mm.ss",
"HH.mm",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"EEEE, d MMMM y G",
@ -127,12 +198,164 @@ public class JavaTimeSupplementary_be extends OpenListResourceBundle {
"d.M.yy",
}
},
{ "java.time.islamic.DatePatterns",
new String[] {
"EEEE, d MMMM y G",
"d MMMM y G",
"d.M.y G",
"d.M.y GGGGG",
}
},
{ "java.time.japanese.DatePatterns",
new String[] {
"EEEE, d MMMM y G",
"d MMMM y G",
"d.M.y G",
"d.M.y GGGGG",
}
},
{ "java.time.long.Eras",
new String[] {
"\u0434\u0430 \u043d.\u044d.",
"\u043d.\u044d.",
}
},
{ "java.time.roc.DatePatterns",
new String[] {
"EEEE, d MMMM y G",
"d MMMM y G",
"d.M.y G",
"d.M.y GGGGG",
}
},
{ "java.time.short.Eras",
new String[] {
"\u0434\u0430 \u043d.\u0435.",
"\u043d.\u0435.",
}
},
{ "roc.AmPmMarkers",
new String[] {
"\u0434\u0430 \u043f\u0430\u043b\u0443\u0434\u043d\u044f",
"\u043f\u0430\u0441\u043b\u044f \u043f\u0430\u043b\u0443\u0434\u043d\u044f",
}
},
{ "roc.DatePatterns",
new String[] {
"EEEE, d MMMM y GGGG",
"d MMMM y GGGG",
"d.M.y GGGG",
"d.M.y G",
}
},
{ "roc.DayAbbreviations",
new String[] {
"\u043d\u0434",
"\u043f\u043d",
"\u0430\u045e",
"\u0441\u0440",
"\u0447\u0446",
"\u043f\u0442",
"\u0441\u0431",
}
},
{ "roc.DayNames",
new String[] {
"\u043d\u044f\u0434\u0437\u0435\u043b\u044f",
"\u043f\u0430\u043d\u044f\u0434\u0437\u0435\u043b\u0430\u043a",
"\u0430\u045e\u0442\u043e\u0440\u0430\u043a",
"\u0441\u0435\u0440\u0430\u0434\u0430",
"\u0447\u0430\u0446\u0432\u0435\u0440",
"\u043f\u044f\u0442\u043d\u0456\u0446\u0430",
"\u0441\u0443\u0431\u043e\u0442\u0430",
}
},
{ "roc.DayNarrows",
new String[] {
"\u043d",
"\u043f",
"\u0430",
"\u0441",
"\u0447",
"\u043f",
"\u0441",
}
},
{ "roc.MonthAbbreviations",
new String[] {
"\u0441\u0442\u0443",
"\u043b\u044e\u0442",
"\u0441\u0430\u043a",
"\u043a\u0440\u0430",
"\u043c\u0430\u044f",
"\u0447\u044d\u0440",
"\u043b\u0456\u043f",
"\u0436\u043d\u0456",
"\u0432\u0435\u0440",
"\u043a\u0430\u0441",
"\u043b\u0456\u0441",
"\u0441\u043d\u0435",
"",
}
},
{ "roc.MonthNames",
new String[] {
"\u0441\u0442\u0443\u0434\u0437\u0435\u043d\u044f",
"\u043b\u044e\u0442\u0430\u0433\u0430",
"\u0441\u0430\u043a\u0430\u0432\u0456\u043a\u0430",
"\u043a\u0440\u0430\u0441\u0430\u0432\u0456\u043a\u0430",
"\u043c\u0430\u044f",
"\u0447\u044d\u0440\u0432\u0435\u043d\u044f",
"\u043b\u0456\u043f\u0435\u043d\u044f",
"\u0436\u043d\u0456\u045e\u043d\u044f",
"\u0432\u0435\u0440\u0430\u0441\u043d\u044f",
"\u043a\u0430\u0441\u0442\u0440\u044b\u0447\u043d\u0456\u043a\u0430",
"\u043b\u0456\u0441\u0442\u0430\u043f\u0430\u0434\u0430",
"\u0441\u043d\u0435\u0436\u043d\u044f",
"",
}
},
{ "roc.MonthNarrows",
new String[] {
"\u0441",
"\u043b",
"\u0441",
"\u043a",
"\u043c",
"\u0447",
"\u043b",
"\u0436",
"\u0432",
"\u043a",
"\u043b",
"\u0441",
"",
}
},
{ "roc.QuarterAbbreviations",
new String[] {
"1-\u0448\u044b \u043a\u0432.",
"2-\u0433\u0456 \u043a\u0432.",
"3-\u0446\u0456 \u043a\u0432.",
"4-\u0442\u044b \u043a\u0432.",
}
},
{ "roc.QuarterNames",
new String[] {
"1-\u0448\u044b \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
"2-\u0433\u0456 \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
"3-\u0446\u0456 \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
"4-\u0442\u044b \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
}
},
{ "roc.TimePatterns",
new String[] {
"HH.mm.ss zzzz",
"HH.mm.ss z",
"HH.mm.ss",
"HH.mm",
}
},
};
}
}

2
jdk/src/jdk.localedata/share/classes/sun/text/resources/bg/FormatData_bg_BG.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/bg/BG/FormatData_bg_BG.java
View File

@ -41,7 +41,7 @@
*
*/
package sun.text.resources.bg;
package sun.text.resources.bg.BG;
import sun.util.resources.ParallelListResourceBundle;

353
jdk/src/jdk.localedata/share/classes/sun/text/resources/bg/JavaTimeSupplementary_bg.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -26,37 +26,41 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
* the Terms of Use in http://www.unicode.org/copyright.html.
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of the Unicode data files and any associated documentation (the "Data
* Files") or Unicode software and any associated documentation (the
* "Software") to deal in the Data Files or Software without restriction,
* including without limitation the rights to use, copy, modify, merge,
* publish, distribute, and/or sell copies of the Data Files or Software, and
* to permit persons to whom the Data Files or Software are furnished to do so,
* provided that (a) the above copyright notice(s) and this permission notice
* appear with all copies of the Data Files or Software, (b) both the above
* copyright notice(s) and this permission notice appear in associated
* documentation, and (c) there is clear notice in each modified Data File or
* in the Software as well as in the documentation associated with the Data
* File(s) or Software that the data or software has been modified.
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of the Unicode data files and any associated documentation
* (the "Data Files") or Unicode software and any associated documentation
* (the "Software") to deal in the Data Files or Software
* without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, and/or sell copies of
* the Data Files or Software, and to permit persons to whom the Data Files
* or Software are furnished to do so, provided that
* (a) this copyright and permission notice appear with all copies
* of the Data Files or Software,
* (b) this copyright and permission notice appear in associated
* documentation, and
* (c) there is clear notice in each modified Data File or in the Software
* as well as in the documentation associated with the Data File(s) or
* Software that the data or software has been modified.
*
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
* KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR
* CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
* ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT OF THIRD PARTY RIGHTS.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
* NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
* DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THE DATA FILES OR SOFTWARE.
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THE DATA FILES OR SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder shall not
* be used in advertising or otherwise to promote the sale, use or other
* dealings in these Data Files or Software without prior written authorization
* of the copyright holder.
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in these Data Files or Software without prior
* written authorization of the copyright holder.
*/
// Note: this file has been generated by a tool.
@ -71,46 +75,36 @@ public class JavaTimeSupplementary_bg extends OpenListResourceBundle {
return new Object[][] {
{ "QuarterAbbreviations",
new String[] {
"I \u0442\u0440\u0438\u043c.",
"II \u0442\u0440\u0438\u043c.",
"III \u0442\u0440\u0438\u043c.",
"IV \u0442\u0440\u0438\u043c.",
"1. \u0442\u0440\u0438\u043c.",
"2. \u0442\u0440\u0438\u043c.",
"3. \u0442\u0440\u0438\u043c.",
"4. \u0442\u0440\u0438\u043c.",
}
},
{ "QuarterNames",
new String[] {
"1-\u0432\u043e \u0442\u0440\u0438\u043c\u0435\u0441\u0435\u0447\u0438\u0435",
"2-\u0440\u043e \u0442\u0440\u0438\u043c\u0435\u0441\u0435\u0447\u0438\u0435",
"3-\u0442\u043e \u0442\u0440\u0438\u043c\u0435\u0441\u0435\u0447\u0438\u0435",
"4-\u0442\u043e \u0442\u0440\u0438\u043c\u0435\u0441\u0435\u0447\u0438\u0435",
}
},
{ "QuarterNarrows",
new String[] {
"1",
"2",
"3",
"4",
"1. \u0442\u0440\u0438\u043c\u0435\u0441\u0435\u0447\u0438\u0435",
"2. \u0442\u0440\u0438\u043c\u0435\u0441\u0435\u0447\u0438\u0435",
"3. \u0442\u0440\u0438\u043c\u0435\u0441\u0435\u0447\u0438\u0435",
"4. \u0442\u0440\u0438\u043c\u0435\u0441\u0435\u0447\u0438\u0435",
}
},
{ "calendarname.buddhist",
"\u0411\u0443\u0434\u0438\u0441\u0442\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
"\u0431\u0443\u0434\u0438\u0441\u0442\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
{ "calendarname.gregorian",
"\u0413\u0440\u0438\u0433\u043e\u0440\u0438\u0430\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
"\u0433\u0440\u0438\u0433\u043e\u0440\u0438\u0430\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
{ "calendarname.gregory",
"\u0413\u0440\u0438\u0433\u043e\u0440\u0438\u0430\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
"\u0433\u0440\u0438\u0433\u043e\u0440\u0438\u0430\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
{ "calendarname.islamic",
"\u0418\u0441\u043b\u044f\u043c\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
"\u0438\u0441\u043b\u044f\u043c\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
{ "calendarname.islamic-civil",
"\u0418\u0441\u043b\u044f\u043c\u0441\u043a\u0438 \u0446\u0438\u0432\u0438\u043b\u0435\u043d \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
{ "calendarname.islamicc",
"\u0418\u0441\u043b\u044f\u043c\u0441\u043a\u0438 \u0446\u0438\u0432\u0438\u043b\u0435\u043d \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
{ "calendarname.japanese",
"\u042f\u043f\u043e\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
"\u044f\u043f\u043e\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
{ "calendarname.roc",
"\u041a\u0430\u043b\u0435\u043d\u0434\u0430\u0440 \u043d\u0430 \u0420\u0435\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u041a\u0438\u0442\u0430\u0439" },
"\u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440 \u043d\u0430 \u0420\u0435\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u041a\u0438\u0442\u0430\u0439" },
{ "field.dayperiod",
"\u0434\u0435\u043d" },
"\u043f\u0440.\u043e\u0431./\u0441\u043b.\u043e\u0431." },
{ "field.era",
"\u0435\u0440\u0430" },
{ "field.hour",
@ -124,11 +118,58 @@ public class JavaTimeSupplementary_bg extends OpenListResourceBundle {
{ "field.week",
"\u0441\u0435\u0434\u043c\u0438\u0446\u0430" },
{ "field.weekday",
"\u0414\u0435\u043d \u043e\u0442 \u0441\u0435\u0434\u043c\u0438\u0446\u0430\u0442\u0430" },
"\u0434\u0435\u043d \u043e\u0442 \u0441\u0435\u0434\u043c\u0438\u0446\u0430\u0442\u0430" },
{ "field.year",
"\u0433\u043e\u0434\u0438\u043d\u0430" },
{ "field.zone",
"\u0437\u043e\u043d\u0430" },
"\u0447\u0430\u0441\u043e\u0432\u0430 \u0437\u043e\u043d\u0430" },
{ "islamic.AmPmMarkers",
new String[] {
"\u043f\u0440.\u043e\u0431.",
"\u0441\u043b.\u043e\u0431.",
}
},
{ "islamic.DatePatterns",
new String[] {
"EEEE, d MMMM y '\u0433'. GGGG",
"d MMMM y '\u0433'. GGGG",
"d.MM.y '\u0433'. GGGG",
"d.MM.yy GGGG",
}
},
{ "islamic.DayAbbreviations",
new String[] {
"\u043d\u0434",
"\u043f\u043d",
"\u0432\u0442",
"\u0441\u0440",
"\u0447\u0442",
"\u043f\u0442",
"\u0441\u0431",
}
},
{ "islamic.DayNames",
new String[] {
"\u043d\u0435\u0434\u0435\u043b\u044f",
"\u043f\u043e\u043d\u0435\u0434\u0435\u043b\u043d\u0438\u043a",
"\u0432\u0442\u043e\u0440\u043d\u0438\u043a",
"\u0441\u0440\u044f\u0434\u0430",
"\u0447\u0435\u0442\u0432\u044a\u0440\u0442\u044a\u043a",
"\u043f\u0435\u0442\u044a\u043a",
"\u0441\u044a\u0431\u043e\u0442\u0430",
}
},
{ "islamic.DayNarrows",
new String[] {
"\u043d",
"\u043f",
"\u0432",
"\u0441",
"\u0447",
"\u043f",
"\u0441",
}
},
{ "islamic.MonthNames",
new String[] {
"\u043c\u0443\u0445\u0430\u0440\u0430\u043c",
@ -146,10 +187,80 @@ public class JavaTimeSupplementary_bg extends OpenListResourceBundle {
"",
}
},
{ "islamic.QuarterAbbreviations",
new String[] {
"1. \u0442\u0440\u0438\u043c.",
"2. \u0442\u0440\u0438\u043c.",
"3. \u0442\u0440\u0438\u043c.",
"4. \u0442\u0440\u0438\u043c.",
}
},
{ "islamic.QuarterNames",
new String[] {
"1. \u0442\u0440\u0438\u043c\u0435\u0441\u0435\u0447\u0438\u0435",
"2. \u0442\u0440\u0438\u043c\u0435\u0441\u0435\u0447\u0438\u0435",
"3. \u0442\u0440\u0438\u043c\u0435\u0441\u0435\u0447\u0438\u0435",
"4. \u0442\u0440\u0438\u043c\u0435\u0441\u0435\u0447\u0438\u0435",
}
},
{ "islamic.QuarterNarrows",
new String[] {
"1",
"2",
"3",
"4",
}
},
{ "islamic.TimePatterns",
new String[] {
"H:mm:ss zzzz",
"H:mm:ss z",
"H:mm:ss",
"H:mm",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"\u043f\u0440.\u043e\u0431.",
"\u0441\u043b.\u043e\u0431.",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"EEEE, d MMMM y '\u0433'. G",
"d MMMM y '\u0433'. G",
"d.MM.y '\u0433'. G",
"d.MM.yy G",
}
},
{ "java.time.islamic.DatePatterns",
new String[] {
"EEEE, d MMMM y '\u0433'. G",
"d MMMM y '\u0433'. G",
"d.MM.y '\u0433'. G",
"d.MM.yy G",
}
},
{ "java.time.japanese.DatePatterns",
new String[] {
"EEEE, d MMMM y '\u0433'. G",
"d MMMM y '\u0433'. G",
"d.MM.y '\u0433'. G",
"d.MM.yy G",
}
},
{ "java.time.long.Eras",
new String[] {
"\u043f\u0440.\u0425\u0440.",
"\u0441\u043b.\u0425\u0440.",
"\u043f\u0440\u0435\u0434\u0438 \u0425\u0440\u0438\u0441\u0442\u0430",
"\u0441\u043b\u0435\u0434 \u0425\u0440\u0438\u0441\u0442\u0430",
}
},
{ "java.time.roc.DatePatterns",
new String[] {
"EEEE, d MMMM y '\u0433'. G",
"d MMMM y '\u0433'. G",
"d.MM.y '\u0433'. G",
"d.MM.yy G",
}
},
{ "java.time.short.Eras",
@ -158,6 +269,134 @@ public class JavaTimeSupplementary_bg extends OpenListResourceBundle {
"\u043d.\u0435.",
}
},
{ "roc.AmPmMarkers",
new String[] {
"\u043f\u0440.\u043e\u0431.",
"\u0441\u043b.\u043e\u0431.",
}
},
{ "roc.DatePatterns",
new String[] {
"EEEE, d MMMM y '\u0433'. GGGG",
"d MMMM y '\u0433'. GGGG",
"d.MM.y '\u0433'. GGGG",
"d.MM.yy GGGG",
}
},
{ "roc.DayAbbreviations",
new String[] {
"\u043d\u0434",
"\u043f\u043d",
"\u0432\u0442",
"\u0441\u0440",
"\u0447\u0442",
"\u043f\u0442",
"\u0441\u0431",
}
},
{ "roc.DayNames",
new String[] {
"\u043d\u0435\u0434\u0435\u043b\u044f",
"\u043f\u043e\u043d\u0435\u0434\u0435\u043b\u043d\u0438\u043a",
"\u0432\u0442\u043e\u0440\u043d\u0438\u043a",
"\u0441\u0440\u044f\u0434\u0430",
"\u0447\u0435\u0442\u0432\u044a\u0440\u0442\u044a\u043a",
"\u043f\u0435\u0442\u044a\u043a",
"\u0441\u044a\u0431\u043e\u0442\u0430",
}
},
{ "roc.DayNarrows",
new String[] {
"\u043d",
"\u043f",
"\u0432",
"\u0441",
"\u0447",
"\u043f",
"\u0441",
}
},
{ "roc.MonthAbbreviations",
new String[] {
"\u044f\u043d.",
"\u0444\u0435\u0432\u0440.",
"\u043c\u0430\u0440\u0442",
"\u0430\u043f\u0440.",
"\u043c\u0430\u0439",
"\u044e\u043d\u0438",
"\u044e\u043b\u0438",
"\u0430\u0432\u0433.",
"\u0441\u0435\u043f\u0442.",
"\u043e\u043a\u0442.",
"\u043d\u043e\u0435\u043c.",
"\u0434\u0435\u043a.",
"",
}
},
{ "roc.MonthNames",
new String[] {
"\u044f\u043d\u0443\u0430\u0440\u0438",
"\u0444\u0435\u0432\u0440\u0443\u0430\u0440\u0438",
"\u043c\u0430\u0440\u0442",
"\u0430\u043f\u0440\u0438\u043b",
"\u043c\u0430\u0439",
"\u044e\u043d\u0438",
"\u044e\u043b\u0438",
"\u0430\u0432\u0433\u0443\u0441\u0442",
"\u0441\u0435\u043f\u0442\u0435\u043c\u0432\u0440\u0438",
"\u043e\u043a\u0442\u043e\u043c\u0432\u0440\u0438",
"\u043d\u043e\u0435\u043c\u0432\u0440\u0438",
"\u0434\u0435\u043a\u0435\u043c\u0432\u0440\u0438",
"",
}
},
{ "roc.MonthNarrows",
new String[] {
"\u044f",
"\u0444",
"\u043c",
"\u0430",
"\u043c",
"\u044e",
"\u044e",
"\u0430",
"\u0441",
"\u043e",
"\u043d",
"\u0434",
"",
}
},
{ "roc.QuarterAbbreviations",
new String[] {
"1. \u0442\u0440\u0438\u043c.",
"2. \u0442\u0440\u0438\u043c.",
"3. \u0442\u0440\u0438\u043c.",
"4. \u0442\u0440\u0438\u043c.",
}
},
{ "roc.QuarterNames",
new String[] {
"1. \u0442\u0440\u0438\u043c\u0435\u0441\u0435\u0447\u0438\u0435",
"2. \u0442\u0440\u0438\u043c\u0435\u0441\u0435\u0447\u0438\u0435",
"3. \u0442\u0440\u0438\u043c\u0435\u0441\u0435\u0447\u0438\u0435",
"4. \u0442\u0440\u0438\u043c\u0435\u0441\u0435\u0447\u0438\u0435",
}
},
{ "roc.TimePatterns",
new String[] {
"H:mm:ss zzzz",
"H:mm:ss z",
"H:mm:ss",
"H:mm",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"\u043f\u0440.\u043e\u0431.",
"\u0441\u043b.\u043e\u0431.",
}
},
};
}
}

2
jdk/src/jdk.localedata/share/classes/sun/text/resources/ca/FormatData_ca_ES.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/ca/ES/FormatData_ca_ES.java
View File

@ -41,7 +41,7 @@
*
*/
package sun.text.resources.ca;
package sun.text.resources.ca.ES;
import sun.util.resources.ParallelListResourceBundle;

335
jdk/src/jdk.localedata/share/classes/sun/text/resources/ca/JavaTimeSupplementary_ca.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -26,37 +26,41 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
* the Terms of Use in http://www.unicode.org/copyright.html.
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of the Unicode data files and any associated documentation (the "Data
* Files") or Unicode software and any associated documentation (the
* "Software") to deal in the Data Files or Software without restriction,
* including without limitation the rights to use, copy, modify, merge,
* publish, distribute, and/or sell copies of the Data Files or Software, and
* to permit persons to whom the Data Files or Software are furnished to do so,
* provided that (a) the above copyright notice(s) and this permission notice
* appear with all copies of the Data Files or Software, (b) both the above
* copyright notice(s) and this permission notice appear in associated
* documentation, and (c) there is clear notice in each modified Data File or
* in the Software as well as in the documentation associated with the Data
* File(s) or Software that the data or software has been modified.
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of the Unicode data files and any associated documentation
* (the "Data Files") or Unicode software and any associated documentation
* (the "Software") to deal in the Data Files or Software
* without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, and/or sell copies of
* the Data Files or Software, and to permit persons to whom the Data Files
* or Software are furnished to do so, provided that
* (a) this copyright and permission notice appear with all copies
* of the Data Files or Software,
* (b) this copyright and permission notice appear in associated
* documentation, and
* (c) there is clear notice in each modified Data File or in the Software
* as well as in the documentation associated with the Data File(s) or
* Software that the data or software has been modified.
*
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
* KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR
* CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
* ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT OF THIRD PARTY RIGHTS.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
* NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
* DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THE DATA FILES OR SOFTWARE.
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THE DATA FILES OR SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder shall not
* be used in advertising or otherwise to promote the sale, use or other
* dealings in these Data Files or Software without prior written authorization
* of the copyright holder.
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in these Data Files or Software without prior
* written authorization of the copyright holder.
*/
// Note: this file has been generated by a tool.
@ -85,14 +89,6 @@ public class JavaTimeSupplementary_ca extends OpenListResourceBundle {
"4t trimestre",
}
},
{ "QuarterNarrows",
new String[] {
"1",
"2",
"3",
"4",
}
},
{ "calendarname.buddhist",
"calendari budista" },
{ "calendarname.gregorian",
@ -103,14 +99,12 @@ public class JavaTimeSupplementary_ca extends OpenListResourceBundle {
"calendari musulm\u00e0" },
{ "calendarname.islamic-civil",
"calendari civil isl\u00e0mic" },
{ "calendarname.islamicc",
"calendari civil isl\u00e0mic" },
{ "calendarname.japanese",
"calendari japon\u00e8s" },
{ "calendarname.roc",
"calendari de la Rep\u00fablica de Xina" },
{ "field.dayperiod",
"a.m./p.m." },
"a. m./p. m." },
{ "field.era",
"era" },
{ "field.hour",
@ -129,12 +123,275 @@ public class JavaTimeSupplementary_ca extends OpenListResourceBundle {
"any" },
{ "field.zone",
"zona" },
{ "islamic.AmPmMarkers",
new String[] {
"a. m.",
"p. m.",
}
},
{ "islamic.DatePatterns",
new String[] {
"EEEE d MMMM 'de' y GGGG",
"d MMMM 'de' y GGGG",
"dd/MM/y GGGG",
"dd/MM/yy G",
}
},
{ "islamic.DayAbbreviations",
new String[] {
"dg.",
"dl.",
"dt.",
"dc.",
"dj.",
"dv.",
"ds.",
}
},
{ "islamic.DayNames",
new String[] {
"diumenge",
"dilluns",
"dimarts",
"dimecres",
"dijous",
"divendres",
"dissabte",
}
},
{ "islamic.DayNarrows",
new String[] {
"dg",
"dl",
"dt",
"dc",
"dj",
"dv",
"ds",
}
},
{ "islamic.QuarterAbbreviations",
new String[] {
"1T",
"2T",
"3T",
"4T",
}
},
{ "islamic.QuarterNames",
new String[] {
"1r trimestre",
"2n trimestre",
"3r trimestre",
"4t trimestre",
}
},
{ "islamic.QuarterNarrows",
new String[] {
"1",
"2",
"3",
"4",
}
},
{ "islamic.TimePatterns",
new String[] {
"H:mm:ss zzzz",
"H:mm:ss z",
"H:mm:ss",
"H:mm",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"a.m.",
"p.m.",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"EEEE, dd MMMM y G",
"d MMMM y G",
"d MMM y G",
"dd/MM/y GGGGG",
}
},
{ "java.time.buddhist.long.Eras",
new String[] {
"BC",
"eB",
}
},
{ "java.time.buddhist.short.Eras",
new String[] {
"BC",
"eB",
}
},
{ "java.time.islamic.DatePatterns",
new String[] {
"EEEE d MMMM 'de' y G",
"d MMMM 'de' y G",
"dd/MM/y G",
"dd/MM/yy GGGGG",
}
},
{ "java.time.japanese.DatePatterns",
new String[] {
"EEEE d MMMM 'de' y G",
"d MMMM 'de' y G",
"dd/MM/y G",
"dd/MM/yy GGGGG",
}
},
{ "java.time.long.Eras",
new String[] {
"abans de Crist",
"despr\u00e9s de Crist",
}
},
{ "java.time.roc.DatePatterns",
new String[] {
"EEEE d MMMM 'de' y G",
"d MMMM 'de' y G",
"dd/MM/y G",
"dd/MM/y GGGGG",
}
},
{ "java.time.short.Eras",
new String[] {
"aC",
"dC",
}
},
{ "roc.AmPmMarkers",
new String[] {
"a. m.",
"p. m.",
}
},
{ "roc.DatePatterns",
new String[] {
"EEEE d MMMM 'de' y GGGG",
"d MMMM 'de' y GGGG",
"dd/MM/y GGGG",
"dd/MM/y G",
}
},
{ "roc.DayAbbreviations",
new String[] {
"dg.",
"dl.",
"dt.",
"dc.",
"dj.",
"dv.",
"ds.",
}
},
{ "roc.DayNames",
new String[] {
"diumenge",
"dilluns",
"dimarts",
"dimecres",
"dijous",
"divendres",
"dissabte",
}
},
{ "roc.DayNarrows",
new String[] {
"dg",
"dl",
"dt",
"dc",
"dj",
"dv",
"ds",
}
},
{ "roc.MonthAbbreviations",
new String[] {
"gen.",
"febr.",
"mar\u00e7",
"abr.",
"maig",
"juny",
"jul.",
"ag.",
"set.",
"oct.",
"nov.",
"des.",
"",
}
},
{ "roc.MonthNames",
new String[] {
"de gener",
"de febrer",
"de mar\u00e7",
"d\u2019abril",
"de maig",
"de juny",
"de juliol",
"d\u2019agost",
"de setembre",
"d\u2019octubre",
"de novembre",
"de desembre",
"",
}
},
{ "roc.MonthNarrows",
new String[] {
"GN",
"FB",
"M\u00c7",
"AB",
"MG",
"JN",
"JL",
"AG",
"ST",
"OC",
"NV",
"DS",
"",
}
},
{ "roc.QuarterAbbreviations",
new String[] {
"1T",
"2T",
"3T",
"4T",
}
},
{ "roc.QuarterNames",
new String[] {
"1r trimestre",
"2n trimestre",
"3r trimestre",
"4t trimestre",
}
},
{ "roc.TimePatterns",
new String[] {
"H:mm:ss zzzz",
"H:mm:ss z",
"H:mm:ss",
"H:mm",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"a.m.",
"p.m.",
}
},
};
}
}

2
jdk/src/jdk.localedata/share/classes/sun/text/resources/cs/FormatData_cs_CZ.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/cs/CZ/FormatData_cs_CZ.java
View File

@ -41,7 +41,7 @@
*
*/
package sun.text.resources.cs;
package sun.text.resources.cs.CZ;
import sun.util.resources.ParallelListResourceBundle;

349
jdk/src/jdk.localedata/share/classes/sun/text/resources/cs/JavaTimeSupplementary_cs.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -26,37 +26,41 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
* the Terms of Use in http://www.unicode.org/copyright.html.
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of the Unicode data files and any associated documentation (the "Data
* Files") or Unicode software and any associated documentation (the
* "Software") to deal in the Data Files or Software without restriction,
* including without limitation the rights to use, copy, modify, merge,
* publish, distribute, and/or sell copies of the Data Files or Software, and
* to permit persons to whom the Data Files or Software are furnished to do so,
* provided that (a) the above copyright notice(s) and this permission notice
* appear with all copies of the Data Files or Software, (b) both the above
* copyright notice(s) and this permission notice appear in associated
* documentation, and (c) there is clear notice in each modified Data File or
* in the Software as well as in the documentation associated with the Data
* File(s) or Software that the data or software has been modified.
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of the Unicode data files and any associated documentation
* (the "Data Files") or Unicode software and any associated documentation
* (the "Software") to deal in the Data Files or Software
* without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, and/or sell copies of
* the Data Files or Software, and to permit persons to whom the Data Files
* or Software are furnished to do so, provided that
* (a) this copyright and permission notice appear with all copies
* of the Data Files or Software,
* (b) this copyright and permission notice appear in associated
* documentation, and
* (c) there is clear notice in each modified Data File or in the Software
* as well as in the documentation associated with the Data File(s) or
* Software that the data or software has been modified.
*
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
* KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR
* CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
* ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT OF THIRD PARTY RIGHTS.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
* NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
* DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THE DATA FILES OR SOFTWARE.
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THE DATA FILES OR SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder shall not
* be used in advertising or otherwise to promote the sale, use or other
* dealings in these Data Files or Software without prior written authorization
* of the copyright holder.
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in these Data Files or Software without prior
* written authorization of the copyright holder.
*/
// Note: this file has been generated by a tool.
@ -69,14 +73,6 @@ public class JavaTimeSupplementary_cs extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
return new Object[][] {
{ "QuarterAbbreviations",
new String[] {
"Q1",
"Q2",
"Q3",
"Q4",
}
},
{ "QuarterNames",
new String[] {
"1. \u010dtvrtlet\u00ed",
@ -85,14 +81,6 @@ public class JavaTimeSupplementary_cs extends OpenListResourceBundle {
"4. \u010dtvrtlet\u00ed",
}
},
{ "QuarterNarrows",
new String[] {
"1",
"2",
"3",
"4",
}
},
{ "calendarname.buddhist",
"Buddhistick\u00fd kalend\u00e1\u0159" },
{ "calendarname.gregorian",
@ -103,14 +91,12 @@ public class JavaTimeSupplementary_cs extends OpenListResourceBundle {
"Muslimsk\u00fd kalend\u00e1\u0159" },
{ "calendarname.islamic-civil",
"Muslimsk\u00fd ob\u010dansk\u00fd kalend\u00e1\u0159" },
{ "calendarname.islamicc",
"Muslimsk\u00fd ob\u010dansk\u00fd kalend\u00e1\u0159" },
{ "calendarname.japanese",
"Japonsk\u00fd kalend\u00e1\u0159" },
{ "calendarname.roc",
"Kalend\u00e1\u0159 \u010c\u00ednsk\u00e9 republiky" },
{ "field.dayperiod",
"AM/PM" },
"dop./odp." },
{ "field.era",
"Letopo\u010det" },
{ "field.hour",
@ -129,9 +115,138 @@ public class JavaTimeSupplementary_cs extends OpenListResourceBundle {
"Rok" },
{ "field.zone",
"\u010casov\u00e9 p\u00e1smo" },
{ "islamic.AmPmMarkers",
new String[] {
"dopoledne",
"odpoledne",
}
},
{ "islamic.DatePatterns",
new String[] {
"EEEE d. MMMM y GGGG",
"d. MMMM y GGGG",
"d. M. y GGGG",
"dd.MM.yy G",
}
},
{ "islamic.DayAbbreviations",
new String[] {
"ne",
"po",
"\u00fat",
"st",
"\u010dt",
"p\u00e1",
"so",
}
},
{ "islamic.DayNames",
new String[] {
"ned\u011ble",
"pond\u011bl\u00ed",
"\u00fater\u00fd",
"st\u0159eda",
"\u010dtvrtek",
"p\u00e1tek",
"sobota",
}
},
{ "islamic.DayNarrows",
new String[] {
"N",
"P",
"\u00da",
"S",
"\u010c",
"P",
"S",
}
},
{ "islamic.Eras",
new String[] {
"",
"AH",
}
},
{ "islamic.QuarterAbbreviations",
new String[] {
"Q1",
"Q2",
"Q3",
"Q4",
}
},
{ "islamic.QuarterNames",
new String[] {
"1. \u010dtvrtlet\u00ed",
"2. \u010dtvrtlet\u00ed",
"3. \u010dtvrtlet\u00ed",
"4. \u010dtvrtlet\u00ed",
}
},
{ "islamic.QuarterNarrows",
new String[] {
"1",
"2",
"3",
"4",
}
},
{ "islamic.TimePatterns",
new String[] {
"H:mm:ss zzzz",
"H:mm:ss z",
"H:mm:ss",
"H:mm",
}
},
{ "islamic.long.Eras",
new String[] {
"",
"AH",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"dop.",
"odp.",
}
},
{ "islamic.narrow.Eras",
new String[] {
"",
"AH",
}
},
{ "islamic.short.Eras",
new String[] {
"",
"AH",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"EEEE, d. MMMM y G",
"EEEE d. MMMM y G",
"d. MMMM y G",
"d. M. y G",
"dd.MM.yy GGGGG",
}
},
{ "java.time.buddhist.long.Eras",
new String[] {
"BC",
"BE",
}
},
{ "java.time.buddhist.short.Eras",
new String[] {
"BC",
"BE",
}
},
{ "java.time.islamic.DatePatterns",
new String[] {
"EEEE d. MMMM y G",
"d. MMMM y G",
"d. M. y G",
"dd.MM.yy GGGGG",
@ -139,7 +254,7 @@ public class JavaTimeSupplementary_cs extends OpenListResourceBundle {
},
{ "java.time.japanese.DatePatterns",
new String[] {
"EEEE d. MMMM y G",
"EEEE, d. MMMM y G",
"d. MMMM y G",
"d. M. y G",
"dd.MM.yy GGGGG",
@ -153,7 +268,7 @@ public class JavaTimeSupplementary_cs extends OpenListResourceBundle {
},
{ "java.time.roc.DatePatterns",
new String[] {
"EEEE, d. MMMM y G",
"EEEE d. MMMM y G",
"d. MMMM y G",
"d. M. y G",
"dd.MM.yy GGGGG",
@ -165,20 +280,152 @@ public class JavaTimeSupplementary_cs extends OpenListResourceBundle {
"po Kr.",
}
},
{ "roc.AmPmMarkers",
new String[] {
"dopoledne",
"odpoledne",
}
},
{ "roc.DatePatterns",
new String[] {
"EEEE, d. MMMM y GGGG",
"EEEE d. MMMM y GGGG",
"d. MMMM y GGGG",
"d. M. y GGGG",
"dd.MM.yy G",
}
},
{ "roc.DayAbbreviations",
new String[] {
"ne",
"po",
"\u00fat",
"st",
"\u010dt",
"p\u00e1",
"so",
}
},
{ "roc.DayNames",
new String[] {
"ned\u011ble",
"pond\u011bl\u00ed",
"\u00fater\u00fd",
"st\u0159eda",
"\u010dtvrtek",
"p\u00e1tek",
"sobota",
}
},
{ "roc.DayNarrows",
new String[] {
"N",
"P",
"\u00da",
"S",
"\u010c",
"P",
"S",
}
},
{ "roc.Eras",
new String[] {
"P\u0159ed R. O. C.",
"",
}
},
{ "roc.MonthAbbreviations",
new String[] {
"led",
"\u00fano",
"b\u0159e",
"dub",
"kv\u011b",
"\u010dvn",
"\u010dvc",
"srp",
"z\u00e1\u0159",
"\u0159\u00edj",
"lis",
"pro",
"",
}
},
{ "roc.MonthNames",
new String[] {
"ledna",
"\u00fanora",
"b\u0159ezna",
"dubna",
"kv\u011btna",
"\u010dervna",
"\u010dervence",
"srpna",
"z\u00e1\u0159\u00ed",
"\u0159\u00edjna",
"listopadu",
"prosince",
"",
}
},
{ "roc.MonthNarrows",
new String[] {
"1",
"2",
"3",
"4",
"5",
"6",
"7",
"8",
"9",
"10",
"11",
"12",
"",
}
},
{ "roc.QuarterAbbreviations",
new String[] {
"Q1",
"Q2",
"Q3",
"Q4",
}
},
{ "roc.QuarterNames",
new String[] {
"1. \u010dtvrtlet\u00ed",
"2. \u010dtvrtlet\u00ed",
"3. \u010dtvrtlet\u00ed",
"4. \u010dtvrtlet\u00ed",
}
},
{ "roc.TimePatterns",
new String[] {
"H:mm:ss zzzz",
"H:mm:ss z",
"H:mm:ss",
"H:mm",
}
},
{ "roc.long.Eras",
new String[] {
"P\u0159ed R. O. C.",
"",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"dop.",
"odp.",
}
},
{ "roc.narrow.Eras",
new String[] {
"P\u0159ed R. O. C.",
"",
}
},
{ "roc.short.Eras",
new String[] {
"P\u0159ed R. O. C.",

2
jdk/src/jdk.localedata/share/classes/sun/text/resources/da/FormatData_da_DK.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/da/DK/FormatData_da_DK.java
View File

@ -41,7 +41,7 @@
*
*/
package sun.text.resources.da;
package sun.text.resources.da.DK;
import sun.util.resources.ParallelListResourceBundle;

361
jdk/src/jdk.localedata/share/classes/sun/text/resources/da/JavaTimeSupplementary_da.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -26,37 +26,41 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
* the Terms of Use in http://www.unicode.org/copyright.html.
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of the Unicode data files and any associated documentation (the "Data
* Files") or Unicode software and any associated documentation (the
* "Software") to deal in the Data Files or Software without restriction,
* including without limitation the rights to use, copy, modify, merge,
* publish, distribute, and/or sell copies of the Data Files or Software, and
* to permit persons to whom the Data Files or Software are furnished to do so,
* provided that (a) the above copyright notice(s) and this permission notice
* appear with all copies of the Data Files or Software, (b) both the above
* copyright notice(s) and this permission notice appear in associated
* documentation, and (c) there is clear notice in each modified Data File or
* in the Software as well as in the documentation associated with the Data
* File(s) or Software that the data or software has been modified.
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of the Unicode data files and any associated documentation
* (the "Data Files") or Unicode software and any associated documentation
* (the "Software") to deal in the Data Files or Software
* without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, and/or sell copies of
* the Data Files or Software, and to permit persons to whom the Data Files
* or Software are furnished to do so, provided that
* (a) this copyright and permission notice appear with all copies
* of the Data Files or Software,
* (b) this copyright and permission notice appear in associated
* documentation, and
* (c) there is clear notice in each modified Data File or in the Software
* as well as in the documentation associated with the Data File(s) or
* Software that the data or software has been modified.
*
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
* KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR
* CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
* ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT OF THIRD PARTY RIGHTS.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
* NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
* DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THE DATA FILES OR SOFTWARE.
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THE DATA FILES OR SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder shall not
* be used in advertising or otherwise to promote the sale, use or other
* dealings in these Data Files or Software without prior written authorization
* of the copyright holder.
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in these Data Files or Software without prior
* written authorization of the copyright holder.
*/
// Note: this file has been generated by a tool.
@ -68,13 +72,17 @@ import sun.util.resources.OpenListResourceBundle;
public class JavaTimeSupplementary_da extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
final String[] javatimelongEras = {
"f.Kr.",
"e.Kr.",
};
return new Object[][] {
{ "QuarterAbbreviations",
new String[] {
"K1",
"K2",
"K3",
"K4",
"1. kvt.",
"2. kvt.",
"3. kvt.",
"4. kvt.",
}
},
{ "QuarterNames",
@ -85,14 +93,6 @@ public class JavaTimeSupplementary_da extends OpenListResourceBundle {
"4. kvartal",
}
},
{ "QuarterNarrows",
new String[] {
"1",
"2",
"3",
"4",
}
},
{ "calendarname.buddhist",
"buddhistisk kalender" },
{ "calendarname.gregorian",
@ -103,38 +103,127 @@ public class JavaTimeSupplementary_da extends OpenListResourceBundle {
"islamisk kalender" },
{ "calendarname.islamic-civil",
"verdslig islamisk kalender" },
{ "calendarname.islamicc",
"verdslig islamisk kalender" },
{ "calendarname.islamic-umalqura",
"islamisk kalender (Umm al-Qura)" },
{ "calendarname.japanese",
"japansk kalender" },
{ "calendarname.roc",
"kalender for Republikken Kina" },
{ "field.dayperiod",
"dagtid" },
"AM/PM" },
{ "field.era",
"\u00e6ra" },
"\u00c6ra" },
{ "field.hour",
"time" },
"Time" },
{ "field.minute",
"minut" },
"Minut" },
{ "field.month",
"m\u00e5ned" },
"M\u00e5ned" },
{ "field.second",
"sekund" },
"Sekund" },
{ "field.week",
"uge" },
"Uge" },
{ "field.weekday",
"ugedag" },
"Ugedag" },
{ "field.year",
"\u00e5r" },
"\u00c5r" },
{ "field.zone",
"tidszone" },
"Tidszone" },
{ "islamic.DatePatterns",
new String[] {
"EEEE d. MMMM y GGGG",
"d. MMMM y GGGG",
"d. MMM y GGGG",
"d/M/y GGGG",
"d/M/y",
}
},
{ "islamic.DayAbbreviations",
new String[] {
"s\u00f8n.",
"man.",
"tir.",
"ons.",
"tor.",
"fre.",
"l\u00f8r.",
}
},
{ "islamic.DayNames",
new String[] {
"s\u00f8ndag",
"mandag",
"tirsdag",
"onsdag",
"torsdag",
"fredag",
"l\u00f8rdag",
}
},
{ "islamic.DayNarrows",
new String[] {
"S",
"M",
"T",
"O",
"T",
"F",
"L",
}
},
{ "islamic.Eras",
new String[] {
"",
"AH",
}
},
{ "islamic.QuarterAbbreviations",
new String[] {
"1. kvt.",
"2. kvt.",
"3. kvt.",
"4. kvt.",
}
},
{ "islamic.QuarterNames",
new String[] {
"1. kvartal",
"2. kvartal",
"3. kvartal",
"4. kvartal",
}
},
{ "islamic.QuarterNarrows",
new String[] {
"1",
"2",
"3",
"4",
}
},
{ "islamic.TimePatterns",
new String[] {
"HH.mm.ss zzzz",
"HH.mm.ss z",
"HH.mm.ss",
"HH.mm",
}
},
{ "islamic.long.Eras",
new String[] {
"",
"AH",
}
},
{ "islamic.narrow.Eras",
new String[] {
"",
"AH",
}
},
{ "islamic.short.Eras",
new String[] {
"",
"AH",
}
},
{ "java.time.buddhist.DatePatterns",
@ -142,7 +231,19 @@ public class JavaTimeSupplementary_da extends OpenListResourceBundle {
"EEEE d. MMMM y G",
"d. MMMM y G",
"d. MMM y G",
"d/M/yyyy",
"d/M/y",
}
},
{ "java.time.buddhist.long.Eras",
new String[] {
"BC",
"BE",
}
},
{ "java.time.buddhist.short.Eras",
new String[] {
"BC",
"BE",
}
},
{ "java.time.islamic.DatePatterns",
@ -150,7 +251,7 @@ public class JavaTimeSupplementary_da extends OpenListResourceBundle {
"EEEE d. MMMM y G",
"d. MMMM y G",
"d. MMM y G",
"d/M/y G",
"d/M/y",
}
},
{ "java.time.japanese.DatePatterns",
@ -158,35 +259,159 @@ public class JavaTimeSupplementary_da extends OpenListResourceBundle {
"EEEE d. MMMM y G",
"d. MMMM y G",
"d. MMM y G",
"d/M/y GGGGG",
"d/M/y",
}
},
{ "java.time.long.Eras",
new String[] {
"f.Kr.",
"e.Kr.",
}
},
javatimelongEras },
{ "java.time.roc.DatePatterns",
new String[] {
"EEEE d. MMMM y G",
"d. MMMM y G",
"d. MMM y G",
"d/M/y GGGGG",
"d/M/y",
}
},
{ "java.time.short.Eras",
new String[] {
"f.Kr.",
"e.Kr.",
}
},
javatimelongEras },
{ "roc.DatePatterns",
new String[] {
"EEEE d. MMMM y GGGG",
"d. MMMM y GGGG",
"d. MMM y GGGG",
"d/M/y G",
"d/M/y",
}
},
{ "roc.DayAbbreviations",
new String[] {
"s\u00f8n.",
"man.",
"tir.",
"ons.",
"tor.",
"fre.",
"l\u00f8r.",
}
},
{ "roc.DayNames",
new String[] {
"s\u00f8ndag",
"mandag",
"tirsdag",
"onsdag",
"torsdag",
"fredag",
"l\u00f8rdag",
}
},
{ "roc.DayNarrows",
new String[] {
"S",
"M",
"T",
"O",
"T",
"F",
"L",
}
},
{ "roc.Eras",
new String[] {
"Before R.O.C.",
"Minguo",
}
},
{ "roc.MonthAbbreviations",
new String[] {
"jan.",
"feb.",
"mar.",
"apr.",
"maj",
"jun.",
"jul.",
"aug.",
"sep.",
"okt.",
"nov.",
"dec.",
"",
}
},
{ "roc.MonthNames",
new String[] {
"januar",
"februar",
"marts",
"april",
"maj",
"juni",
"juli",
"august",
"september",
"oktober",
"november",
"december",
"",
}
},
{ "roc.MonthNarrows",
new String[] {
"J",
"F",
"M",
"A",
"M",
"J",
"J",
"A",
"S",
"O",
"N",
"D",
"",
}
},
{ "roc.QuarterAbbreviations",
new String[] {
"1. kvt.",
"2. kvt.",
"3. kvt.",
"4. kvt.",
}
},
{ "roc.QuarterNames",
new String[] {
"1. kvartal",
"2. kvartal",
"3. kvartal",
"4. kvartal",
}
},
{ "roc.TimePatterns",
new String[] {
"HH.mm.ss zzzz",
"HH.mm.ss z",
"HH.mm.ss",
"HH.mm",
}
},
{ "roc.long.Eras",
new String[] {
"Before R.O.C.",
"Minguo",
}
},
{ "roc.narrow.Eras",
new String[] {
"Before R.O.C.",
"Minguo",
}
},
{ "roc.short.Eras",
new String[] {
"Before R.O.C.",
"Minguo",
}
},
};

2
jdk/src/jdk.localedata/share/classes/sun/text/resources/de/FormatData_de_AT.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/de/AT/FormatData_de_AT.java
View File

@ -41,7 +41,7 @@
*
*/
package sun.text.resources.de;
package sun.text.resources.de.AT;
import sun.util.resources.ParallelListResourceBundle;

112
jdk/src/jdk.localedata/share/classes/sun/text/resources/de/AT/JavaTimeSupplementary_de_AT.java Normal file
View File

@ -0,0 +1,112 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of the Unicode data files and any associated documentation
* (the "Data Files") or Unicode software and any associated documentation
* (the "Software") to deal in the Data Files or Software
* without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, and/or sell copies of
* the Data Files or Software, and to permit persons to whom the Data Files
* or Software are furnished to do so, provided that
* (a) this copyright and permission notice appear with all copies
* of the Data Files or Software,
* (b) this copyright and permission notice appear in associated
* documentation, and
* (c) there is clear notice in each modified Data File or in the Software
* as well as in the documentation associated with the Data File(s) or
* Software that the data or software has been modified.
*
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
* ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT OF THIRD PARTY RIGHTS.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
* NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
* DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THE DATA FILES OR SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in these Data Files or Software without prior
* written authorization of the copyright holder.
*/
// Note: this file has been generated by a tool.
package sun.text.resources.de.AT;
import sun.util.resources.OpenListResourceBundle;
public class JavaTimeSupplementary_de_AT extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
return new Object[][] {
{ "roc.MonthAbbreviations",
new String[] {
"J\u00e4n.",
"Feb.",
"M\u00e4rz",
"Apr.",
"Mai",
"Juni",
"Juli",
"Aug.",
"Sep.",
"Okt.",
"Nov.",
"Dez.",
"",
}
},
{ "roc.MonthNames",
new String[] {
"J\u00e4nner",
"Februar",
"M\u00e4rz",
"April",
"Mai",
"Juni",
"Juli",
"August",
"September",
"Oktober",
"November",
"Dezember",
"",
}
},
};
}
}

2
jdk/src/jdk.localedata/share/classes/sun/text/resources/de/FormatData_de_CH.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/de/CH/FormatData_de_CH.java
View File

@ -41,7 +41,7 @@
*
*/
package sun.text.resources.de;
package sun.text.resources.de.CH;
import sun.util.resources.ParallelListResourceBundle;

2
jdk/src/jdk.localedata/share/classes/sun/text/resources/de/FormatData_de_DE.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/de/DE/FormatData_de_DE.java
View File

@ -41,7 +41,7 @@
*
*/
package sun.text.resources.de;
package sun.text.resources.de.DE;
import sun.util.resources.ParallelListResourceBundle;

387
jdk/src/jdk.localedata/share/classes/sun/text/resources/de/JavaTimeSupplementary_de.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -26,37 +26,41 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
* the Terms of Use in http://www.unicode.org/copyright.html.
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of the Unicode data files and any associated documentation (the "Data
* Files") or Unicode software and any associated documentation (the
* "Software") to deal in the Data Files or Software without restriction,
* including without limitation the rights to use, copy, modify, merge,
* publish, distribute, and/or sell copies of the Data Files or Software, and
* to permit persons to whom the Data Files or Software are furnished to do so,
* provided that (a) the above copyright notice(s) and this permission notice
* appear with all copies of the Data Files or Software, (b) both the above
* copyright notice(s) and this permission notice appear in associated
* documentation, and (c) there is clear notice in each modified Data File or
* in the Software as well as in the documentation associated with the Data
* File(s) or Software that the data or software has been modified.
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of the Unicode data files and any associated documentation
* (the "Data Files") or Unicode software and any associated documentation
* (the "Software") to deal in the Data Files or Software
* without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, and/or sell copies of
* the Data Files or Software, and to permit persons to whom the Data Files
* or Software are furnished to do so, provided that
* (a) this copyright and permission notice appear with all copies
* of the Data Files or Software,
* (b) this copyright and permission notice appear in associated
* documentation, and
* (c) there is clear notice in each modified Data File or in the Software
* as well as in the documentation associated with the Data File(s) or
* Software that the data or software has been modified.
*
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
* KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR
* CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
* ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT OF THIRD PARTY RIGHTS.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
* NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
* DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THE DATA FILES OR SOFTWARE.
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THE DATA FILES OR SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder shall not
* be used in advertising or otherwise to promote the sale, use or other
* dealings in these Data Files or Software without prior written authorization
* of the copyright holder.
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in these Data Files or Software without prior
* written authorization of the copyright holder.
*/
// Note: this file has been generated by a tool.
@ -68,15 +72,11 @@ import sun.util.resources.OpenListResourceBundle;
public class JavaTimeSupplementary_de extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
final String[] javatimelongEras = {
"v. Chr.",
"n. Chr.",
};
return new Object[][] {
{ "QuarterAbbreviations",
new String[] {
"Q1",
"Q2",
"Q3",
"Q4",
}
},
{ "QuarterNames",
new String[] {
"1. Quartal",
@ -85,14 +85,6 @@ public class JavaTimeSupplementary_de extends OpenListResourceBundle {
"4. Quartal",
}
},
{ "QuarterNarrows",
new String[] {
"1",
"2",
"3",
"4",
}
},
{ "calendarname.buddhist",
"Buddhistischer Kalender" },
{ "calendarname.gregorian",
@ -103,8 +95,8 @@ public class JavaTimeSupplementary_de extends OpenListResourceBundle {
"Islamischer Kalender" },
{ "calendarname.islamic-civil",
"B\u00fcrgerlicher islamischer Kalender" },
{ "calendarname.islamicc",
"B\u00fcrgerlicher islamischer Kalender" },
{ "calendarname.islamic-umalqura",
"Islamischer Kalender (Umm al-Qura" },
{ "calendarname.japanese",
"Japanischer Kalender" },
{ "calendarname.roc",
@ -115,8 +107,6 @@ public class JavaTimeSupplementary_de extends OpenListResourceBundle {
"Epoche" },
{ "field.hour",
"Stunde" },
{ "field.minute",
"Minute" },
{ "field.month",
"Monat" },
{ "field.second",
@ -128,65 +118,314 @@ public class JavaTimeSupplementary_de extends OpenListResourceBundle {
{ "field.year",
"Jahr" },
{ "field.zone",
"Zone" },
"Zeitzone" },
{ "islamic.AmPmMarkers",
new String[] {
"vorm.",
"nachm.",
}
},
{ "islamic.DatePatterns",
new String[] {
"EEEE d. MMMM y GGGG",
"EEEE, d. MMMM y GGGG",
"d. MMMM y GGGG",
"d. MMM y GGGG",
"d.M.y GGGG",
"dd.MM.y GGGG",
"dd.MM.yy G",
}
},
{ "islamic.DayAbbreviations",
new String[] {
"So.",
"Mo.",
"Di.",
"Mi.",
"Do.",
"Fr.",
"Sa.",
}
},
{ "islamic.DayNames",
new String[] {
"Sonntag",
"Montag",
"Dienstag",
"Mittwoch",
"Donnerstag",
"Freitag",
"Samstag",
}
},
{ "islamic.DayNarrows",
new String[] {
"S",
"M",
"D",
"M",
"D",
"F",
"S",
}
},
{ "islamic.Eras",
new String[] {
"",
"AH",
}
},
{ "islamic.QuarterAbbreviations",
new String[] {
"Q1",
"Q2",
"Q3",
"Q4",
}
},
{ "islamic.QuarterNames",
new String[] {
"1. Quartal",
"2. Quartal",
"3. Quartal",
"4. Quartal",
}
},
{ "islamic.QuarterNarrows",
new String[] {
"1",
"2",
"3",
"4",
}
},
{ "islamic.TimePatterns",
new String[] {
"HH:mm:ss zzzz",
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
}
},
{ "islamic.long.Eras",
new String[] {
"",
"AH",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"vm.",
"nm.",
}
},
{ "islamic.narrow.Eras",
new String[] {
"",
"AH",
}
},
{ "islamic.short.Eras",
new String[] {
"",
"AH",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"EEEE d. MMMM y G",
"EEEE, d. MMMM y G",
"d. MMMM y G",
"d. MMM y G",
"d.M.yyyy",
"dd.MM.y G",
"dd.MM.yy GGGGG",
}
},
{ "java.time.buddhist.long.Eras",
new String[] {
"BC",
"BE",
}
},
{ "java.time.buddhist.short.Eras",
new String[] {
"BC",
"BE",
}
},
{ "java.time.islamic.DatePatterns",
new String[] {
"EEEE d. MMMM y G",
"EEEE, d. MMMM y G",
"d. MMMM y G",
"d. MMM y G",
"d.M.y G",
"dd.MM.y G",
"dd.MM.yy GGGGG",
}
},
{ "java.time.japanese.DatePatterns",
new String[] {
"EEEE d. MMMM y G",
"EEEE, d. MMMM y G",
"d. MMMM y G",
"d. MMM y G",
"d.M.y GGGGG",
"dd.MM.y G",
"dd.MM.yy GGGGG",
}
},
{ "java.time.long.Eras",
new String[] {
"v. Chr.",
"n. Chr.",
}
},
javatimelongEras },
{ "java.time.roc.DatePatterns",
new String[] {
"EEEE d. MMMM y G",
"EEEE, d. MMMM y G",
"d. MMMM y G",
"d. MMM y G",
"d.M.y GGGGG",
"dd.MM.y G",
"dd.MM.yy GGGGG",
}
},
{ "java.time.short.Eras",
javatimelongEras },
{ "roc.AmPmMarkers",
new String[] {
"v. Chr.",
"n. Chr.",
"vorm.",
"nachm.",
}
},
{ "roc.DatePatterns",
new String[] {
"EEEE d. MMMM y GGGG",
"EEEE, d. MMMM y GGGG",
"d. MMMM y GGGG",
"d. MMM y GGGG",
"d.M.y G",
"dd.MM.y GGGG",
"dd.MM.yy G",
}
},
{ "roc.DayAbbreviations",
new String[] {
"So.",
"Mo.",
"Di.",
"Mi.",
"Do.",
"Fr.",
"Sa.",
}
},
{ "roc.DayNames",
new String[] {
"Sonntag",
"Montag",
"Dienstag",
"Mittwoch",
"Donnerstag",
"Freitag",
"Samstag",
}
},
{ "roc.DayNarrows",
new String[] {
"S",
"M",
"D",
"M",
"D",
"F",
"S",
}
},
{ "roc.Eras",
new String[] {
"Before R.O.C.",
"Minguo",
}
},
{ "roc.MonthAbbreviations",
new String[] {
"Jan.",
"Feb.",
"M\u00e4rz",
"Apr.",
"Mai",
"Juni",
"Juli",
"Aug.",
"Sep.",
"Okt.",
"Nov.",
"Dez.",
"",
}
},
{ "roc.MonthNames",
new String[] {
"Januar",
"Februar",
"M\u00e4rz",
"April",
"Mai",
"Juni",
"Juli",
"August",
"September",
"Oktober",
"November",
"Dezember",
"",
}
},
{ "roc.MonthNarrows",
new String[] {
"J",
"F",
"M",
"A",
"M",
"J",
"J",
"A",
"S",
"O",
"N",
"D",
"",
}
},
{ "roc.QuarterAbbreviations",
new String[] {
"Q1",
"Q2",
"Q3",
"Q4",
}
},
{ "roc.QuarterNames",
new String[] {
"1. Quartal",
"2. Quartal",
"3. Quartal",
"4. Quartal",
}
},
{ "roc.TimePatterns",
new String[] {
"HH:mm:ss zzzz",
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
}
},
{ "roc.long.Eras",
new String[] {
"Before R.O.C.",
"Minguo",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"vm.",
"nm.",
}
},
{ "roc.narrow.Eras",
new String[] {
"Before R.O.C.",
"Minguo",
}
},
{ "roc.short.Eras",
new String[] {
"Before R.O.C.",
"Minguo",
}
},
};

2
jdk/src/jdk.localedata/share/classes/sun/text/resources/de/FormatData_de_LU.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/de/LU/FormatData_de_LU.java
View File

@ -38,7 +38,7 @@
*
*/
package sun.text.resources.de;
package sun.text.resources.de.LU;
import sun.util.resources.ParallelListResourceBundle;

2
jdk/src/jdk.localedata/share/classes/sun/text/resources/el/FormatData_el_CY.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/el/CY/FormatData_el_CY.java
View File

@ -59,7 +59,7 @@
* authorization of the copyright holder.
*/
package sun.text.resources.el;
package sun.text.resources.el.CY;
import sun.util.resources.ParallelListResourceBundle;

2
jdk/src/jdk.localedata/share/classes/sun/text/resources/el/FormatData_el_GR.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/el/GR/FormatData_el_GR.java
View File

@ -38,7 +38,7 @@
*
*/
package sun.text.resources.el;
package sun.text.resources.el.GR;
import sun.util.resources.ParallelListResourceBundle;

339
jdk/src/jdk.localedata/share/classes/sun/text/resources/el/JavaTimeSupplementary_el.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -26,37 +26,41 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
* the Terms of Use in http://www.unicode.org/copyright.html.
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of the Unicode data files and any associated documentation (the "Data
* Files") or Unicode software and any associated documentation (the
* "Software") to deal in the Data Files or Software without restriction,
* including without limitation the rights to use, copy, modify, merge,
* publish, distribute, and/or sell copies of the Data Files or Software, and
* to permit persons to whom the Data Files or Software are furnished to do so,
* provided that (a) the above copyright notice(s) and this permission notice
* appear with all copies of the Data Files or Software, (b) both the above
* copyright notice(s) and this permission notice appear in associated
* documentation, and (c) there is clear notice in each modified Data File or
* in the Software as well as in the documentation associated with the Data
* File(s) or Software that the data or software has been modified.
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of the Unicode data files and any associated documentation
* (the "Data Files") or Unicode software and any associated documentation
* (the "Software") to deal in the Data Files or Software
* without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, and/or sell copies of
* the Data Files or Software, and to permit persons to whom the Data Files
* or Software are furnished to do so, provided that
* (a) this copyright and permission notice appear with all copies
* of the Data Files or Software,
* (b) this copyright and permission notice appear in associated
* documentation, and
* (c) there is clear notice in each modified Data File or in the Software
* as well as in the documentation associated with the Data File(s) or
* Software that the data or software has been modified.
*
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
* KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR
* CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
* ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT OF THIRD PARTY RIGHTS.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
* NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
* DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THE DATA FILES OR SOFTWARE.
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THE DATA FILES OR SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder shall not
* be used in advertising or otherwise to promote the sale, use or other
* dealings in these Data Files or Software without prior written authorization
* of the copyright holder.
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in these Data Files or Software without prior
* written authorization of the copyright holder.
*/
// Note: this file has been generated by a tool.
@ -85,14 +89,6 @@ public class JavaTimeSupplementary_el extends OpenListResourceBundle {
"4\u03bf \u03c4\u03c1\u03af\u03bc\u03b7\u03bd\u03bf",
}
},
{ "QuarterNarrows",
new String[] {
"1",
"2",
"3",
"4",
}
},
{ "calendarname.buddhist",
"\u0392\u03bf\u03c5\u03b4\u03b9\u03c3\u03c4\u03b9\u03ba\u03cc \u03b7\u03bc\u03b5\u03c1\u03bf\u03bb\u03cc\u03b3\u03b9\u03bf" },
{ "calendarname.gregorian",
@ -103,8 +99,6 @@ public class JavaTimeSupplementary_el extends OpenListResourceBundle {
"\u0399\u03c3\u03bb\u03b1\u03bc\u03b9\u03ba\u03cc \u03b7\u03bc\u03b5\u03c1\u03bf\u03bb\u03cc\u03b3\u03b9\u03bf" },
{ "calendarname.islamic-civil",
"\u0399\u03c3\u03bb\u03b1\u03bc\u03b9\u03ba\u03cc \u03b1\u03c3\u03c4\u03b9\u03ba\u03cc \u03b7\u03bc\u03b5\u03c1\u03bf\u03bb\u03cc\u03b3\u03b9\u03bf" },
{ "calendarname.islamicc",
"\u0399\u03c3\u03bb\u03b1\u03bc\u03b9\u03ba\u03cc \u03b1\u03c3\u03c4\u03b9\u03ba\u03cc \u03b7\u03bc\u03b5\u03c1\u03bf\u03bb\u03cc\u03b3\u03b9\u03bf" },
{ "calendarname.japanese",
"\u0399\u03b1\u03c0\u03c9\u03bd\u03b9\u03ba\u03cc \u03b7\u03bc\u03b5\u03c1\u03bf\u03bb\u03cc\u03b3\u03b9\u03bf" },
{ "calendarname.roc",
@ -128,13 +122,118 @@ public class JavaTimeSupplementary_el extends OpenListResourceBundle {
{ "field.year",
"\u0388\u03c4\u03bf\u03c2" },
{ "field.zone",
"\u0396\u03ce\u03bd\u03b7" },
"\u0396\u03ce\u03bd\u03b7 \u03ce\u03c1\u03b1\u03c2" },
{ "islamic.AmPmMarkers",
new String[] {
"\u03c0.\u03bc.",
"\u03bc.\u03bc.",
}
},
{ "islamic.DatePatterns",
new String[] {
"EEEE, d MMMM y GGGG",
"d MMMM y GGGG",
"d MMM y GGGG",
"d/M/y G",
}
},
{ "islamic.DayAbbreviations",
new String[] {
"\u039a\u03c5\u03c1",
"\u0394\u03b5\u03c5",
"\u03a4\u03c1\u03af",
"\u03a4\u03b5\u03c4",
"\u03a0\u03ad\u03bc",
"\u03a0\u03b1\u03c1",
"\u03a3\u03ac\u03b2",
}
},
{ "islamic.DayNames",
new String[] {
"\u039a\u03c5\u03c1\u03b9\u03b1\u03ba\u03ae",
"\u0394\u03b5\u03c5\u03c4\u03ad\u03c1\u03b1",
"\u03a4\u03c1\u03af\u03c4\u03b7",
"\u03a4\u03b5\u03c4\u03ac\u03c1\u03c4\u03b7",
"\u03a0\u03ad\u03bc\u03c0\u03c4\u03b7",
"\u03a0\u03b1\u03c1\u03b1\u03c3\u03ba\u03b5\u03c5\u03ae",
"\u03a3\u03ac\u03b2\u03b2\u03b1\u03c4\u03bf",
}
},
{ "islamic.DayNarrows",
new String[] {
"\u039a",
"\u0394",
"\u03a4",
"\u03a4",
"\u03a0",
"\u03a0",
"\u03a3",
}
},
{ "islamic.QuarterAbbreviations",
new String[] {
"\u03a41",
"\u03a42",
"\u03a43",
"\u03a44",
}
},
{ "islamic.QuarterNames",
new String[] {
"1\u03bf \u03c4\u03c1\u03af\u03bc\u03b7\u03bd\u03bf",
"2\u03bf \u03c4\u03c1\u03af\u03bc\u03b7\u03bd\u03bf",
"3\u03bf \u03c4\u03c1\u03af\u03bc\u03b7\u03bd\u03bf",
"4\u03bf \u03c4\u03c1\u03af\u03bc\u03b7\u03bd\u03bf",
}
},
{ "islamic.QuarterNarrows",
new String[] {
"1",
"2",
"3",
"4",
}
},
{ "islamic.TimePatterns",
new String[] {
"h:mm:ss a zzzz",
"h:mm:ss a z",
"h:mm:ss a",
"h:mm a",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"\u03c0",
"\u03bc",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"EEEE, d MMMM, y G",
"d MMMM, y G",
"d MMM, y G",
"d/M/yyyy",
"EEEE, d MMMM y G",
"d MMMM y G",
"d MMM y G",
"d/M/y GGGGG",
}
},
{ "java.time.buddhist.long.Eras",
new String[] {
"BC",
"BE",
}
},
{ "java.time.buddhist.short.Eras",
new String[] {
"BC",
"BE",
}
},
{ "java.time.islamic.DatePatterns",
new String[] {
"EEEE, d MMMM y G",
"d MMMM y G",
"d MMM y G",
"d/M/y GGGGG",
}
},
{ "java.time.japanese.DatePatterns",
@ -145,12 +244,18 @@ public class JavaTimeSupplementary_el extends OpenListResourceBundle {
"d/M/yy",
}
},
{ "java.time.long.Eras",
new String[] {
"\u03c0\u03c1\u03bf \u03a7\u03c1\u03b9\u03c3\u03c4\u03bf\u03cd",
"\u03bc\u03b5\u03c4\u03ac \u03a7\u03c1\u03b9\u03c3\u03c4\u03cc\u03bd",
}
},
{ "java.time.roc.DatePatterns",
new String[] {
"EEEE, d MMMM, y G",
"d MMMM, y G",
"d MMM, y G",
"d/M/y G",
"EEEE, d MMMM y G",
"d MMMM y G",
"d MMM y G",
"d/M/y GGGGG",
}
},
{ "java.time.short.Eras",
@ -159,12 +264,51 @@ public class JavaTimeSupplementary_el extends OpenListResourceBundle {
"\u03bc.\u03a7.",
}
},
{ "roc.AmPmMarkers",
new String[] {
"\u03c0.\u03bc.",
"\u03bc.\u03bc.",
}
},
{ "roc.DatePatterns",
new String[] {
"EEEE, d MMMM, y GGGG",
"d MMMM, y GGGG",
"d MMM, y GGGG",
"d/M/y GGGG",
"EEEE, d MMMM y GGGG",
"d MMMM y GGGG",
"d MMM y GGGG",
"d/M/y G",
}
},
{ "roc.DayAbbreviations",
new String[] {
"\u039a\u03c5\u03c1",
"\u0394\u03b5\u03c5",
"\u03a4\u03c1\u03af",
"\u03a4\u03b5\u03c4",
"\u03a0\u03ad\u03bc",
"\u03a0\u03b1\u03c1",
"\u03a3\u03ac\u03b2",
}
},
{ "roc.DayNames",
new String[] {
"\u039a\u03c5\u03c1\u03b9\u03b1\u03ba\u03ae",
"\u0394\u03b5\u03c5\u03c4\u03ad\u03c1\u03b1",
"\u03a4\u03c1\u03af\u03c4\u03b7",
"\u03a4\u03b5\u03c4\u03ac\u03c1\u03c4\u03b7",
"\u03a0\u03ad\u03bc\u03c0\u03c4\u03b7",
"\u03a0\u03b1\u03c1\u03b1\u03c3\u03ba\u03b5\u03c5\u03ae",
"\u03a3\u03ac\u03b2\u03b2\u03b1\u03c4\u03bf",
}
},
{ "roc.DayNarrows",
new String[] {
"\u039a",
"\u0394",
"\u03a4",
"\u03a4",
"\u03a0",
"\u03a0",
"\u03a3",
}
},
{ "roc.Eras",
@ -173,6 +317,99 @@ public class JavaTimeSupplementary_el extends OpenListResourceBundle {
"R.O.C.",
}
},
{ "roc.MonthAbbreviations",
new String[] {
"\u0399\u03b1\u03bd",
"\u03a6\u03b5\u03b2",
"\u039c\u03b1\u03c1",
"\u0391\u03c0\u03c1",
"\u039c\u03b1\u0390",
"\u0399\u03bf\u03c5\u03bd",
"\u0399\u03bf\u03c5\u03bb",
"\u0391\u03c5\u03b3",
"\u03a3\u03b5\u03c0",
"\u039f\u03ba\u03c4",
"\u039d\u03bf\u03b5",
"\u0394\u03b5\u03ba",
"",
}
},
{ "roc.MonthNames",
new String[] {
"\u0399\u03b1\u03bd\u03bf\u03c5\u03b1\u03c1\u03af\u03bf\u03c5",
"\u03a6\u03b5\u03b2\u03c1\u03bf\u03c5\u03b1\u03c1\u03af\u03bf\u03c5",
"\u039c\u03b1\u03c1\u03c4\u03af\u03bf\u03c5",
"\u0391\u03c0\u03c1\u03b9\u03bb\u03af\u03bf\u03c5",
"\u039c\u03b1\u0390\u03bf\u03c5",
"\u0399\u03bf\u03c5\u03bd\u03af\u03bf\u03c5",
"\u0399\u03bf\u03c5\u03bb\u03af\u03bf\u03c5",
"\u0391\u03c5\u03b3\u03bf\u03cd\u03c3\u03c4\u03bf\u03c5",
"\u03a3\u03b5\u03c0\u03c4\u03b5\u03bc\u03b2\u03c1\u03af\u03bf\u03c5",
"\u039f\u03ba\u03c4\u03c9\u03b2\u03c1\u03af\u03bf\u03c5",
"\u039d\u03bf\u03b5\u03bc\u03b2\u03c1\u03af\u03bf\u03c5",
"\u0394\u03b5\u03ba\u03b5\u03bc\u03b2\u03c1\u03af\u03bf\u03c5",
"",
}
},
{ "roc.MonthNarrows",
new String[] {
"\u0399",
"\u03a6",
"\u039c",
"\u0391",
"\u039c",
"\u0399",
"\u0399",
"\u0391",
"\u03a3",
"\u039f",
"\u039d",
"\u0394",
"",
}
},
{ "roc.QuarterAbbreviations",
new String[] {
"\u03a41",
"\u03a42",
"\u03a43",
"\u03a44",
}
},
{ "roc.QuarterNames",
new String[] {
"1\u03bf \u03c4\u03c1\u03af\u03bc\u03b7\u03bd\u03bf",
"2\u03bf \u03c4\u03c1\u03af\u03bc\u03b7\u03bd\u03bf",
"3\u03bf \u03c4\u03c1\u03af\u03bc\u03b7\u03bd\u03bf",
"4\u03bf \u03c4\u03c1\u03af\u03bc\u03b7\u03bd\u03bf",
}
},
{ "roc.TimePatterns",
new String[] {
"h:mm:ss a zzzz",
"h:mm:ss a z",
"h:mm:ss a",
"h:mm a",
}
},
{ "roc.long.Eras",
new String[] {
"\u03a0\u03c1\u03b9\u03bd R.O.C.",
"R.O.C.",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"\u03c0",
"\u03bc",
}
},
{ "roc.narrow.Eras",
new String[] {
"\u03a0\u03c1\u03b9\u03bd R.O.C.",
"R.O.C.",
}
},
{ "roc.short.Eras",
new String[] {
"\u03a0\u03c1\u03b9\u03bd R.O.C.",

2
jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_AU.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/en/AU/FormatData_en_AU.java
View File

@ -38,7 +38,7 @@
*
*/
package sun.text.resources.en;
package sun.text.resources.en.AU;
import sun.util.resources.ParallelListResourceBundle;

126
jdk/src/jdk.localedata/share/classes/sun/text/resources/en/AU/JavaTimeSupplementary_en_AU.java Normal file
View File

@ -0,0 +1,126 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of the Unicode data files and any associated documentation
* (the "Data Files") or Unicode software and any associated documentation
* (the "Software") to deal in the Data Files or Software
* without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, and/or sell copies of
* the Data Files or Software, and to permit persons to whom the Data Files
* or Software are furnished to do so, provided that
* (a) this copyright and permission notice appear with all copies
* of the Data Files or Software,
* (b) this copyright and permission notice appear in associated
* documentation, and
* (c) there is clear notice in each modified Data File or in the Software
* as well as in the documentation associated with the Data File(s) or
* Software that the data or software has been modified.
*
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
* ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT OF THIRD PARTY RIGHTS.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
* NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
* DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THE DATA FILES OR SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in these Data Files or Software without prior
* written authorization of the copyright holder.
*/
// Note: this file has been generated by a tool.
package sun.text.resources.en.AU;
import sun.util.resources.OpenListResourceBundle;
public class JavaTimeSupplementary_en_AU extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
return new Object[][] {
{ "islamic.DatePatterns",
new String[] {
"GGGG y MMMM d, EEEE",
"GGGG y MMMM d",
"GGGG y MMM d",
"d/MM/y G",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"G y MMMM d, EEEE",
"G y MMMM d",
"G y MMM d",
"d/MM/y GGGGG",
}
},
{ "java.time.islamic.DatePatterns",
new String[] {
"G y MMMM d, EEEE",
"G y MMMM d",
"G y MMM d",
"d/MM/y GGGGG",
}
},
{ "java.time.japanese.DatePatterns",
new String[] {
"EEEE, MMMM d, y G",
"MMMM d, y G",
"MMM d, y G",
"d/MM/y GGGGG",
}
},
{ "java.time.roc.DatePatterns",
new String[] {
"G y MMMM d, EEEE",
"G y MMMM d",
"G y MMM d",
"d/MM/y GGGGG",
}
},
{ "roc.DatePatterns",
new String[] {
"GGGG y MMMM d, EEEE",
"GGGG y MMMM d",
"GGGG y MMM d",
"d/MM/y G",
}
},
};
}
}

2
jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_CA.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/en/CA/FormatData_en_CA.java
View File

@ -38,7 +38,7 @@
*
*/
package sun.text.resources.en;
package sun.text.resources.en.CA;
import sun.util.resources.ParallelListResourceBundle;

126
jdk/src/jdk.localedata/share/classes/sun/text/resources/en/CA/JavaTimeSupplementary_en_CA.java Normal file
View File

@ -0,0 +1,126 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of the Unicode data files and any associated documentation
* (the "Data Files") or Unicode software and any associated documentation
* (the "Software") to deal in the Data Files or Software
* without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, and/or sell copies of
* the Data Files or Software, and to permit persons to whom the Data Files
* or Software are furnished to do so, provided that
* (a) this copyright and permission notice appear with all copies
* of the Data Files or Software,
* (b) this copyright and permission notice appear in associated
* documentation, and
* (c) there is clear notice in each modified Data File or in the Software
* as well as in the documentation associated with the Data File(s) or
* Software that the data or software has been modified.
*
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
* ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT OF THIRD PARTY RIGHTS.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
* NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
* DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THE DATA FILES OR SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in these Data Files or Software without prior
* written authorization of the copyright holder.
*/
// Note: this file has been generated by a tool.
package sun.text.resources.en.CA;
import sun.util.resources.OpenListResourceBundle;
public class JavaTimeSupplementary_en_CA extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
return new Object[][] {
{ "islamic.DatePatterns",
new String[] {
"EEEE, MMMM d, y GGGG",
"MMMM d, y GGGG",
"MMM d, y GGGG",
"G y-MM-dd",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"EEEE, MMMM d, y G",
"MMMM d, y G",
"MMM d, y G",
"GGGGG y-MM-dd",
}
},
{ "java.time.islamic.DatePatterns",
new String[] {
"EEEE, MMMM d, y G",
"MMMM d, y G",
"MMM d, y G",
"GGGGG y-MM-dd",
}
},
{ "java.time.japanese.DatePatterns",
new String[] {
"EEEE, MMMM d, y G",
"MMMM d, y G",
"MMM d, y G",
"GGGGG y-MM-dd",
}
},
{ "java.time.roc.DatePatterns",
new String[] {
"EEEE, MMMM d, y G",
"MMMM d, y G",
"MMM d, y G",
"GGGGG y-MM-dd",
}
},
{ "roc.DatePatterns",
new String[] {
"EEEE, MMMM d, y GGGG",
"MMMM d, y GGGG",
"MMM d, y GGGG",
"G y-MM-dd",
}
},
};
}
}

2
jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_GB.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/en/GB/FormatData_en_GB.java
View File

@ -38,7 +38,7 @@
*
*/
package sun.text.resources.en;
package sun.text.resources.en.GB;
import sun.util.resources.ParallelListResourceBundle;

108
jdk/src/jdk.localedata/share/classes/sun/text/resources/en/GB/JavaTimeSupplementary_en_GB.java Normal file
View File

@ -0,0 +1,108 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of the Unicode data files and any associated documentation
* (the "Data Files") or Unicode software and any associated documentation
* (the "Software") to deal in the Data Files or Software
* without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, and/or sell copies of
* the Data Files or Software, and to permit persons to whom the Data Files
* or Software are furnished to do so, provided that
* (a) this copyright and permission notice appear with all copies
* of the Data Files or Software,
* (b) this copyright and permission notice appear in associated
* documentation, and
* (c) there is clear notice in each modified Data File or in the Software
* as well as in the documentation associated with the Data File(s) or
* Software that the data or software has been modified.
*
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
* ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT OF THIRD PARTY RIGHTS.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
* NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
* DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THE DATA FILES OR SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in these Data Files or Software without prior
* written authorization of the copyright holder.
*/
// Note: this file has been generated by a tool.
package sun.text.resources.en.GB;
import sun.util.resources.OpenListResourceBundle;
public class JavaTimeSupplementary_en_GB extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
return new Object[][] {
{ "field.dayperiod",
"a.m./p.m." },
{ "islamic.AmPmMarkers",
new String[] {
"a.m.",
"p.m.",
}
},
{ "islamic.TimePatterns",
new String[] {
"HH:mm:ss zzzz",
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
}
},
{ "roc.AmPmMarkers",
new String[] {
"a.m.",
"p.m.",
}
},
{ "roc.TimePatterns",
new String[] {
"HH:mm:ss zzzz",
"HH:mm:ss z",
"HH:mm:ss",
"HH:mm",
}
},
};
}
}

2
jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_IE.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/en/IE/FormatData_en_IE.java
View File

@ -38,7 +38,7 @@
*
*/
package sun.text.resources.en;
package sun.text.resources.en.IE;
import sun.util.resources.ParallelListResourceBundle;

138
jdk/src/jdk.localedata/share/classes/sun/text/resources/en/IE/JavaTimeSupplementary_en_IE.java Normal file
View File

@ -0,0 +1,138 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of the Unicode data files and any associated documentation
* (the "Data Files") or Unicode software and any associated documentation
* (the "Software") to deal in the Data Files or Software
* without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, and/or sell copies of
* the Data Files or Software, and to permit persons to whom the Data Files
* or Software are furnished to do so, provided that
* (a) this copyright and permission notice appear with all copies
* of the Data Files or Software,
* (b) this copyright and permission notice appear in associated
* documentation, and
* (c) there is clear notice in each modified Data File or in the Software
* as well as in the documentation associated with the Data File(s) or
* Software that the data or software has been modified.
*
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
* ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT OF THIRD PARTY RIGHTS.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
* NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
* DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THE DATA FILES OR SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in these Data Files or Software without prior
* written authorization of the copyright holder.
*/
// Note: this file has been generated by a tool.
package sun.text.resources.en.IE;
import sun.util.resources.OpenListResourceBundle;
public class JavaTimeSupplementary_en_IE extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
return new Object[][] {
{ "islamic.AmPmMarkers",
new String[] {
"a.m.",
"p.m.",
}
},
{ "islamic.DatePatterns",
new String[] {
"EEEE d MMMM y GGGG",
"GGGG y MMMM d",
"GGGG y MMM d",
"G y-MM-dd",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"EEEE d MMMM y G",
"G y MMMM d",
"G y MMM d",
"GGGGG y-MM-dd",
}
},
{ "java.time.islamic.DatePatterns",
new String[] {
"EEEE d MMMM y G",
"G y MMMM d",
"G y MMM d",
"GGGGG y-MM-dd",
}
},
{ "java.time.japanese.DatePatterns",
new String[] {
"EEEE d MMMM y G",
"MMMM d, y G",
"MMM d, y G",
"M/d/y GGGGG",
}
},
{ "java.time.roc.DatePatterns",
new String[] {
"EEEE d MMMM y G",
"G y MMMM d",
"G y MMM d",
"GGGGG y-MM-dd",
}
},
{ "roc.AmPmMarkers",
new String[] {
"a.m.",
"p.m.",
}
},
{ "roc.DatePatterns",
new String[] {
"EEEE d MMMM y GGGG",
"GGGG y MMMM d",
"GGGG y MMM d",
"G y-MM-dd",
}
},
};
}
}

2
jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_IN.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/en/IN/FormatData_en_IN.java
View File

@ -29,7 +29,7 @@
*
*/
package sun.text.resources.en;
package sun.text.resources.en.IN;
import sun.util.resources.ParallelListResourceBundle;

126
jdk/src/jdk.localedata/share/classes/sun/text/resources/en/IN/JavaTimeSupplementary_en_IN.java Normal file
View File

@ -0,0 +1,126 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of the Unicode data files and any associated documentation
* (the "Data Files") or Unicode software and any associated documentation
* (the "Software") to deal in the Data Files or Software
* without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, and/or sell copies of
* the Data Files or Software, and to permit persons to whom the Data Files
* or Software are furnished to do so, provided that
* (a) this copyright and permission notice appear with all copies
* of the Data Files or Software,
* (b) this copyright and permission notice appear in associated
* documentation, and
* (c) there is clear notice in each modified Data File or in the Software
* as well as in the documentation associated with the Data File(s) or
* Software that the data or software has been modified.
*
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
* ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT OF THIRD PARTY RIGHTS.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
* NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
* DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THE DATA FILES OR SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in these Data Files or Software without prior
* written authorization of the copyright holder.
*/
// Note: this file has been generated by a tool.
package sun.text.resources.en.IN;
import sun.util.resources.OpenListResourceBundle;
public class JavaTimeSupplementary_en_IN extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
return new Object[][] {
{ "islamic.DatePatterns",
new String[] {
"EEEE d MMMM y GGGG",
"GGGG y MMMM d",
"dd-MMM-y GGGG",
"G y-MM-dd",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"EEEE d MMMM y G",
"G y MMMM d",
"dd-MMM-y G",
"GGGGG y-MM-dd",
}
},
{ "java.time.islamic.DatePatterns",
new String[] {
"EEEE d MMMM y G",
"G y MMMM d",
"dd-MMM-y G",
"GGGGG y-MM-dd",
}
},
{ "java.time.japanese.DatePatterns",
new String[] {
"EEEE d MMMM y G",
"MMMM d, y G",
"dd-MMM-y G",
"M/d/y GGGGG",
}
},
{ "java.time.roc.DatePatterns",
new String[] {
"EEEE d MMMM y G",
"G y MMMM d",
"dd-MMM-y G",
"GGGGG y-MM-dd",
}
},
{ "roc.DatePatterns",
new String[] {
"EEEE d MMMM y GGGG",
"GGGG y MMMM d",
"dd-MMM-y GGGG",
"G y-MM-dd",
}
},
};
}
}

2
jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_MT.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/en/MT/FormatData_en_MT.java
View File

@ -59,7 +59,7 @@
* authorization of the copyright holder.
*/
package sun.text.resources.en;
package sun.text.resources.en.MT;
import sun.util.resources.ParallelListResourceBundle;

126
jdk/src/jdk.localedata/share/classes/sun/text/resources/en/MT/JavaTimeSupplementary_en_MT.java Normal file
View File

@ -0,0 +1,126 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of the Unicode data files and any associated documentation
* (the "Data Files") or Unicode software and any associated documentation
* (the "Software") to deal in the Data Files or Software
* without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, and/or sell copies of
* the Data Files or Software, and to permit persons to whom the Data Files
* or Software are furnished to do so, provided that
* (a) this copyright and permission notice appear with all copies
* of the Data Files or Software,
* (b) this copyright and permission notice appear in associated
* documentation, and
* (c) there is clear notice in each modified Data File or in the Software
* as well as in the documentation associated with the Data File(s) or
* Software that the data or software has been modified.
*
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
* ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT OF THIRD PARTY RIGHTS.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
* NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
* DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THE DATA FILES OR SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in these Data Files or Software without prior
* written authorization of the copyright holder.
*/
// Note: this file has been generated by a tool.
package sun.text.resources.en.MT;
import sun.util.resources.OpenListResourceBundle;
public class JavaTimeSupplementary_en_MT extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
return new Object[][] {
{ "islamic.DatePatterns",
new String[] {
"GGGG y MMMM d, EEEE",
"dd MMMM y GGGG",
"dd MMM y GGGG",
"G y-MM-dd",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"G y MMMM d, EEEE",
"dd MMMM y G",
"dd MMM y G",
"GGGGG y-MM-dd",
}
},
{ "java.time.islamic.DatePatterns",
new String[] {
"G y MMMM d, EEEE",
"dd MMMM y G",
"dd MMM y G",
"GGGGG y-MM-dd",
}
},
{ "java.time.japanese.DatePatterns",
new String[] {
"EEEE, MMMM d, y G",
"dd MMMM y G",
"dd MMM y G",
"M/d/y GGGGG",
}
},
{ "java.time.roc.DatePatterns",
new String[] {
"G y MMMM d, EEEE",
"dd MMMM y G",
"dd MMM y G",
"GGGGG y-MM-dd",
}
},
{ "roc.DatePatterns",
new String[] {
"GGGG y MMMM d, EEEE",
"dd MMMM y GGGG",
"dd MMM y GGGG",
"G y-MM-dd",
}
},
};
}
}

2
jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_NZ.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/en/NZ/FormatData_en_NZ.java
View File

@ -38,7 +38,7 @@
*
*/
package sun.text.resources.en;
package sun.text.resources.en.NZ;
import sun.util.resources.ParallelListResourceBundle;

126
jdk/src/jdk.localedata/share/classes/sun/text/resources/en/NZ/JavaTimeSupplementary_en_NZ.java Normal file
View File

@ -0,0 +1,126 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of the Unicode data files and any associated documentation
* (the "Data Files") or Unicode software and any associated documentation
* (the "Software") to deal in the Data Files or Software
* without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, and/or sell copies of
* the Data Files or Software, and to permit persons to whom the Data Files
* or Software are furnished to do so, provided that
* (a) this copyright and permission notice appear with all copies
* of the Data Files or Software,
* (b) this copyright and permission notice appear in associated
* documentation, and
* (c) there is clear notice in each modified Data File or in the Software
* as well as in the documentation associated with the Data File(s) or
* Software that the data or software has been modified.
*
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
* ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT OF THIRD PARTY RIGHTS.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
* NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
* DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THE DATA FILES OR SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in these Data Files or Software without prior
* written authorization of the copyright holder.
*/
// Note: this file has been generated by a tool.
package sun.text.resources.en.NZ;
import sun.util.resources.OpenListResourceBundle;
public class JavaTimeSupplementary_en_NZ extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
return new Object[][] {
{ "islamic.DatePatterns",
new String[] {
"GGGG y MMMM d, EEEE",
"GGGG y MMMM d",
"d/MM/y GGGG",
"d/MM/y G",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"G y MMMM d, EEEE",
"G y MMMM d",
"d/MM/y G",
"d/MM/y GGGGG",
}
},
{ "java.time.islamic.DatePatterns",
new String[] {
"G y MMMM d, EEEE",
"G y MMMM d",
"d/MM/y G",
"d/MM/y GGGGG",
}
},
{ "java.time.japanese.DatePatterns",
new String[] {
"EEEE, MMMM d, y G",
"MMMM d, y G",
"d/MM/y G",
"d/MM/y GGGGG",
}
},
{ "java.time.roc.DatePatterns",
new String[] {
"G y MMMM d, EEEE",
"G y MMMM d",
"d/MM/y G",
"d/MM/y GGGGG",
}
},
{ "roc.DatePatterns",
new String[] {
"GGGG y MMMM d, EEEE",
"GGGG y MMMM d",
"d/MM/y GGGG",
"d/MM/y G",
}
},
};
}
}

2
jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_PH.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/en/PH/FormatData_en_PH.java
View File

@ -59,7 +59,7 @@
* authorization of the copyright holder.
*/
package sun.text.resources.en;
package sun.text.resources.en.PH;
import sun.util.resources.ParallelListResourceBundle;

2
jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_SG.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/en/SG/FormatData_en_SG.java
View File

@ -59,7 +59,7 @@
* authorization of the copyright holder.
*/
package sun.text.resources.en;
package sun.text.resources.en.SG;
import sun.util.resources.ParallelListResourceBundle;

126
jdk/src/jdk.localedata/share/classes/sun/text/resources/en/SG/JavaTimeSupplementary_en_SG.java Normal file
View File

@ -0,0 +1,126 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of the Unicode data files and any associated documentation
* (the "Data Files") or Unicode software and any associated documentation
* (the "Software") to deal in the Data Files or Software
* without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, and/or sell copies of
* the Data Files or Software, and to permit persons to whom the Data Files
* or Software are furnished to do so, provided that
* (a) this copyright and permission notice appear with all copies
* of the Data Files or Software,
* (b) this copyright and permission notice appear in associated
* documentation, and
* (c) there is clear notice in each modified Data File or in the Software
* as well as in the documentation associated with the Data File(s) or
* Software that the data or software has been modified.
*
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
* ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT OF THIRD PARTY RIGHTS.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
* NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
* DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THE DATA FILES OR SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in these Data Files or Software without prior
* written authorization of the copyright holder.
*/
// Note: this file has been generated by a tool.
package sun.text.resources.en.SG;
import sun.util.resources.OpenListResourceBundle;
public class JavaTimeSupplementary_en_SG extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
return new Object[][] {
{ "islamic.DatePatterns",
new String[] {
"GGGG y MMMM d, EEEE",
"GGGG y MMMM d",
"GGGG y MMM d",
"d/M/yy G",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"G y MMMM d, EEEE",
"G y MMMM d",
"G y MMM d",
"d/M/yy GGGGG",
}
},
{ "java.time.islamic.DatePatterns",
new String[] {
"G y MMMM d, EEEE",
"G y MMMM d",
"G y MMM d",
"d/M/yy GGGGG",
}
},
{ "java.time.japanese.DatePatterns",
new String[] {
"EEEE, MMMM d, y G",
"MMMM d, y G",
"MMM d, y G",
"d/M/yy GGGGG",
}
},
{ "java.time.roc.DatePatterns",
new String[] {
"G y MMMM d, EEEE",
"G y MMMM d",
"G y MMM d",
"d/M/yy GGGGG",
}
},
{ "roc.DatePatterns",
new String[] {
"GGGG y MMMM d, EEEE",
"GGGG y MMMM d",
"GGGG y MMM d",
"d/M/yy G",
}
},
};
}
}

2
jdk/src/java.base/share/classes/sun/text/resources/en/FormatData_en_ZA.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/en/ZA/FormatData_en_ZA.java
View File

@ -38,7 +38,7 @@
*
*/
package sun.text.resources.en;
package sun.text.resources.en.ZA;
import sun.util.resources.ParallelListResourceBundle;

126
jdk/src/jdk.localedata/share/classes/sun/text/resources/en/ZA/JavaTimeSupplementary_en_ZA.java Normal file
View File

@ -0,0 +1,126 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of the Unicode data files and any associated documentation
* (the "Data Files") or Unicode software and any associated documentation
* (the "Software") to deal in the Data Files or Software
* without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, and/or sell copies of
* the Data Files or Software, and to permit persons to whom the Data Files
* or Software are furnished to do so, provided that
* (a) this copyright and permission notice appear with all copies
* of the Data Files or Software,
* (b) this copyright and permission notice appear in associated
* documentation, and
* (c) there is clear notice in each modified Data File or in the Software
* as well as in the documentation associated with the Data File(s) or
* Software that the data or software has been modified.
*
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
* ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT OF THIRD PARTY RIGHTS.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
* NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
* DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THE DATA FILES OR SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in these Data Files or Software without prior
* written authorization of the copyright holder.
*/
// Note: this file has been generated by a tool.
package sun.text.resources.en.ZA;
import sun.util.resources.OpenListResourceBundle;
public class JavaTimeSupplementary_en_ZA extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
return new Object[][] {
{ "islamic.DatePatterns",
new String[] {
"EEEE, dd MMMM y GGGG",
"dd MMMM y GGGG",
"dd MMM y GGGG",
"G y/MM/dd",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"EEEE, dd MMMM y G",
"dd MMMM y G",
"dd MMM y G",
"GGGGG y/MM/dd",
}
},
{ "java.time.islamic.DatePatterns",
new String[] {
"EEEE, dd MMMM y G",
"dd MMMM y G",
"dd MMM y G",
"GGGGG y/MM/dd",
}
},
{ "java.time.japanese.DatePatterns",
new String[] {
"EEEE, dd MMMM y G",
"dd MMMM y G",
"dd MMM y G",
"GGGGG y/MM/dd",
}
},
{ "java.time.roc.DatePatterns",
new String[] {
"EEEE, dd MMMM y G",
"dd MMMM y G",
"dd MMM y G",
"GGGGG y/MM/dd",
}
},
{ "roc.DatePatterns",
new String[] {
"EEEE, dd MMMM y GGGG",
"dd MMMM y GGGG",
"dd MMM y GGGG",
"G y/MM/dd",
}
},
};
}
}

2
jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_AR.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/es/AR/FormatData_es_AR.java
View File

@ -38,7 +38,7 @@
*
*/
package sun.text.resources.es;
package sun.text.resources.es.AR;
import sun.util.resources.ParallelListResourceBundle;

2
jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_BO.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/es/BO/FormatData_es_BO.java
View File

@ -38,7 +38,7 @@
*
*/
package sun.text.resources.es;
package sun.text.resources.es.BO;
import sun.util.resources.ParallelListResourceBundle;

2
jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_CL.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/es/CL/FormatData_es_CL.java
View File

@ -38,7 +38,7 @@
*
*/
package sun.text.resources.es;
package sun.text.resources.es.CL;
import sun.util.resources.ParallelListResourceBundle;

126
jdk/src/jdk.localedata/share/classes/sun/text/resources/es/CL/JavaTimeSupplementary_es_CL.java Normal file
View File

@ -0,0 +1,126 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of the Unicode data files and any associated documentation
* (the "Data Files") or Unicode software and any associated documentation
* (the "Software") to deal in the Data Files or Software
* without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, and/or sell copies of
* the Data Files or Software, and to permit persons to whom the Data Files
* or Software are furnished to do so, provided that
* (a) this copyright and permission notice appear with all copies
* of the Data Files or Software,
* (b) this copyright and permission notice appear in associated
* documentation, and
* (c) there is clear notice in each modified Data File or in the Software
* as well as in the documentation associated with the Data File(s) or
* Software that the data or software has been modified.
*
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
* ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT OF THIRD PARTY RIGHTS.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
* NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
* DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THE DATA FILES OR SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in these Data Files or Software without prior
* written authorization of the copyright holder.
*/
// Note: this file has been generated by a tool.
package sun.text.resources.es.CL;
import sun.util.resources.OpenListResourceBundle;
public class JavaTimeSupplementary_es_CL extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
return new Object[][] {
{ "islamic.DatePatterns",
new String[] {
"GGGG y MMMM d, EEEE",
"GGGG y MMMM d",
"dd-MM-y GGGG",
"dd-MM-y G",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"G y MMMM d, EEEE",
"G y MMMM d",
"dd-MM-y G",
"dd-MM-y GGGGG",
}
},
{ "java.time.islamic.DatePatterns",
new String[] {
"G y MMMM d, EEEE",
"G y MMMM d",
"dd-MM-y G",
"dd-MM-y GGGGG",
}
},
{ "java.time.japanese.DatePatterns",
new String[] {
"EEEE, d 'de' MMMM 'de' y G",
"d 'de' MMMM 'de' y G",
"dd-MM-y G",
"dd-MM-y GGGGG",
}
},
{ "java.time.roc.DatePatterns",
new String[] {
"G y MMMM d, EEEE",
"G y MMMM d",
"dd-MM-y G",
"dd-MM-y GGGGG",
}
},
{ "roc.DatePatterns",
new String[] {
"GGGG y MMMM d, EEEE",
"GGGG y MMMM d",
"dd-MM-y GGGG",
"dd-MM-y G",
}
},
};
}
}

2
jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_CO.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/es/CO/FormatData_es_CO.java
View File

@ -38,7 +38,7 @@
*
*/
package sun.text.resources.es;
package sun.text.resources.es.CO;
import sun.util.resources.ParallelListResourceBundle;

138
jdk/src/jdk.localedata/share/classes/sun/text/resources/es/CO/JavaTimeSupplementary_es_CO.java Normal file
View File

@ -0,0 +1,138 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of the Unicode data files and any associated documentation
* (the "Data Files") or Unicode software and any associated documentation
* (the "Software") to deal in the Data Files or Software
* without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, and/or sell copies of
* the Data Files or Software, and to permit persons to whom the Data Files
* or Software are furnished to do so, provided that
* (a) this copyright and permission notice appear with all copies
* of the Data Files or Software,
* (b) this copyright and permission notice appear in associated
* documentation, and
* (c) there is clear notice in each modified Data File or in the Software
* as well as in the documentation associated with the Data File(s) or
* Software that the data or software has been modified.
*
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
* ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT OF THIRD PARTY RIGHTS.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
* NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
* DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THE DATA FILES OR SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in these Data Files or Software without prior
* written authorization of the copyright holder.
*/
// Note: this file has been generated by a tool.
package sun.text.resources.es.CO;
import sun.util.resources.OpenListResourceBundle;
public class JavaTimeSupplementary_es_CO extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
return new Object[][] {
{ "islamic.DatePatterns",
new String[] {
"GGGG y MMMM d, EEEE",
"GGGG y MMMM d",
"d/MM/y GGGG",
"d/MM/yy G",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"a. m.",
"p. m.",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"G y MMMM d, EEEE",
"G y MMMM d",
"d/MM/y G",
"d/MM/yy GGGGG",
}
},
{ "java.time.islamic.DatePatterns",
new String[] {
"G y MMMM d, EEEE",
"G y MMMM d",
"d/MM/y G",
"d/MM/yy GGGGG",
}
},
{ "java.time.japanese.DatePatterns",
new String[] {
"EEEE, d 'de' MMMM 'de' y G",
"d 'de' MMMM 'de' y G",
"d/MM/y G",
"d/MM/yy GGGGG",
}
},
{ "java.time.roc.DatePatterns",
new String[] {
"G y MMMM d, EEEE",
"G y MMMM d",
"d/MM/y G",
"d/MM/yy GGGGG",
}
},
{ "roc.DatePatterns",
new String[] {
"GGGG y MMMM d, EEEE",
"GGGG y MMMM d",
"d/MM/y GGGG",
"d/MM/yy G",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"a. m.",
"p. m.",
}
},
};
}
}

2
jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_CR.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/es/CR/FormatData_es_CR.java
View File

@ -38,7 +38,7 @@
*
*/
package sun.text.resources.es;
package sun.text.resources.es.CR;
import sun.util.resources.ParallelListResourceBundle;

2
jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_DO.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/es/DO/FormatData_es_DO.java
View File

@ -38,7 +38,7 @@
*
*/
package sun.text.resources.es;
package sun.text.resources.es.DO;
import sun.util.resources.ParallelListResourceBundle;

2
jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_EC.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/es/EC/FormatData_es_EC.java
View File

@ -38,7 +38,7 @@
*
*/
package sun.text.resources.es;
package sun.text.resources.es.EC;
import sun.util.resources.ParallelListResourceBundle;

2
jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_ES.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/es/ES/FormatData_es_ES.java
View File

@ -38,7 +38,7 @@
*
*/
package sun.text.resources.es;
package sun.text.resources.es.ES;
import sun.util.resources.ParallelListResourceBundle;

2
jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_GT.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/es/GT/FormatData_es_GT.java
View File

@ -38,7 +38,7 @@
*
*/
package sun.text.resources.es;
package sun.text.resources.es.GT;
import sun.util.resources.ParallelListResourceBundle;

126
jdk/src/jdk.localedata/share/classes/sun/text/resources/es/GT/JavaTimeSupplementary_es_GT.java Normal file
View File

@ -0,0 +1,126 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of the Unicode data files and any associated documentation
* (the "Data Files") or Unicode software and any associated documentation
* (the "Software") to deal in the Data Files or Software
* without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, and/or sell copies of
* the Data Files or Software, and to permit persons to whom the Data Files
* or Software are furnished to do so, provided that
* (a) this copyright and permission notice appear with all copies
* of the Data Files or Software,
* (b) this copyright and permission notice appear in associated
* documentation, and
* (c) there is clear notice in each modified Data File or in the Software
* as well as in the documentation associated with the Data File(s) or
* Software that the data or software has been modified.
*
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
* ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT OF THIRD PARTY RIGHTS.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
* NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
* DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THE DATA FILES OR SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in these Data Files or Software without prior
* written authorization of the copyright holder.
*/
// Note: this file has been generated by a tool.
package sun.text.resources.es.GT;
import sun.util.resources.OpenListResourceBundle;
public class JavaTimeSupplementary_es_GT extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
return new Object[][] {
{ "islamic.DatePatterns",
new String[] {
"GGGG y MMMM d, EEEE",
"GGGG y MMMM d",
"d/MM/y GGGG",
"d/MM/yy G",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"G y MMMM d, EEEE",
"G y MMMM d",
"d/MM/y G",
"d/MM/yy GGGGG",
}
},
{ "java.time.islamic.DatePatterns",
new String[] {
"G y MMMM d, EEEE",
"G y MMMM d",
"d/MM/y G",
"d/MM/yy GGGGG",
}
},
{ "java.time.japanese.DatePatterns",
new String[] {
"EEEE, d 'de' MMMM 'de' y G",
"d 'de' MMMM 'de' y G",
"d/MM/y G",
"d/MM/yy GGGGG",
}
},
{ "java.time.roc.DatePatterns",
new String[] {
"G y MMMM d, EEEE",
"G y MMMM d",
"d/MM/y G",
"d/MM/yy GGGGG",
}
},
{ "roc.DatePatterns",
new String[] {
"GGGG y MMMM d, EEEE",
"GGGG y MMMM d",
"d/MM/y GGGG",
"d/MM/yy G",
}
},
};
}
}

2
jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_HN.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/es/HN/FormatData_es_HN.java
View File

@ -38,7 +38,7 @@
*
*/
package sun.text.resources.es;
package sun.text.resources.es.HN;
import sun.util.resources.ParallelListResourceBundle;

126
jdk/src/jdk.localedata/share/classes/sun/text/resources/es/HN/JavaTimeSupplementary_es_HN.java Normal file
View File

@ -0,0 +1,126 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of the Unicode data files and any associated documentation
* (the "Data Files") or Unicode software and any associated documentation
* (the "Software") to deal in the Data Files or Software
* without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, and/or sell copies of
* the Data Files or Software, and to permit persons to whom the Data Files
* or Software are furnished to do so, provided that
* (a) this copyright and permission notice appear with all copies
* of the Data Files or Software,
* (b) this copyright and permission notice appear in associated
* documentation, and
* (c) there is clear notice in each modified Data File or in the Software
* as well as in the documentation associated with the Data File(s) or
* Software that the data or software has been modified.
*
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
* ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT OF THIRD PARTY RIGHTS.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
* NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
* DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THE DATA FILES OR SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in these Data Files or Software without prior
* written authorization of the copyright holder.
*/
// Note: this file has been generated by a tool.
package sun.text.resources.es.HN;
import sun.util.resources.OpenListResourceBundle;
public class JavaTimeSupplementary_es_HN extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
return new Object[][] {
{ "islamic.DatePatterns",
new String[] {
"EEEE dd 'de' MMMM 'de' y GGGG",
"dd 'de' MMMM 'de' y GGGG",
"GGGG y MMM d",
"G y-MM-dd",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"EEEE dd 'de' MMMM 'de' y G",
"dd 'de' MMMM 'de' y G",
"G y MMM d",
"GGGGG y-MM-dd",
}
},
{ "java.time.islamic.DatePatterns",
new String[] {
"EEEE dd 'de' MMMM 'de' y G",
"dd 'de' MMMM 'de' y G",
"G y MMM d",
"GGGGG y-MM-dd",
}
},
{ "java.time.japanese.DatePatterns",
new String[] {
"EEEE dd 'de' MMMM 'de' y G",
"dd 'de' MMMM 'de' y G",
"dd/MM/y G",
"dd/MM/yy GGGGG",
}
},
{ "java.time.roc.DatePatterns",
new String[] {
"EEEE dd 'de' MMMM 'de' y G",
"dd 'de' MMMM 'de' y G",
"G y MMM d",
"GGGGG y-MM-dd",
}
},
{ "roc.DatePatterns",
new String[] {
"EEEE dd 'de' MMMM 'de' y GGGG",
"dd 'de' MMMM 'de' y GGGG",
"GGGG y MMM d",
"G y-MM-dd",
}
},
};
}
}

349
jdk/src/jdk.localedata/share/classes/sun/text/resources/es/JavaTimeSupplementary_es.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -26,37 +26,41 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
* the Terms of Use in http://www.unicode.org/copyright.html.
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of the Unicode data files and any associated documentation (the "Data
* Files") or Unicode software and any associated documentation (the
* "Software") to deal in the Data Files or Software without restriction,
* including without limitation the rights to use, copy, modify, merge,
* publish, distribute, and/or sell copies of the Data Files or Software, and
* to permit persons to whom the Data Files or Software are furnished to do so,
* provided that (a) the above copyright notice(s) and this permission notice
* appear with all copies of the Data Files or Software, (b) both the above
* copyright notice(s) and this permission notice appear in associated
* documentation, and (c) there is clear notice in each modified Data File or
* in the Software as well as in the documentation associated with the Data
* File(s) or Software that the data or software has been modified.
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of the Unicode data files and any associated documentation
* (the "Data Files") or Unicode software and any associated documentation
* (the "Software") to deal in the Data Files or Software
* without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, and/or sell copies of
* the Data Files or Software, and to permit persons to whom the Data Files
* or Software are furnished to do so, provided that
* (a) this copyright and permission notice appear with all copies
* of the Data Files or Software,
* (b) this copyright and permission notice appear in associated
* documentation, and
* (c) there is clear notice in each modified Data File or in the Software
* as well as in the documentation associated with the Data File(s) or
* Software that the data or software has been modified.
*
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
* KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR
* CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
* ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT OF THIRD PARTY RIGHTS.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
* NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
* DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THE DATA FILES OR SOFTWARE.
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THE DATA FILES OR SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder shall not
* be used in advertising or otherwise to promote the sale, use or other
* dealings in these Data Files or Software without prior written authorization
* of the copyright holder.
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in these Data Files or Software without prior
* written authorization of the copyright holder.
*/
// Note: this file has been generated by a tool.
@ -79,18 +83,10 @@ public class JavaTimeSupplementary_es extends OpenListResourceBundle {
},
{ "QuarterNames",
new String[] {
"1er trimestre",
"2\u00ba trimestre",
"3er trimestre",
"4\u00ba trimestre",
}
},
{ "QuarterNarrows",
new String[] {
"1T",
"2T",
"3T",
"4T",
"1.er trimestre",
"2.\u00ba trimestre",
"3.er trimestre",
"4.\u00ba trimestre",
}
},
{ "calendarname.buddhist",
@ -103,38 +99,127 @@ public class JavaTimeSupplementary_es extends OpenListResourceBundle {
"calendario isl\u00e1mico" },
{ "calendarname.islamic-civil",
"calendario civil isl\u00e1mico" },
{ "calendarname.islamicc",
"calendario civil isl\u00e1mico" },
{ "calendarname.japanese",
"calendario japon\u00e9s" },
{ "calendarname.roc",
"calendario de la Rep\u00fablica de China" },
{ "field.dayperiod",
"periodo del d\u00eda" },
{ "field.era",
"era" },
"a. m./p. m." },
{ "field.hour",
"hora" },
"Hora" },
{ "field.minute",
"minuto" },
"Minuto" },
{ "field.month",
"mes" },
"Mes" },
{ "field.second",
"segundo" },
"Segundo" },
{ "field.week",
"semana" },
"Semana" },
{ "field.weekday",
"d\u00eda de la semana" },
"D\u00eda de la semana" },
{ "field.year",
"a\u00f1o" },
"A\u00f1o" },
{ "field.zone",
"zona" },
"Zona horaria" },
{ "islamic.AmPmMarkers",
new String[] {
"a. m.",
"p. m.",
}
},
{ "islamic.DatePatterns",
new String[] {
"EEEE, d 'de' MMMM 'de' y GGGG",
"d 'de' MMMM 'de' y GGGG",
"dd/MM/y GGGG",
"dd/MM/y GGGG",
"dd/MM/yy G",
}
},
{ "islamic.DayAbbreviations",
new String[] {
"dom.",
"lun.",
"mar.",
"mi\u00e9.",
"jue.",
"vie.",
"s\u00e1b.",
}
},
{ "islamic.DayNames",
new String[] {
"domingo",
"lunes",
"martes",
"mi\u00e9rcoles",
"jueves",
"viernes",
"s\u00e1bado",
}
},
{ "islamic.DayNarrows",
new String[] {
"D",
"L",
"M",
"X",
"J",
"V",
"S",
}
},
{ "islamic.Eras",
new String[] {
"",
"AH",
}
},
{ "islamic.QuarterAbbreviations",
new String[] {
"T1",
"T2",
"T3",
"T4",
}
},
{ "islamic.QuarterNames",
new String[] {
"1.er trimestre",
"2.\u00ba trimestre",
"3.er trimestre",
"4.\u00ba trimestre",
}
},
{ "islamic.TimePatterns",
new String[] {
"H:mm:ss (zzzz)",
"H:mm:ss z",
"H:mm:ss",
"H:mm",
}
},
{ "islamic.long.Eras",
new String[] {
"",
"AH",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"a.m.",
"p.m.",
}
},
{ "islamic.narrow.Eras",
new String[] {
"",
"AH",
}
},
{ "islamic.short.Eras",
new String[] {
"",
"AH",
}
},
{ "java.time.buddhist.DatePatterns",
@ -142,7 +227,19 @@ public class JavaTimeSupplementary_es extends OpenListResourceBundle {
"EEEE, d 'de' MMMM 'de' y G",
"d 'de' MMMM 'de' y G",
"dd/MM/y G",
"dd/MM/y G",
"dd/MM/yy GGGGG",
}
},
{ "java.time.buddhist.long.Eras",
new String[] {
"BC",
"BE",
}
},
{ "java.time.buddhist.short.Eras",
new String[] {
"BC",
"BE",
}
},
{ "java.time.islamic.DatePatterns",
@ -150,7 +247,7 @@ public class JavaTimeSupplementary_es extends OpenListResourceBundle {
"EEEE, d 'de' MMMM 'de' y G",
"d 'de' MMMM 'de' y G",
"dd/MM/y G",
"dd/MM/y G",
"dd/MM/yy GGGGG",
}
},
{ "java.time.japanese.DatePatterns",
@ -158,13 +255,13 @@ public class JavaTimeSupplementary_es extends OpenListResourceBundle {
"EEEE, d 'de' MMMM 'de' y G",
"d 'de' MMMM 'de' y G",
"dd/MM/y G",
"dd/MM/y GGGGG",
"dd/MM/yy GGGGG",
}
},
{ "java.time.long.Eras",
new String[] {
"antes de Cristo",
"anno D\u00f3mini",
"despu\u00e9s de Cristo",
}
},
{ "java.time.roc.DatePatterns",
@ -172,7 +269,7 @@ public class JavaTimeSupplementary_es extends OpenListResourceBundle {
"EEEE, d 'de' MMMM 'de' y G",
"d 'de' MMMM 'de' y G",
"dd/MM/y G",
"dd/MM/y GGGGG",
"dd/MM/yy GGGGG",
}
},
{ "java.time.short.Eras",
@ -181,12 +278,51 @@ public class JavaTimeSupplementary_es extends OpenListResourceBundle {
"anno D\u00f3mini",
}
},
{ "roc.AmPmMarkers",
new String[] {
"a. m.",
"p. m.",
}
},
{ "roc.DatePatterns",
new String[] {
"EEEE, d 'de' MMMM 'de' y GGGG",
"d 'de' MMMM 'de' y GGGG",
"dd/MM/y GGGG",
"dd/MM/y G",
"dd/MM/yy G",
}
},
{ "roc.DayAbbreviations",
new String[] {
"dom.",
"lun.",
"mar.",
"mi\u00e9.",
"jue.",
"vie.",
"s\u00e1b.",
}
},
{ "roc.DayNames",
new String[] {
"domingo",
"lunes",
"martes",
"mi\u00e9rcoles",
"jueves",
"viernes",
"s\u00e1bado",
}
},
{ "roc.DayNarrows",
new String[] {
"D",
"L",
"M",
"X",
"J",
"V",
"S",
}
},
{ "roc.Eras",
@ -195,6 +331,99 @@ public class JavaTimeSupplementary_es extends OpenListResourceBundle {
"",
}
},
{ "roc.MonthAbbreviations",
new String[] {
"ene.",
"feb.",
"mar.",
"abr.",
"may.",
"jun.",
"jul.",
"ago.",
"sept.",
"oct.",
"nov.",
"dic.",
"",
}
},
{ "roc.MonthNames",
new String[] {
"enero",
"febrero",
"marzo",
"abril",
"mayo",
"junio",
"julio",
"agosto",
"septiembre",
"octubre",
"noviembre",
"diciembre",
"",
}
},
{ "roc.MonthNarrows",
new String[] {
"E",
"F",
"M",
"A",
"M",
"J",
"J",
"A",
"S",
"O",
"N",
"D",
"",
}
},
{ "roc.QuarterAbbreviations",
new String[] {
"T1",
"T2",
"T3",
"T4",
}
},
{ "roc.QuarterNames",
new String[] {
"1.er trimestre",
"2.\u00ba trimestre",
"3.er trimestre",
"4.\u00ba trimestre",
}
},
{ "roc.TimePatterns",
new String[] {
"H:mm:ss (zzzz)",
"H:mm:ss z",
"H:mm:ss",
"H:mm",
}
},
{ "roc.long.Eras",
new String[] {
"antes de R.O.C.",
"",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"a.m.",
"p.m.",
}
},
{ "roc.narrow.Eras",
new String[] {
"antes de R.O.C.",
"",
}
},
{ "roc.short.Eras",
new String[] {
"antes de R.O.C.",

2
jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_MX.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/es/MX/FormatData_es_MX.java
View File

@ -38,7 +38,7 @@
*
*/
package sun.text.resources.es;
package sun.text.resources.es.MX;
import sun.util.resources.ParallelListResourceBundle;

259
jdk/src/jdk.localedata/share/classes/sun/text/resources/es/MX/JavaTimeSupplementary_es_MX.java Normal file
View File

@ -0,0 +1,259 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of the Unicode data files and any associated documentation
* (the "Data Files") or Unicode software and any associated documentation
* (the "Software") to deal in the Data Files or Software
* without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, and/or sell copies of
* the Data Files or Software, and to permit persons to whom the Data Files
* or Software are furnished to do so, provided that
* (a) this copyright and permission notice appear with all copies
* of the Data Files or Software,
* (b) this copyright and permission notice appear in associated
* documentation, and
* (c) there is clear notice in each modified Data File or in the Software
* as well as in the documentation associated with the Data File(s) or
* Software that the data or software has been modified.
*
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
* ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT OF THIRD PARTY RIGHTS.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
* NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
* DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THE DATA FILES OR SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in these Data Files or Software without prior
* written authorization of the copyright holder.
*/
// Note: this file has been generated by a tool.
package sun.text.resources.es.MX;
import sun.util.resources.OpenListResourceBundle;
public class JavaTimeSupplementary_es_MX extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
return new Object[][] {
{ "QuarterAbbreviations",
new String[] {
"1er. trim.",
"2\u00ba. trim.",
"3er. trim.",
"4\u00ba trim.",
}
},
{ "QuarterNames",
new String[] {
"1er. trimestre",
"2\u00ba. trimestre",
"3er. trimestre",
"4\u00ba trimestre",
}
},
{ "QuarterNarrows",
new String[] {
"1T",
"2T",
"3T",
"4T",
}
},
{ "calendarname.gregorian",
"Calendario gregoriano" },
{ "calendarname.gregory",
"Calendario gregoriano" },
{ "calendarname.roc",
"calendario minguo" },
{ "field.dayperiod",
"a.m./p.m." },
{ "field.era",
"era" },
{ "islamic.AmPmMarkers",
new String[] {
"a.m.",
"p.m.",
}
},
{ "islamic.DatePatterns",
new String[] {
"GGGG y MMMM d, EEEE",
"GGGG y MMMM d",
"d MMM, y GGGG",
"G y-MM-dd",
}
},
{ "islamic.DayNarrows",
new String[] {
"D",
"L",
"M",
"M",
"J",
"V",
"S",
}
},
{ "islamic.QuarterAbbreviations",
new String[] {
"1er. trim.",
"2\u00ba. trim.",
"3er. trim.",
"4\u00ba trim.",
}
},
{ "islamic.QuarterNames",
new String[] {
"1er. trimestre",
"2\u00ba. trimestre",
"3er. trimestre",
"4\u00ba trimestre",
}
},
{ "islamic.QuarterNarrows",
new String[] {
"1T",
"2T",
"3T",
"4T",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"G y MMMM d, EEEE",
"G y MMMM d",
"d MMM, y G",
"GGGGG y-MM-dd",
}
},
{ "java.time.islamic.DatePatterns",
new String[] {
"G y MMMM d, EEEE",
"G y MMMM d",
"d MMM, y G",
"GGGGG y-MM-dd",
}
},
{ "java.time.japanese.DatePatterns",
new String[] {
"EEEE, d 'de' MMMM 'de' y G",
"d 'de' MMMM 'de' y G",
"d MMM, y G",
"dd/MM/yy GGGGG",
}
},
{ "java.time.roc.DatePatterns",
new String[] {
"G y MMMM d, EEEE",
"G y MMMM d",
"d MMM, y G",
"GGGGG y-MM-dd",
}
},
{ "roc.AmPmMarkers",
new String[] {
"a.m.",
"p.m.",
}
},
{ "roc.DatePatterns",
new String[] {
"GGGG y MMMM d, EEEE",
"GGGG y MMMM d",
"d MMM, y GGGG",
"G y-MM-dd",
}
},
{ "roc.DayNarrows",
new String[] {
"D",
"L",
"M",
"M",
"J",
"V",
"S",
}
},
{ "roc.MonthAbbreviations",
new String[] {
"ene",
"feb",
"mar",
"abr",
"may",
"jun",
"jul",
"ago",
"sep",
"oct",
"nov",
"dic",
"",
}
},
{ "roc.QuarterAbbreviations",
new String[] {
"1er. trim.",
"2\u00ba. trim.",
"3er. trim.",
"4\u00ba trim.",
}
},
{ "roc.QuarterNames",
new String[] {
"1er. trimestre",
"2\u00ba. trimestre",
"3er. trimestre",
"4\u00ba trimestre",
}
},
{ "roc.QuarterNarrows",
new String[] {
"1T",
"2T",
"3T",
"4T",
}
},
};
}
}

2
jdk/src/jdk.localedata/share/classes/sun/text/resources/es/FormatData_es_NI.java → jdk/src/jdk.localedata/share/classes/sun/text/resources/es/NI/FormatData_es_NI.java
View File

@ -38,7 +38,7 @@
*
*/
package sun.text.resources.es;
package sun.text.resources.es.NI;
import sun.util.resources.ParallelListResourceBundle;

Some files were not shown because too many files have changed in this diff Show More