mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-15 14:25:52 +00:00
Bug 1431957 - Move Intl.DateTimeFormat self-hosted code to a new builtin/intl/DateTimeFormat.js file. r=anba
--HG-- rename : js/src/builtin/Intl.js => js/src/builtin/intl/DateTimeFormat.js extra : rebase_source : f4f9cb0099705c99df1a5d93906d5d646e467a4c
This commit is contained in:
parent
72523a946b
commit
d7d15bd1b3
@ -2425,900 +2425,3 @@ function Intl_NumberFormat_resolvedOptions() {
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
/********** Intl.DateTimeFormat **********/
|
||||
|
||||
|
||||
/**
|
||||
* Compute an internal properties object from |lazyDateTimeFormatData|.
|
||||
*/
|
||||
function resolveDateTimeFormatInternals(lazyDateTimeFormatData) {
|
||||
assert(IsObject(lazyDateTimeFormatData), "lazy data not an object?");
|
||||
|
||||
// Lazy DateTimeFormat data has the following structure:
|
||||
//
|
||||
// {
|
||||
// requestedLocales: List of locales,
|
||||
//
|
||||
// localeOpt: // *first* opt computed in InitializeDateTimeFormat
|
||||
// {
|
||||
// localeMatcher: "lookup" / "best fit",
|
||||
//
|
||||
// hour12: true / false, // optional
|
||||
//
|
||||
// hourCycle: "h11" / "h12" / "h23" / "h24", // optional
|
||||
// }
|
||||
//
|
||||
// timeZone: IANA time zone name,
|
||||
//
|
||||
// formatOpt: // *second* opt computed in InitializeDateTimeFormat
|
||||
// {
|
||||
// // all the properties/values listed in Table 3
|
||||
// // (weekday, era, year, month, day, &c.)
|
||||
// }
|
||||
//
|
||||
// formatMatcher: "basic" / "best fit",
|
||||
//
|
||||
// mozExtensions: true / false,
|
||||
//
|
||||
//
|
||||
// // If mozExtensions is true:
|
||||
//
|
||||
// dateStyle: "full" / "long" / "medium" / "short" / undefined,
|
||||
//
|
||||
// timeStyle: "full" / "long" / "medium" / "short" / undefined,
|
||||
//
|
||||
// patternOption:
|
||||
// String representing LDML Date Format pattern or undefined
|
||||
// }
|
||||
//
|
||||
// Note that lazy data is only installed as a final step of initialization,
|
||||
// so every DateTimeFormat lazy data object has *all* these properties,
|
||||
// never a subset of them.
|
||||
|
||||
var internalProps = std_Object_create(null);
|
||||
|
||||
// Compute effective locale.
|
||||
// Step 8.
|
||||
var DateTimeFormat = dateTimeFormatInternalProperties;
|
||||
|
||||
// Step 9.
|
||||
var localeData = DateTimeFormat.localeData;
|
||||
|
||||
// Step 10.
|
||||
var r = ResolveLocale(callFunction(DateTimeFormat.availableLocales, DateTimeFormat),
|
||||
lazyDateTimeFormatData.requestedLocales,
|
||||
lazyDateTimeFormatData.localeOpt,
|
||||
DateTimeFormat.relevantExtensionKeys,
|
||||
localeData);
|
||||
|
||||
// Steps 11-13.
|
||||
internalProps.locale = r.locale;
|
||||
internalProps.calendar = r.ca;
|
||||
internalProps.numberingSystem = r.nu;
|
||||
|
||||
// Compute formatting options.
|
||||
// Step 14.
|
||||
var dataLocale = r.dataLocale;
|
||||
|
||||
// Steps 15-17.
|
||||
internalProps.timeZone = lazyDateTimeFormatData.timeZone;
|
||||
|
||||
// Step 18.
|
||||
var formatOpt = lazyDateTimeFormatData.formatOpt;
|
||||
|
||||
// Copy the hourCycle setting, if present, to the format options. But
|
||||
// only do this if no hour12 option is present, because the latter takes
|
||||
// precedence over hourCycle.
|
||||
if (r.hc !== null && formatOpt.hour12 === undefined)
|
||||
formatOpt.hourCycle = r.hc;
|
||||
|
||||
// Steps 27-28, more or less - see comment after this function.
|
||||
var pattern;
|
||||
if (lazyDateTimeFormatData.mozExtensions) {
|
||||
if (lazyDateTimeFormatData.patternOption !== undefined) {
|
||||
pattern = lazyDateTimeFormatData.patternOption;
|
||||
|
||||
internalProps.patternOption = lazyDateTimeFormatData.patternOption;
|
||||
} else if (lazyDateTimeFormatData.dateStyle || lazyDateTimeFormatData.timeStyle) {
|
||||
pattern = intl_patternForStyle(dataLocale,
|
||||
lazyDateTimeFormatData.dateStyle, lazyDateTimeFormatData.timeStyle,
|
||||
lazyDateTimeFormatData.timeZone);
|
||||
|
||||
internalProps.dateStyle = lazyDateTimeFormatData.dateStyle;
|
||||
internalProps.timeStyle = lazyDateTimeFormatData.timeStyle;
|
||||
} else {
|
||||
pattern = toBestICUPattern(dataLocale, formatOpt);
|
||||
}
|
||||
internalProps.mozExtensions = true;
|
||||
} else {
|
||||
pattern = toBestICUPattern(dataLocale, formatOpt);
|
||||
}
|
||||
|
||||
// If the hourCycle option was set, adjust the resolved pattern to use the
|
||||
// requested hour cycle representation.
|
||||
if (formatOpt.hourCycle !== undefined)
|
||||
pattern = replaceHourRepresentation(pattern, formatOpt.hourCycle);
|
||||
|
||||
// Step 29.
|
||||
internalProps.pattern = pattern;
|
||||
|
||||
// Step 30.
|
||||
internalProps.boundFormat = undefined;
|
||||
|
||||
// The caller is responsible for associating |internalProps| with the right
|
||||
// object using |setInternalProperties|.
|
||||
return internalProps;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Replaces all hour pattern characters in |pattern| to use the matching hour
|
||||
* representation for |hourCycle|.
|
||||
*/
|
||||
function replaceHourRepresentation(pattern, hourCycle) {
|
||||
var hour;
|
||||
switch (hourCycle) {
|
||||
case "h11":
|
||||
hour = "K";
|
||||
break;
|
||||
case "h12":
|
||||
hour = "h";
|
||||
break;
|
||||
case "h23":
|
||||
hour = "H";
|
||||
break;
|
||||
case "h24":
|
||||
hour = "k";
|
||||
break;
|
||||
}
|
||||
assert(hour !== undefined, "Unexpected hourCycle requested: " + hourCycle);
|
||||
|
||||
// Parse the pattern according to the format specified in
|
||||
// https://unicode.org/reports/tr35/tr35-dates.html#Date_Format_Patterns
|
||||
// and replace all hour symbols with |hour|.
|
||||
var resultPattern = "";
|
||||
var inQuote = false;
|
||||
for (var i = 0; i < pattern.length; i++) {
|
||||
var ch = pattern[i];
|
||||
if (ch === "'") {
|
||||
inQuote = !inQuote;
|
||||
} else if (!inQuote && (ch === "h" || ch === "H" || ch === "k" || ch === "K")) {
|
||||
ch = hour;
|
||||
}
|
||||
resultPattern += ch;
|
||||
}
|
||||
|
||||
return resultPattern;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Returns an object containing the DateTimeFormat internal properties of |obj|.
|
||||
*/
|
||||
function getDateTimeFormatInternals(obj) {
|
||||
assert(IsObject(obj), "getDateTimeFormatInternals called with non-object");
|
||||
assert(IsDateTimeFormat(obj), "getDateTimeFormatInternals called with non-DateTimeFormat");
|
||||
|
||||
var internals = getIntlObjectInternals(obj);
|
||||
assert(internals.type === "DateTimeFormat", "bad type escaped getIntlObjectInternals");
|
||||
|
||||
// If internal properties have already been computed, use them.
|
||||
var internalProps = maybeInternalProperties(internals);
|
||||
if (internalProps)
|
||||
return internalProps;
|
||||
|
||||
// Otherwise it's time to fully create them.
|
||||
internalProps = resolveDateTimeFormatInternals(internals.lazyData);
|
||||
setInternalProperties(internals, internalProps);
|
||||
return internalProps;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* UnwrapDateTimeFormat(dtf)
|
||||
*/
|
||||
function UnwrapDateTimeFormat(dtf, methodName) {
|
||||
// Step 1.
|
||||
if (IsObject(dtf) && !IsDateTimeFormat(dtf) && dtf instanceof GetDateTimeFormatConstructor())
|
||||
dtf = dtf[intlFallbackSymbol()];
|
||||
|
||||
// Step 2.
|
||||
if (!IsObject(dtf) || !IsDateTimeFormat(dtf)) {
|
||||
ThrowTypeError(JSMSG_INTL_OBJECT_NOT_INITED, "DateTimeFormat", methodName,
|
||||
"DateTimeFormat");
|
||||
}
|
||||
|
||||
// Step 3.
|
||||
return dtf;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Initializes an object as a DateTimeFormat.
|
||||
*
|
||||
* This method is complicated a moderate bit by its implementing initialization
|
||||
* as a *lazy* concept. Everything that must happen now, does -- but we defer
|
||||
* all the work we can until the object is actually used as a DateTimeFormat.
|
||||
* This later work occurs in |resolveDateTimeFormatInternals|; steps not noted
|
||||
* here occur there.
|
||||
*
|
||||
* Spec: ECMAScript Internationalization API Specification, 12.1.1.
|
||||
*/
|
||||
function InitializeDateTimeFormat(dateTimeFormat, thisValue, locales, options, mozExtensions) {
|
||||
assert(IsObject(dateTimeFormat), "InitializeDateTimeFormat called with non-Object");
|
||||
assert(IsDateTimeFormat(dateTimeFormat),
|
||||
"InitializeDateTimeFormat called with non-DateTimeFormat");
|
||||
|
||||
// Steps 1-2 (These steps are no longer required and should be removed
|
||||
// from the spec; https://github.com/tc39/ecma402/issues/115).
|
||||
|
||||
// Lazy DateTimeFormat data has the following structure:
|
||||
//
|
||||
// {
|
||||
// requestedLocales: List of locales,
|
||||
//
|
||||
// localeOpt: // *first* opt computed in InitializeDateTimeFormat
|
||||
// {
|
||||
// localeMatcher: "lookup" / "best fit",
|
||||
// }
|
||||
//
|
||||
// timeZone: IANA time zone name,
|
||||
//
|
||||
// formatOpt: // *second* opt computed in InitializeDateTimeFormat
|
||||
// {
|
||||
// // all the properties/values listed in Table 3
|
||||
// // (weekday, era, year, month, day, &c.)
|
||||
//
|
||||
// hour12: true / false, // optional
|
||||
// hourCycle: "h11" / "h12" / "h23" / "h24", // optional
|
||||
// }
|
||||
//
|
||||
// formatMatcher: "basic" / "best fit",
|
||||
// }
|
||||
//
|
||||
// Note that lazy data is only installed as a final step of initialization,
|
||||
// so every DateTimeFormat lazy data object has *all* these properties,
|
||||
// never a subset of them.
|
||||
var lazyDateTimeFormatData = std_Object_create(null);
|
||||
|
||||
// Step 1.
|
||||
var requestedLocales = CanonicalizeLocaleList(locales);
|
||||
lazyDateTimeFormatData.requestedLocales = requestedLocales;
|
||||
|
||||
// Step 2.
|
||||
options = ToDateTimeOptions(options, "any", "date");
|
||||
|
||||
// Compute options that impact interpretation of locale.
|
||||
// Step 3.
|
||||
var localeOpt = new Record();
|
||||
lazyDateTimeFormatData.localeOpt = localeOpt;
|
||||
|
||||
// Steps 4-5.
|
||||
var localeMatcher =
|
||||
GetOption(options, "localeMatcher", "string", ["lookup", "best fit"],
|
||||
"best fit");
|
||||
localeOpt.localeMatcher = localeMatcher;
|
||||
|
||||
// Step 6.
|
||||
var hc = GetOption(options, "hourCycle", "string", ["h11", "h12", "h23", "h24"], undefined);
|
||||
localeOpt.hc = hc;
|
||||
|
||||
// Steps 15-18.
|
||||
var tz = options.timeZone;
|
||||
if (tz !== undefined) {
|
||||
// Step 15.a.
|
||||
tz = ToString(tz);
|
||||
|
||||
// Step 15.b.
|
||||
var timeZone = intl_IsValidTimeZoneName(tz);
|
||||
if (timeZone === null)
|
||||
ThrowRangeError(JSMSG_INVALID_TIME_ZONE, tz);
|
||||
|
||||
// Step 15.c.
|
||||
tz = CanonicalizeTimeZoneName(timeZone);
|
||||
} else {
|
||||
// Step 16.
|
||||
tz = DefaultTimeZone();
|
||||
}
|
||||
lazyDateTimeFormatData.timeZone = tz;
|
||||
|
||||
// Step 19.
|
||||
var formatOpt = new Record();
|
||||
lazyDateTimeFormatData.formatOpt = formatOpt;
|
||||
|
||||
lazyDateTimeFormatData.mozExtensions = mozExtensions;
|
||||
|
||||
if (mozExtensions) {
|
||||
let pattern = GetOption(options, "pattern", "string", undefined, undefined);
|
||||
lazyDateTimeFormatData.patternOption = pattern;
|
||||
|
||||
let dateStyle = GetOption(options, "dateStyle", "string", ["full", "long", "medium", "short"], undefined);
|
||||
lazyDateTimeFormatData.dateStyle = dateStyle;
|
||||
let timeStyle = GetOption(options, "timeStyle", "string", ["full", "long", "medium", "short"], undefined);
|
||||
lazyDateTimeFormatData.timeStyle = timeStyle;
|
||||
}
|
||||
|
||||
// Step 20.
|
||||
// 12.1, Table 4: Components of date and time formats.
|
||||
formatOpt.weekday = GetOption(options, "weekday", "string", ["narrow", "short", "long"],
|
||||
undefined);
|
||||
formatOpt.era = GetOption(options, "era", "string", ["narrow", "short", "long"], undefined);
|
||||
formatOpt.year = GetOption(options, "year", "string", ["2-digit", "numeric"], undefined);
|
||||
formatOpt.month = GetOption(options, "month", "string",
|
||||
["2-digit", "numeric", "narrow", "short", "long"], undefined);
|
||||
formatOpt.day = GetOption(options, "day", "string", ["2-digit", "numeric"], undefined);
|
||||
formatOpt.hour = GetOption(options, "hour", "string", ["2-digit", "numeric"], undefined);
|
||||
formatOpt.minute = GetOption(options, "minute", "string", ["2-digit", "numeric"], undefined);
|
||||
formatOpt.second = GetOption(options, "second", "string", ["2-digit", "numeric"], undefined);
|
||||
formatOpt.timeZoneName = GetOption(options, "timeZoneName", "string", ["short", "long"],
|
||||
undefined);
|
||||
|
||||
// Steps 21-22 provided by ICU - see comment after this function.
|
||||
|
||||
// Step 23.
|
||||
//
|
||||
// For some reason (ICU not exposing enough interface?) we drop the
|
||||
// requested format matcher on the floor after this. In any case, even if
|
||||
// doing so is justified, we have to do this work here in case it triggers
|
||||
// getters or similar. (bug 852837)
|
||||
var formatMatcher =
|
||||
GetOption(options, "formatMatcher", "string", ["basic", "best fit"],
|
||||
"best fit");
|
||||
void formatMatcher;
|
||||
|
||||
// Steps 24-26 provided by ICU, more or less - see comment after this function.
|
||||
|
||||
// Step 27.
|
||||
var hr12 = GetOption(options, "hour12", "boolean", undefined, undefined);
|
||||
|
||||
// Pass hr12 on to ICU.
|
||||
if (hr12 !== undefined)
|
||||
formatOpt.hour12 = hr12;
|
||||
|
||||
// Step 31.
|
||||
//
|
||||
// We've done everything that must be done now: mark the lazy data as fully
|
||||
// computed and install it.
|
||||
initializeIntlObject(dateTimeFormat, "DateTimeFormat", lazyDateTimeFormatData);
|
||||
|
||||
if (dateTimeFormat !== thisValue && IsObject(thisValue) &&
|
||||
thisValue instanceof GetDateTimeFormatConstructor())
|
||||
{
|
||||
_DefineDataProperty(thisValue, intlFallbackSymbol(), dateTimeFormat,
|
||||
ATTR_NONENUMERABLE | ATTR_NONCONFIGURABLE | ATTR_NONWRITABLE);
|
||||
|
||||
return thisValue;
|
||||
}
|
||||
|
||||
return dateTimeFormat;
|
||||
}
|
||||
|
||||
|
||||
// Intl.DateTimeFormat and ICU skeletons and patterns
|
||||
// ==================================================
|
||||
//
|
||||
// Different locales have different ways to display dates using the same
|
||||
// basic components. For example, en-US might use "Sept. 24, 2012" while
|
||||
// fr-FR might use "24 Sept. 2012". The intent of Intl.DateTimeFormat is to
|
||||
// permit production of a format for the locale that best matches the
|
||||
// set of date-time components and their desired representation as specified
|
||||
// by the API client.
|
||||
//
|
||||
// ICU supports specification of date and time formats in three ways:
|
||||
//
|
||||
// 1) A style is just one of the identifiers FULL, LONG, MEDIUM, or SHORT.
|
||||
// The date-time components included in each style and their representation
|
||||
// are defined by ICU using CLDR locale data (CLDR is the Unicode
|
||||
// Consortium's Common Locale Data Repository).
|
||||
//
|
||||
// 2) A skeleton is a string specifying which date-time components to include,
|
||||
// and which representations to use for them. For example, "yyyyMMMMdd"
|
||||
// specifies a year with at least four digits, a full month name, and a
|
||||
// two-digit day. It does not specify in which order the components appear,
|
||||
// how they are separated, the localized strings for textual components
|
||||
// (such as weekday or month), whether the month is in format or
|
||||
// stand-alone form¹, or the numbering system used for numeric components.
|
||||
// All that information is filled in by ICU using CLDR locale data.
|
||||
// ¹ The format form is the one used in formatted strings that include a
|
||||
// day; the stand-alone form is used when not including days, e.g., in
|
||||
// calendar headers. The two forms differ at least in some Slavic languages,
|
||||
// e.g. Russian: "22 марта 2013 г." vs. "Март 2013".
|
||||
//
|
||||
// 3) A pattern is a string specifying which date-time components to include,
|
||||
// in which order, with which separators, in which grammatical case. For
|
||||
// example, "EEEE, d MMMM y" specifies the full localized weekday name,
|
||||
// followed by comma and space, followed by the day, followed by space,
|
||||
// followed by the full month name in format form, followed by space,
|
||||
// followed by the full year. It
|
||||
// still does not specify localized strings for textual components and the
|
||||
// numbering system - these are determined by ICU using CLDR locale data or
|
||||
// possibly API parameters.
|
||||
//
|
||||
// All actual formatting in ICU is done with patterns; styles and skeletons
|
||||
// have to be mapped to patterns before processing.
|
||||
//
|
||||
// The options of DateTimeFormat most closely correspond to ICU skeletons. This
|
||||
// implementation therefore, in the toBestICUPattern function, converts
|
||||
// DateTimeFormat options to ICU skeletons, and then lets ICU map skeletons to
|
||||
// actual ICU patterns. The pattern may not directly correspond to what the
|
||||
// skeleton requests, as the mapper (UDateTimePatternGenerator) is constrained
|
||||
// by the available locale data for the locale. The resulting ICU pattern is
|
||||
// kept as the DateTimeFormat's [[pattern]] internal property and passed to ICU
|
||||
// in the format method.
|
||||
//
|
||||
// An ICU pattern represents the information of the following DateTimeFormat
|
||||
// internal properties described in the specification, which therefore don't
|
||||
// exist separately in the implementation:
|
||||
// - [[weekday]], [[era]], [[year]], [[month]], [[day]], [[hour]], [[minute]],
|
||||
// [[second]], [[timeZoneName]]
|
||||
// - [[hour12]]
|
||||
// - [[hourCycle]]
|
||||
// - [[hourNo0]]
|
||||
// When needed for the resolvedOptions method, the resolveICUPattern function
|
||||
// maps the instance's ICU pattern back to the specified properties of the
|
||||
// object returned by resolvedOptions.
|
||||
//
|
||||
// ICU date-time skeletons and patterns aren't fully documented in the ICU
|
||||
// documentation (see http://bugs.icu-project.org/trac/ticket/9627). The best
|
||||
// documentation at this point is in UTR 35:
|
||||
// http://unicode.org/reports/tr35/tr35-dates.html#Date_Format_Patterns
|
||||
|
||||
|
||||
/**
|
||||
* Returns an ICU pattern string for the given locale and representing the
|
||||
* specified options as closely as possible given available locale data.
|
||||
*/
|
||||
function toBestICUPattern(locale, options) {
|
||||
// Create an ICU skeleton representing the specified options. See
|
||||
// http://unicode.org/reports/tr35/tr35-dates.html#Date_Field_Symbol_Table
|
||||
var skeleton = "";
|
||||
switch (options.weekday) {
|
||||
case "narrow":
|
||||
skeleton += "EEEEE";
|
||||
break;
|
||||
case "short":
|
||||
skeleton += "E";
|
||||
break;
|
||||
case "long":
|
||||
skeleton += "EEEE";
|
||||
}
|
||||
switch (options.era) {
|
||||
case "narrow":
|
||||
skeleton += "GGGGG";
|
||||
break;
|
||||
case "short":
|
||||
skeleton += "G";
|
||||
break;
|
||||
case "long":
|
||||
skeleton += "GGGG";
|
||||
break;
|
||||
}
|
||||
switch (options.year) {
|
||||
case "2-digit":
|
||||
skeleton += "yy";
|
||||
break;
|
||||
case "numeric":
|
||||
skeleton += "y";
|
||||
break;
|
||||
}
|
||||
switch (options.month) {
|
||||
case "2-digit":
|
||||
skeleton += "MM";
|
||||
break;
|
||||
case "numeric":
|
||||
skeleton += "M";
|
||||
break;
|
||||
case "narrow":
|
||||
skeleton += "MMMMM";
|
||||
break;
|
||||
case "short":
|
||||
skeleton += "MMM";
|
||||
break;
|
||||
case "long":
|
||||
skeleton += "MMMM";
|
||||
break;
|
||||
}
|
||||
switch (options.day) {
|
||||
case "2-digit":
|
||||
skeleton += "dd";
|
||||
break;
|
||||
case "numeric":
|
||||
skeleton += "d";
|
||||
break;
|
||||
}
|
||||
// If hour12 and hourCycle are both present, hour12 takes precedence.
|
||||
var hourSkeletonChar = "j";
|
||||
if (options.hour12 !== undefined) {
|
||||
if (options.hour12)
|
||||
hourSkeletonChar = "h";
|
||||
else
|
||||
hourSkeletonChar = "H";
|
||||
} else {
|
||||
switch (options.hourCycle) {
|
||||
case "h11":
|
||||
case "h12":
|
||||
hourSkeletonChar = "h";
|
||||
break;
|
||||
case "h23":
|
||||
case "h24":
|
||||
hourSkeletonChar = "H";
|
||||
break;
|
||||
}
|
||||
}
|
||||
switch (options.hour) {
|
||||
case "2-digit":
|
||||
skeleton += hourSkeletonChar + hourSkeletonChar;
|
||||
break;
|
||||
case "numeric":
|
||||
skeleton += hourSkeletonChar;
|
||||
break;
|
||||
}
|
||||
switch (options.minute) {
|
||||
case "2-digit":
|
||||
skeleton += "mm";
|
||||
break;
|
||||
case "numeric":
|
||||
skeleton += "m";
|
||||
break;
|
||||
}
|
||||
switch (options.second) {
|
||||
case "2-digit":
|
||||
skeleton += "ss";
|
||||
break;
|
||||
case "numeric":
|
||||
skeleton += "s";
|
||||
break;
|
||||
}
|
||||
switch (options.timeZoneName) {
|
||||
case "short":
|
||||
skeleton += "z";
|
||||
break;
|
||||
case "long":
|
||||
skeleton += "zzzz";
|
||||
break;
|
||||
}
|
||||
|
||||
// Let ICU convert the ICU skeleton to an ICU pattern for the given locale.
|
||||
return intl_patternForSkeleton(locale, skeleton);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Returns a new options object that includes the provided options (if any)
|
||||
* and fills in default components if required components are not defined.
|
||||
* Required can be "date", "time", or "any".
|
||||
* Defaults can be "date", "time", or "all".
|
||||
*
|
||||
* Spec: ECMAScript Internationalization API Specification, 12.1.1.
|
||||
*/
|
||||
function ToDateTimeOptions(options, required, defaults) {
|
||||
assert(typeof required === "string", "ToDateTimeOptions");
|
||||
assert(typeof defaults === "string", "ToDateTimeOptions");
|
||||
|
||||
// Steps 1-3.
|
||||
if (options === undefined)
|
||||
options = null;
|
||||
else
|
||||
options = ToObject(options);
|
||||
options = std_Object_create(options);
|
||||
|
||||
// Step 4.
|
||||
var needDefaults = true;
|
||||
|
||||
// Step 5.
|
||||
if ((required === "date" || required === "any") &&
|
||||
(options.weekday !== undefined || options.year !== undefined ||
|
||||
options.month !== undefined || options.day !== undefined))
|
||||
{
|
||||
needDefaults = false;
|
||||
}
|
||||
|
||||
// Step 6.
|
||||
if ((required === "time" || required === "any") &&
|
||||
(options.hour !== undefined || options.minute !== undefined ||
|
||||
options.second !== undefined))
|
||||
{
|
||||
needDefaults = false;
|
||||
}
|
||||
|
||||
// Step 7.
|
||||
if (needDefaults && (defaults === "date" || defaults === "all")) {
|
||||
// The specification says to call [[DefineOwnProperty]] with false for
|
||||
// the Throw parameter, while Object.defineProperty uses true. For the
|
||||
// calls here, the difference doesn't matter because we're adding
|
||||
// properties to a new object.
|
||||
_DefineDataProperty(options, "year", "numeric");
|
||||
_DefineDataProperty(options, "month", "numeric");
|
||||
_DefineDataProperty(options, "day", "numeric");
|
||||
}
|
||||
|
||||
// Step 8.
|
||||
if (needDefaults && (defaults === "time" || defaults === "all")) {
|
||||
// See comment for step 7.
|
||||
_DefineDataProperty(options, "hour", "numeric");
|
||||
_DefineDataProperty(options, "minute", "numeric");
|
||||
_DefineDataProperty(options, "second", "numeric");
|
||||
}
|
||||
|
||||
// Step 9.
|
||||
return options;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Returns the subset of the given locale list for which this locale list has a
|
||||
* matching (possibly fallback) locale. Locales appear in the same order in the
|
||||
* returned list as in the input list.
|
||||
*
|
||||
* Spec: ECMAScript Internationalization API Specification, 12.2.2.
|
||||
*/
|
||||
function Intl_DateTimeFormat_supportedLocalesOf(locales /*, options*/) {
|
||||
var options = arguments.length > 1 ? arguments[1] : undefined;
|
||||
|
||||
var availableLocales = callFunction(dateTimeFormatInternalProperties.availableLocales,
|
||||
dateTimeFormatInternalProperties);
|
||||
var requestedLocales = CanonicalizeLocaleList(locales);
|
||||
return SupportedLocales(availableLocales, requestedLocales, options);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* DateTimeFormat internal properties.
|
||||
*
|
||||
* Spec: ECMAScript Internationalization API Specification, 9.1 and 12.2.3.
|
||||
*/
|
||||
var dateTimeFormatInternalProperties = {
|
||||
localeData: dateTimeFormatLocaleData,
|
||||
_availableLocales: null,
|
||||
availableLocales: function() // eslint-disable-line object-shorthand
|
||||
{
|
||||
var locales = this._availableLocales;
|
||||
if (locales)
|
||||
return locales;
|
||||
|
||||
locales = intl_DateTimeFormat_availableLocales();
|
||||
addSpecialMissingLanguageTags(locales);
|
||||
return (this._availableLocales = locales);
|
||||
},
|
||||
relevantExtensionKeys: ["ca", "nu", "hc"]
|
||||
};
|
||||
|
||||
|
||||
function dateTimeFormatLocaleData() {
|
||||
return {
|
||||
ca: intl_availableCalendars,
|
||||
nu: getNumberingSystems,
|
||||
hc: () => {
|
||||
return [null, "h11", "h12", "h23", "h24"];
|
||||
},
|
||||
default: {
|
||||
ca: intl_defaultCalendar,
|
||||
nu: intl_numberingSystem,
|
||||
hc: () => {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Function to be bound and returned by Intl.DateTimeFormat.prototype.format.
|
||||
*
|
||||
* Spec: ECMAScript Internationalization API Specification, 12.3.2.
|
||||
*/
|
||||
function dateTimeFormatFormatToBind(date) {
|
||||
// Step 1.
|
||||
var dtf = this;
|
||||
|
||||
// Step 2.
|
||||
assert(IsObject(dtf), "dateTimeFormatFormatToBind called with non-Object");
|
||||
assert(IsDateTimeFormat(dtf), "dateTimeFormatFormatToBind called with non-DateTimeFormat");
|
||||
|
||||
// Steps 3-4.
|
||||
var x = (date === undefined) ? std_Date_now() : ToNumber(date);
|
||||
|
||||
// Step 5.
|
||||
return intl_FormatDateTime(dtf, x, /* formatToParts = */ false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a function bound to this DateTimeFormat that returns a String value
|
||||
* representing the result of calling ToNumber(date) according to the
|
||||
* effective locale and the formatting options of this DateTimeFormat.
|
||||
*
|
||||
* Spec: ECMAScript Internationalization API Specification, 12.3.2.
|
||||
*/
|
||||
function Intl_DateTimeFormat_format_get() {
|
||||
// Steps 1-3.
|
||||
var dtf = UnwrapDateTimeFormat(this, "format");
|
||||
|
||||
var internals = getDateTimeFormatInternals(dtf);
|
||||
|
||||
// Step 4.
|
||||
if (internals.boundFormat === undefined) {
|
||||
// Step 4.a.
|
||||
var F = dateTimeFormatFormatToBind;
|
||||
|
||||
// Steps 4.b-d.
|
||||
var bf = callFunction(FunctionBind, F, dtf);
|
||||
internals.boundFormat = bf;
|
||||
}
|
||||
|
||||
// Step 5.
|
||||
return internals.boundFormat;
|
||||
}
|
||||
_SetCanonicalName(Intl_DateTimeFormat_format_get, "get format");
|
||||
|
||||
|
||||
/**
|
||||
* Intl.DateTimeFormat.prototype.formatToParts ( date )
|
||||
*/
|
||||
function Intl_DateTimeFormat_formatToParts(date) {
|
||||
// Step 1.
|
||||
var dtf = this;
|
||||
|
||||
// Steps 2-3.
|
||||
if (!IsObject(dtf) || !IsDateTimeFormat(dtf)) {
|
||||
ThrowTypeError(JSMSG_INTL_OBJECT_NOT_INITED, "DateTimeFormat", "formatToParts",
|
||||
"DateTimeFormat");
|
||||
}
|
||||
|
||||
// Ensure the DateTimeFormat internals are resolved.
|
||||
getDateTimeFormatInternals(dtf);
|
||||
|
||||
// Steps 4-5.
|
||||
var x = (date === undefined) ? std_Date_now() : ToNumber(date);
|
||||
|
||||
// Step 6.
|
||||
return intl_FormatDateTime(dtf, x, /* formatToParts = */ true);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Returns the resolved options for a DateTimeFormat object.
|
||||
*
|
||||
* Spec: ECMAScript Internationalization API Specification, 12.3.3 and 12.4.
|
||||
*/
|
||||
function Intl_DateTimeFormat_resolvedOptions() {
|
||||
// Invoke |UnwrapDateTimeFormat| per introduction of section 12.3.
|
||||
var dtf = UnwrapDateTimeFormat(this, "resolvedOptions");
|
||||
|
||||
var internals = getDateTimeFormatInternals(dtf);
|
||||
|
||||
var result = {
|
||||
locale: internals.locale,
|
||||
calendar: internals.calendar,
|
||||
numberingSystem: internals.numberingSystem,
|
||||
timeZone: internals.timeZone,
|
||||
};
|
||||
|
||||
if (internals.mozExtensions) {
|
||||
if (internals.patternOption !== undefined) {
|
||||
result.pattern = internals.pattern;
|
||||
} else if (internals.dateStyle || internals.timeStyle) {
|
||||
result.dateStyle = internals.dateStyle;
|
||||
result.timeStyle = internals.timeStyle;
|
||||
}
|
||||
}
|
||||
|
||||
resolveICUPattern(internals.pattern, result);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
// Table mapping ICU pattern characters back to the corresponding date-time
|
||||
// components of DateTimeFormat. See
|
||||
// http://unicode.org/reports/tr35/tr35-dates.html#Date_Field_Symbol_Table
|
||||
var icuPatternCharToComponent = {
|
||||
E: "weekday",
|
||||
G: "era",
|
||||
y: "year",
|
||||
M: "month",
|
||||
L: "month",
|
||||
d: "day",
|
||||
h: "hour",
|
||||
H: "hour",
|
||||
k: "hour",
|
||||
K: "hour",
|
||||
m: "minute",
|
||||
s: "second",
|
||||
z: "timeZoneName",
|
||||
v: "timeZoneName",
|
||||
V: "timeZoneName"
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* Maps an ICU pattern string to a corresponding set of date-time components
|
||||
* and their values, and adds properties for these components to the result
|
||||
* object, which will be returned by the resolvedOptions method. For the
|
||||
* interpretation of ICU pattern characters, see
|
||||
* http://unicode.org/reports/tr35/tr35-dates.html#Date_Field_Symbol_Table
|
||||
*/
|
||||
function resolveICUPattern(pattern, result) {
|
||||
assert(IsObject(result), "resolveICUPattern");
|
||||
var i = 0;
|
||||
while (i < pattern.length) {
|
||||
var c = pattern[i++];
|
||||
if (c === "'") {
|
||||
while (i < pattern.length && pattern[i] !== "'")
|
||||
i++;
|
||||
i++;
|
||||
} else {
|
||||
var count = 1;
|
||||
while (i < pattern.length && pattern[i] === c) {
|
||||
i++;
|
||||
count++;
|
||||
}
|
||||
var value;
|
||||
switch (c) {
|
||||
// "text" cases
|
||||
case "G":
|
||||
case "E":
|
||||
case "z":
|
||||
case "v":
|
||||
case "V":
|
||||
if (count <= 3)
|
||||
value = "short";
|
||||
else if (count === 4)
|
||||
value = "long";
|
||||
else
|
||||
value = "narrow";
|
||||
break;
|
||||
// "number" cases
|
||||
case "y":
|
||||
case "d":
|
||||
case "h":
|
||||
case "H":
|
||||
case "m":
|
||||
case "s":
|
||||
case "k":
|
||||
case "K":
|
||||
if (count === 2)
|
||||
value = "2-digit";
|
||||
else
|
||||
value = "numeric";
|
||||
break;
|
||||
// "text & number" cases
|
||||
case "M":
|
||||
case "L":
|
||||
if (count === 1)
|
||||
value = "numeric";
|
||||
else if (count === 2)
|
||||
value = "2-digit";
|
||||
else if (count === 3)
|
||||
value = "short";
|
||||
else if (count === 4)
|
||||
value = "long";
|
||||
else
|
||||
value = "narrow";
|
||||
break;
|
||||
default:
|
||||
// skip other pattern characters and literal text
|
||||
}
|
||||
if (hasOwn(c, icuPatternCharToComponent))
|
||||
_DefineDataProperty(result, icuPatternCharToComponent[c], value);
|
||||
switch (c) {
|
||||
case "h":
|
||||
_DefineDataProperty(result, "hourCycle", "h12");
|
||||
_DefineDataProperty(result, "hour12", true);
|
||||
break;
|
||||
case "K":
|
||||
_DefineDataProperty(result, "hourCycle", "h11");
|
||||
_DefineDataProperty(result, "hour12", true);
|
||||
break;
|
||||
case "H":
|
||||
_DefineDataProperty(result, "hourCycle", "h23");
|
||||
_DefineDataProperty(result, "hour12", false);
|
||||
break;
|
||||
case "k":
|
||||
_DefineDataProperty(result, "hourCycle", "h24");
|
||||
_DefineDataProperty(result, "hour12", false);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
883
js/src/builtin/intl/DateTimeFormat.js
Normal file
883
js/src/builtin/intl/DateTimeFormat.js
Normal file
@ -0,0 +1,883 @@
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
/* Portions Copyright Norbert Lindenberg 2011-2012. */
|
||||
|
||||
/**
|
||||
* Compute an internal properties object from |lazyDateTimeFormatData|.
|
||||
*/
|
||||
function resolveDateTimeFormatInternals(lazyDateTimeFormatData) {
|
||||
assert(IsObject(lazyDateTimeFormatData), "lazy data not an object?");
|
||||
|
||||
// Lazy DateTimeFormat data has the following structure:
|
||||
//
|
||||
// {
|
||||
// requestedLocales: List of locales,
|
||||
//
|
||||
// localeOpt: // *first* opt computed in InitializeDateTimeFormat
|
||||
// {
|
||||
// localeMatcher: "lookup" / "best fit",
|
||||
//
|
||||
// hour12: true / false, // optional
|
||||
//
|
||||
// hourCycle: "h11" / "h12" / "h23" / "h24", // optional
|
||||
// }
|
||||
//
|
||||
// timeZone: IANA time zone name,
|
||||
//
|
||||
// formatOpt: // *second* opt computed in InitializeDateTimeFormat
|
||||
// {
|
||||
// // all the properties/values listed in Table 3
|
||||
// // (weekday, era, year, month, day, &c.)
|
||||
// }
|
||||
//
|
||||
// formatMatcher: "basic" / "best fit",
|
||||
//
|
||||
// mozExtensions: true / false,
|
||||
//
|
||||
//
|
||||
// // If mozExtensions is true:
|
||||
//
|
||||
// dateStyle: "full" / "long" / "medium" / "short" / undefined,
|
||||
//
|
||||
// timeStyle: "full" / "long" / "medium" / "short" / undefined,
|
||||
//
|
||||
// patternOption:
|
||||
// String representing LDML Date Format pattern or undefined
|
||||
// }
|
||||
//
|
||||
// Note that lazy data is only installed as a final step of initialization,
|
||||
// so every DateTimeFormat lazy data object has *all* these properties,
|
||||
// never a subset of them.
|
||||
|
||||
var internalProps = std_Object_create(null);
|
||||
|
||||
// Compute effective locale.
|
||||
// Step 8.
|
||||
var DateTimeFormat = dateTimeFormatInternalProperties;
|
||||
|
||||
// Step 9.
|
||||
var localeData = DateTimeFormat.localeData;
|
||||
|
||||
// Step 10.
|
||||
var r = ResolveLocale(callFunction(DateTimeFormat.availableLocales, DateTimeFormat),
|
||||
lazyDateTimeFormatData.requestedLocales,
|
||||
lazyDateTimeFormatData.localeOpt,
|
||||
DateTimeFormat.relevantExtensionKeys,
|
||||
localeData);
|
||||
|
||||
// Steps 11-13.
|
||||
internalProps.locale = r.locale;
|
||||
internalProps.calendar = r.ca;
|
||||
internalProps.numberingSystem = r.nu;
|
||||
|
||||
// Compute formatting options.
|
||||
// Step 14.
|
||||
var dataLocale = r.dataLocale;
|
||||
|
||||
// Steps 15-17.
|
||||
internalProps.timeZone = lazyDateTimeFormatData.timeZone;
|
||||
|
||||
// Step 18.
|
||||
var formatOpt = lazyDateTimeFormatData.formatOpt;
|
||||
|
||||
// Copy the hourCycle setting, if present, to the format options. But
|
||||
// only do this if no hour12 option is present, because the latter takes
|
||||
// precedence over hourCycle.
|
||||
if (r.hc !== null && formatOpt.hour12 === undefined)
|
||||
formatOpt.hourCycle = r.hc;
|
||||
|
||||
// Steps 27-28, more or less - see comment after this function.
|
||||
var pattern;
|
||||
if (lazyDateTimeFormatData.mozExtensions) {
|
||||
if (lazyDateTimeFormatData.patternOption !== undefined) {
|
||||
pattern = lazyDateTimeFormatData.patternOption;
|
||||
|
||||
internalProps.patternOption = lazyDateTimeFormatData.patternOption;
|
||||
} else if (lazyDateTimeFormatData.dateStyle || lazyDateTimeFormatData.timeStyle) {
|
||||
pattern = intl_patternForStyle(dataLocale,
|
||||
lazyDateTimeFormatData.dateStyle, lazyDateTimeFormatData.timeStyle,
|
||||
lazyDateTimeFormatData.timeZone);
|
||||
|
||||
internalProps.dateStyle = lazyDateTimeFormatData.dateStyle;
|
||||
internalProps.timeStyle = lazyDateTimeFormatData.timeStyle;
|
||||
} else {
|
||||
pattern = toBestICUPattern(dataLocale, formatOpt);
|
||||
}
|
||||
internalProps.mozExtensions = true;
|
||||
} else {
|
||||
pattern = toBestICUPattern(dataLocale, formatOpt);
|
||||
}
|
||||
|
||||
// If the hourCycle option was set, adjust the resolved pattern to use the
|
||||
// requested hour cycle representation.
|
||||
if (formatOpt.hourCycle !== undefined)
|
||||
pattern = replaceHourRepresentation(pattern, formatOpt.hourCycle);
|
||||
|
||||
// Step 29.
|
||||
internalProps.pattern = pattern;
|
||||
|
||||
// Step 30.
|
||||
internalProps.boundFormat = undefined;
|
||||
|
||||
// The caller is responsible for associating |internalProps| with the right
|
||||
// object using |setInternalProperties|.
|
||||
return internalProps;
|
||||
}
|
||||
|
||||
/**
|
||||
* Replaces all hour pattern characters in |pattern| to use the matching hour
|
||||
* representation for |hourCycle|.
|
||||
*/
|
||||
function replaceHourRepresentation(pattern, hourCycle) {
|
||||
var hour;
|
||||
switch (hourCycle) {
|
||||
case "h11":
|
||||
hour = "K";
|
||||
break;
|
||||
case "h12":
|
||||
hour = "h";
|
||||
break;
|
||||
case "h23":
|
||||
hour = "H";
|
||||
break;
|
||||
case "h24":
|
||||
hour = "k";
|
||||
break;
|
||||
}
|
||||
assert(hour !== undefined, "Unexpected hourCycle requested: " + hourCycle);
|
||||
|
||||
// Parse the pattern according to the format specified in
|
||||
// https://unicode.org/reports/tr35/tr35-dates.html#Date_Format_Patterns
|
||||
// and replace all hour symbols with |hour|.
|
||||
var resultPattern = "";
|
||||
var inQuote = false;
|
||||
for (var i = 0; i < pattern.length; i++) {
|
||||
var ch = pattern[i];
|
||||
if (ch === "'") {
|
||||
inQuote = !inQuote;
|
||||
} else if (!inQuote && (ch === "h" || ch === "H" || ch === "k" || ch === "K")) {
|
||||
ch = hour;
|
||||
}
|
||||
resultPattern += ch;
|
||||
}
|
||||
|
||||
return resultPattern;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns an object containing the DateTimeFormat internal properties of |obj|.
|
||||
*/
|
||||
function getDateTimeFormatInternals(obj) {
|
||||
assert(IsObject(obj), "getDateTimeFormatInternals called with non-object");
|
||||
assert(IsDateTimeFormat(obj), "getDateTimeFormatInternals called with non-DateTimeFormat");
|
||||
|
||||
var internals = getIntlObjectInternals(obj);
|
||||
assert(internals.type === "DateTimeFormat", "bad type escaped getIntlObjectInternals");
|
||||
|
||||
// If internal properties have already been computed, use them.
|
||||
var internalProps = maybeInternalProperties(internals);
|
||||
if (internalProps)
|
||||
return internalProps;
|
||||
|
||||
// Otherwise it's time to fully create them.
|
||||
internalProps = resolveDateTimeFormatInternals(internals.lazyData);
|
||||
setInternalProperties(internals, internalProps);
|
||||
return internalProps;
|
||||
}
|
||||
|
||||
/**
|
||||
* UnwrapDateTimeFormat(dtf)
|
||||
*/
|
||||
function UnwrapDateTimeFormat(dtf, methodName) {
|
||||
// Step 1.
|
||||
if (IsObject(dtf) && !IsDateTimeFormat(dtf) && dtf instanceof GetDateTimeFormatConstructor())
|
||||
dtf = dtf[intlFallbackSymbol()];
|
||||
|
||||
// Step 2.
|
||||
if (!IsObject(dtf) || !IsDateTimeFormat(dtf)) {
|
||||
ThrowTypeError(JSMSG_INTL_OBJECT_NOT_INITED, "DateTimeFormat", methodName,
|
||||
"DateTimeFormat");
|
||||
}
|
||||
|
||||
// Step 3.
|
||||
return dtf;
|
||||
}
|
||||
|
||||
/**
|
||||
* Initializes an object as a DateTimeFormat.
|
||||
*
|
||||
* This method is complicated a moderate bit by its implementing initialization
|
||||
* as a *lazy* concept. Everything that must happen now, does -- but we defer
|
||||
* all the work we can until the object is actually used as a DateTimeFormat.
|
||||
* This later work occurs in |resolveDateTimeFormatInternals|; steps not noted
|
||||
* here occur there.
|
||||
*
|
||||
* Spec: ECMAScript Internationalization API Specification, 12.1.1.
|
||||
*/
|
||||
function InitializeDateTimeFormat(dateTimeFormat, thisValue, locales, options, mozExtensions) {
|
||||
assert(IsObject(dateTimeFormat), "InitializeDateTimeFormat called with non-Object");
|
||||
assert(IsDateTimeFormat(dateTimeFormat),
|
||||
"InitializeDateTimeFormat called with non-DateTimeFormat");
|
||||
|
||||
// Steps 1-2 (These steps are no longer required and should be removed
|
||||
// from the spec; https://github.com/tc39/ecma402/issues/115).
|
||||
|
||||
// Lazy DateTimeFormat data has the following structure:
|
||||
//
|
||||
// {
|
||||
// requestedLocales: List of locales,
|
||||
//
|
||||
// localeOpt: // *first* opt computed in InitializeDateTimeFormat
|
||||
// {
|
||||
// localeMatcher: "lookup" / "best fit",
|
||||
// }
|
||||
//
|
||||
// timeZone: IANA time zone name,
|
||||
//
|
||||
// formatOpt: // *second* opt computed in InitializeDateTimeFormat
|
||||
// {
|
||||
// // all the properties/values listed in Table 3
|
||||
// // (weekday, era, year, month, day, &c.)
|
||||
//
|
||||
// hour12: true / false, // optional
|
||||
// hourCycle: "h11" / "h12" / "h23" / "h24", // optional
|
||||
// }
|
||||
//
|
||||
// formatMatcher: "basic" / "best fit",
|
||||
// }
|
||||
//
|
||||
// Note that lazy data is only installed as a final step of initialization,
|
||||
// so every DateTimeFormat lazy data object has *all* these properties,
|
||||
// never a subset of them.
|
||||
var lazyDateTimeFormatData = std_Object_create(null);
|
||||
|
||||
// Step 1.
|
||||
var requestedLocales = CanonicalizeLocaleList(locales);
|
||||
lazyDateTimeFormatData.requestedLocales = requestedLocales;
|
||||
|
||||
// Step 2.
|
||||
options = ToDateTimeOptions(options, "any", "date");
|
||||
|
||||
// Compute options that impact interpretation of locale.
|
||||
// Step 3.
|
||||
var localeOpt = new Record();
|
||||
lazyDateTimeFormatData.localeOpt = localeOpt;
|
||||
|
||||
// Steps 4-5.
|
||||
var localeMatcher =
|
||||
GetOption(options, "localeMatcher", "string", ["lookup", "best fit"],
|
||||
"best fit");
|
||||
localeOpt.localeMatcher = localeMatcher;
|
||||
|
||||
// Step 6.
|
||||
var hc = GetOption(options, "hourCycle", "string", ["h11", "h12", "h23", "h24"], undefined);
|
||||
localeOpt.hc = hc;
|
||||
|
||||
// Steps 15-18.
|
||||
var tz = options.timeZone;
|
||||
if (tz !== undefined) {
|
||||
// Step 15.a.
|
||||
tz = ToString(tz);
|
||||
|
||||
// Step 15.b.
|
||||
var timeZone = intl_IsValidTimeZoneName(tz);
|
||||
if (timeZone === null)
|
||||
ThrowRangeError(JSMSG_INVALID_TIME_ZONE, tz);
|
||||
|
||||
// Step 15.c.
|
||||
tz = CanonicalizeTimeZoneName(timeZone);
|
||||
} else {
|
||||
// Step 16.
|
||||
tz = DefaultTimeZone();
|
||||
}
|
||||
lazyDateTimeFormatData.timeZone = tz;
|
||||
|
||||
// Step 19.
|
||||
var formatOpt = new Record();
|
||||
lazyDateTimeFormatData.formatOpt = formatOpt;
|
||||
|
||||
lazyDateTimeFormatData.mozExtensions = mozExtensions;
|
||||
|
||||
if (mozExtensions) {
|
||||
let pattern = GetOption(options, "pattern", "string", undefined, undefined);
|
||||
lazyDateTimeFormatData.patternOption = pattern;
|
||||
|
||||
let dateStyle = GetOption(options, "dateStyle", "string", ["full", "long", "medium", "short"], undefined);
|
||||
lazyDateTimeFormatData.dateStyle = dateStyle;
|
||||
let timeStyle = GetOption(options, "timeStyle", "string", ["full", "long", "medium", "short"], undefined);
|
||||
lazyDateTimeFormatData.timeStyle = timeStyle;
|
||||
}
|
||||
|
||||
// Step 20.
|
||||
// 12.1, Table 4: Components of date and time formats.
|
||||
formatOpt.weekday = GetOption(options, "weekday", "string", ["narrow", "short", "long"],
|
||||
undefined);
|
||||
formatOpt.era = GetOption(options, "era", "string", ["narrow", "short", "long"], undefined);
|
||||
formatOpt.year = GetOption(options, "year", "string", ["2-digit", "numeric"], undefined);
|
||||
formatOpt.month = GetOption(options, "month", "string",
|
||||
["2-digit", "numeric", "narrow", "short", "long"], undefined);
|
||||
formatOpt.day = GetOption(options, "day", "string", ["2-digit", "numeric"], undefined);
|
||||
formatOpt.hour = GetOption(options, "hour", "string", ["2-digit", "numeric"], undefined);
|
||||
formatOpt.minute = GetOption(options, "minute", "string", ["2-digit", "numeric"], undefined);
|
||||
formatOpt.second = GetOption(options, "second", "string", ["2-digit", "numeric"], undefined);
|
||||
formatOpt.timeZoneName = GetOption(options, "timeZoneName", "string", ["short", "long"],
|
||||
undefined);
|
||||
|
||||
// Steps 21-22 provided by ICU - see comment after this function.
|
||||
|
||||
// Step 23.
|
||||
//
|
||||
// For some reason (ICU not exposing enough interface?) we drop the
|
||||
// requested format matcher on the floor after this. In any case, even if
|
||||
// doing so is justified, we have to do this work here in case it triggers
|
||||
// getters or similar. (bug 852837)
|
||||
var formatMatcher =
|
||||
GetOption(options, "formatMatcher", "string", ["basic", "best fit"],
|
||||
"best fit");
|
||||
void formatMatcher;
|
||||
|
||||
// Steps 24-26 provided by ICU, more or less - see comment after this function.
|
||||
|
||||
// Step 27.
|
||||
var hr12 = GetOption(options, "hour12", "boolean", undefined, undefined);
|
||||
|
||||
// Pass hr12 on to ICU.
|
||||
if (hr12 !== undefined)
|
||||
formatOpt.hour12 = hr12;
|
||||
|
||||
// Step 31.
|
||||
//
|
||||
// We've done everything that must be done now: mark the lazy data as fully
|
||||
// computed and install it.
|
||||
initializeIntlObject(dateTimeFormat, "DateTimeFormat", lazyDateTimeFormatData);
|
||||
|
||||
if (dateTimeFormat !== thisValue && IsObject(thisValue) &&
|
||||
thisValue instanceof GetDateTimeFormatConstructor())
|
||||
{
|
||||
_DefineDataProperty(thisValue, intlFallbackSymbol(), dateTimeFormat,
|
||||
ATTR_NONENUMERABLE | ATTR_NONCONFIGURABLE | ATTR_NONWRITABLE);
|
||||
|
||||
return thisValue;
|
||||
}
|
||||
|
||||
return dateTimeFormat;
|
||||
}
|
||||
|
||||
// Intl.DateTimeFormat and ICU skeletons and patterns
|
||||
// ==================================================
|
||||
//
|
||||
// Different locales have different ways to display dates using the same
|
||||
// basic components. For example, en-US might use "Sept. 24, 2012" while
|
||||
// fr-FR might use "24 Sept. 2012". The intent of Intl.DateTimeFormat is to
|
||||
// permit production of a format for the locale that best matches the
|
||||
// set of date-time components and their desired representation as specified
|
||||
// by the API client.
|
||||
//
|
||||
// ICU supports specification of date and time formats in three ways:
|
||||
//
|
||||
// 1) A style is just one of the identifiers FULL, LONG, MEDIUM, or SHORT.
|
||||
// The date-time components included in each style and their representation
|
||||
// are defined by ICU using CLDR locale data (CLDR is the Unicode
|
||||
// Consortium's Common Locale Data Repository).
|
||||
//
|
||||
// 2) A skeleton is a string specifying which date-time components to include,
|
||||
// and which representations to use for them. For example, "yyyyMMMMdd"
|
||||
// specifies a year with at least four digits, a full month name, and a
|
||||
// two-digit day. It does not specify in which order the components appear,
|
||||
// how they are separated, the localized strings for textual components
|
||||
// (such as weekday or month), whether the month is in format or
|
||||
// stand-alone form¹, or the numbering system used for numeric components.
|
||||
// All that information is filled in by ICU using CLDR locale data.
|
||||
// ¹ The format form is the one used in formatted strings that include a
|
||||
// day; the stand-alone form is used when not including days, e.g., in
|
||||
// calendar headers. The two forms differ at least in some Slavic languages,
|
||||
// e.g. Russian: "22 марта 2013 г." vs. "Март 2013".
|
||||
//
|
||||
// 3) A pattern is a string specifying which date-time components to include,
|
||||
// in which order, with which separators, in which grammatical case. For
|
||||
// example, "EEEE, d MMMM y" specifies the full localized weekday name,
|
||||
// followed by comma and space, followed by the day, followed by space,
|
||||
// followed by the full month name in format form, followed by space,
|
||||
// followed by the full year. It
|
||||
// still does not specify localized strings for textual components and the
|
||||
// numbering system - these are determined by ICU using CLDR locale data or
|
||||
// possibly API parameters.
|
||||
//
|
||||
// All actual formatting in ICU is done with patterns; styles and skeletons
|
||||
// have to be mapped to patterns before processing.
|
||||
//
|
||||
// The options of DateTimeFormat most closely correspond to ICU skeletons. This
|
||||
// implementation therefore, in the toBestICUPattern function, converts
|
||||
// DateTimeFormat options to ICU skeletons, and then lets ICU map skeletons to
|
||||
// actual ICU patterns. The pattern may not directly correspond to what the
|
||||
// skeleton requests, as the mapper (UDateTimePatternGenerator) is constrained
|
||||
// by the available locale data for the locale. The resulting ICU pattern is
|
||||
// kept as the DateTimeFormat's [[pattern]] internal property and passed to ICU
|
||||
// in the format method.
|
||||
//
|
||||
// An ICU pattern represents the information of the following DateTimeFormat
|
||||
// internal properties described in the specification, which therefore don't
|
||||
// exist separately in the implementation:
|
||||
// - [[weekday]], [[era]], [[year]], [[month]], [[day]], [[hour]], [[minute]],
|
||||
// [[second]], [[timeZoneName]]
|
||||
// - [[hour12]]
|
||||
// - [[hourCycle]]
|
||||
// - [[hourNo0]]
|
||||
// When needed for the resolvedOptions method, the resolveICUPattern function
|
||||
// maps the instance's ICU pattern back to the specified properties of the
|
||||
// object returned by resolvedOptions.
|
||||
//
|
||||
// ICU date-time skeletons and patterns aren't fully documented in the ICU
|
||||
// documentation (see http://bugs.icu-project.org/trac/ticket/9627). The best
|
||||
// documentation at this point is in UTR 35:
|
||||
// http://unicode.org/reports/tr35/tr35-dates.html#Date_Format_Patterns
|
||||
|
||||
/**
|
||||
* Returns an ICU pattern string for the given locale and representing the
|
||||
* specified options as closely as possible given available locale data.
|
||||
*/
|
||||
function toBestICUPattern(locale, options) {
|
||||
// Create an ICU skeleton representing the specified options. See
|
||||
// http://unicode.org/reports/tr35/tr35-dates.html#Date_Field_Symbol_Table
|
||||
var skeleton = "";
|
||||
switch (options.weekday) {
|
||||
case "narrow":
|
||||
skeleton += "EEEEE";
|
||||
break;
|
||||
case "short":
|
||||
skeleton += "E";
|
||||
break;
|
||||
case "long":
|
||||
skeleton += "EEEE";
|
||||
}
|
||||
switch (options.era) {
|
||||
case "narrow":
|
||||
skeleton += "GGGGG";
|
||||
break;
|
||||
case "short":
|
||||
skeleton += "G";
|
||||
break;
|
||||
case "long":
|
||||
skeleton += "GGGG";
|
||||
break;
|
||||
}
|
||||
switch (options.year) {
|
||||
case "2-digit":
|
||||
skeleton += "yy";
|
||||
break;
|
||||
case "numeric":
|
||||
skeleton += "y";
|
||||
break;
|
||||
}
|
||||
switch (options.month) {
|
||||
case "2-digit":
|
||||
skeleton += "MM";
|
||||
break;
|
||||
case "numeric":
|
||||
skeleton += "M";
|
||||
break;
|
||||
case "narrow":
|
||||
skeleton += "MMMMM";
|
||||
break;
|
||||
case "short":
|
||||
skeleton += "MMM";
|
||||
break;
|
||||
case "long":
|
||||
skeleton += "MMMM";
|
||||
break;
|
||||
}
|
||||
switch (options.day) {
|
||||
case "2-digit":
|
||||
skeleton += "dd";
|
||||
break;
|
||||
case "numeric":
|
||||
skeleton += "d";
|
||||
break;
|
||||
}
|
||||
// If hour12 and hourCycle are both present, hour12 takes precedence.
|
||||
var hourSkeletonChar = "j";
|
||||
if (options.hour12 !== undefined) {
|
||||
if (options.hour12)
|
||||
hourSkeletonChar = "h";
|
||||
else
|
||||
hourSkeletonChar = "H";
|
||||
} else {
|
||||
switch (options.hourCycle) {
|
||||
case "h11":
|
||||
case "h12":
|
||||
hourSkeletonChar = "h";
|
||||
break;
|
||||
case "h23":
|
||||
case "h24":
|
||||
hourSkeletonChar = "H";
|
||||
break;
|
||||
}
|
||||
}
|
||||
switch (options.hour) {
|
||||
case "2-digit":
|
||||
skeleton += hourSkeletonChar + hourSkeletonChar;
|
||||
break;
|
||||
case "numeric":
|
||||
skeleton += hourSkeletonChar;
|
||||
break;
|
||||
}
|
||||
switch (options.minute) {
|
||||
case "2-digit":
|
||||
skeleton += "mm";
|
||||
break;
|
||||
case "numeric":
|
||||
skeleton += "m";
|
||||
break;
|
||||
}
|
||||
switch (options.second) {
|
||||
case "2-digit":
|
||||
skeleton += "ss";
|
||||
break;
|
||||
case "numeric":
|
||||
skeleton += "s";
|
||||
break;
|
||||
}
|
||||
switch (options.timeZoneName) {
|
||||
case "short":
|
||||
skeleton += "z";
|
||||
break;
|
||||
case "long":
|
||||
skeleton += "zzzz";
|
||||
break;
|
||||
}
|
||||
|
||||
// Let ICU convert the ICU skeleton to an ICU pattern for the given locale.
|
||||
return intl_patternForSkeleton(locale, skeleton);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a new options object that includes the provided options (if any)
|
||||
* and fills in default components if required components are not defined.
|
||||
* Required can be "date", "time", or "any".
|
||||
* Defaults can be "date", "time", or "all".
|
||||
*
|
||||
* Spec: ECMAScript Internationalization API Specification, 12.1.1.
|
||||
*/
|
||||
function ToDateTimeOptions(options, required, defaults) {
|
||||
assert(typeof required === "string", "ToDateTimeOptions");
|
||||
assert(typeof defaults === "string", "ToDateTimeOptions");
|
||||
|
||||
// Steps 1-3.
|
||||
if (options === undefined)
|
||||
options = null;
|
||||
else
|
||||
options = ToObject(options);
|
||||
options = std_Object_create(options);
|
||||
|
||||
// Step 4.
|
||||
var needDefaults = true;
|
||||
|
||||
// Step 5.
|
||||
if ((required === "date" || required === "any") &&
|
||||
(options.weekday !== undefined || options.year !== undefined ||
|
||||
options.month !== undefined || options.day !== undefined))
|
||||
{
|
||||
needDefaults = false;
|
||||
}
|
||||
|
||||
// Step 6.
|
||||
if ((required === "time" || required === "any") &&
|
||||
(options.hour !== undefined || options.minute !== undefined ||
|
||||
options.second !== undefined))
|
||||
{
|
||||
needDefaults = false;
|
||||
}
|
||||
|
||||
// Step 7.
|
||||
if (needDefaults && (defaults === "date" || defaults === "all")) {
|
||||
// The specification says to call [[DefineOwnProperty]] with false for
|
||||
// the Throw parameter, while Object.defineProperty uses true. For the
|
||||
// calls here, the difference doesn't matter because we're adding
|
||||
// properties to a new object.
|
||||
_DefineDataProperty(options, "year", "numeric");
|
||||
_DefineDataProperty(options, "month", "numeric");
|
||||
_DefineDataProperty(options, "day", "numeric");
|
||||
}
|
||||
|
||||
// Step 8.
|
||||
if (needDefaults && (defaults === "time" || defaults === "all")) {
|
||||
// See comment for step 7.
|
||||
_DefineDataProperty(options, "hour", "numeric");
|
||||
_DefineDataProperty(options, "minute", "numeric");
|
||||
_DefineDataProperty(options, "second", "numeric");
|
||||
}
|
||||
|
||||
// Step 9.
|
||||
return options;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the subset of the given locale list for which this locale list has a
|
||||
* matching (possibly fallback) locale. Locales appear in the same order in the
|
||||
* returned list as in the input list.
|
||||
*
|
||||
* Spec: ECMAScript Internationalization API Specification, 12.2.2.
|
||||
*/
|
||||
function Intl_DateTimeFormat_supportedLocalesOf(locales /*, options*/) {
|
||||
var options = arguments.length > 1 ? arguments[1] : undefined;
|
||||
|
||||
var availableLocales = callFunction(dateTimeFormatInternalProperties.availableLocales,
|
||||
dateTimeFormatInternalProperties);
|
||||
var requestedLocales = CanonicalizeLocaleList(locales);
|
||||
return SupportedLocales(availableLocales, requestedLocales, options);
|
||||
}
|
||||
|
||||
/**
|
||||
* DateTimeFormat internal properties.
|
||||
*
|
||||
* Spec: ECMAScript Internationalization API Specification, 9.1 and 12.2.3.
|
||||
*/
|
||||
var dateTimeFormatInternalProperties = {
|
||||
localeData: dateTimeFormatLocaleData,
|
||||
_availableLocales: null,
|
||||
availableLocales: function() // eslint-disable-line object-shorthand
|
||||
{
|
||||
var locales = this._availableLocales;
|
||||
if (locales)
|
||||
return locales;
|
||||
|
||||
locales = intl_DateTimeFormat_availableLocales();
|
||||
addSpecialMissingLanguageTags(locales);
|
||||
return (this._availableLocales = locales);
|
||||
},
|
||||
relevantExtensionKeys: ["ca", "nu", "hc"]
|
||||
};
|
||||
|
||||
function dateTimeFormatLocaleData() {
|
||||
return {
|
||||
ca: intl_availableCalendars,
|
||||
nu: getNumberingSystems,
|
||||
hc: () => {
|
||||
return [null, "h11", "h12", "h23", "h24"];
|
||||
},
|
||||
default: {
|
||||
ca: intl_defaultCalendar,
|
||||
nu: intl_numberingSystem,
|
||||
hc: () => {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Function to be bound and returned by Intl.DateTimeFormat.prototype.format.
|
||||
*
|
||||
* Spec: ECMAScript Internationalization API Specification, 12.3.2.
|
||||
*/
|
||||
function dateTimeFormatFormatToBind(date) {
|
||||
// Step 1.
|
||||
var dtf = this;
|
||||
|
||||
// Step 2.
|
||||
assert(IsObject(dtf), "dateTimeFormatFormatToBind called with non-Object");
|
||||
assert(IsDateTimeFormat(dtf), "dateTimeFormatFormatToBind called with non-DateTimeFormat");
|
||||
|
||||
// Steps 3-4.
|
||||
var x = (date === undefined) ? std_Date_now() : ToNumber(date);
|
||||
|
||||
// Step 5.
|
||||
return intl_FormatDateTime(dtf, x, /* formatToParts = */ false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a function bound to this DateTimeFormat that returns a String value
|
||||
* representing the result of calling ToNumber(date) according to the
|
||||
* effective locale and the formatting options of this DateTimeFormat.
|
||||
*
|
||||
* Spec: ECMAScript Internationalization API Specification, 12.3.2.
|
||||
*/
|
||||
function Intl_DateTimeFormat_format_get() {
|
||||
// Steps 1-3.
|
||||
var dtf = UnwrapDateTimeFormat(this, "format");
|
||||
|
||||
var internals = getDateTimeFormatInternals(dtf);
|
||||
|
||||
// Step 4.
|
||||
if (internals.boundFormat === undefined) {
|
||||
// Step 4.a.
|
||||
var F = dateTimeFormatFormatToBind;
|
||||
|
||||
// Steps 4.b-d.
|
||||
var bf = callFunction(FunctionBind, F, dtf);
|
||||
internals.boundFormat = bf;
|
||||
}
|
||||
|
||||
// Step 5.
|
||||
return internals.boundFormat;
|
||||
}
|
||||
_SetCanonicalName(Intl_DateTimeFormat_format_get, "get format");
|
||||
|
||||
/**
|
||||
* Intl.DateTimeFormat.prototype.formatToParts ( date )
|
||||
*/
|
||||
function Intl_DateTimeFormat_formatToParts(date) {
|
||||
// Step 1.
|
||||
var dtf = this;
|
||||
|
||||
// Steps 2-3.
|
||||
if (!IsObject(dtf) || !IsDateTimeFormat(dtf)) {
|
||||
ThrowTypeError(JSMSG_INTL_OBJECT_NOT_INITED, "DateTimeFormat", "formatToParts",
|
||||
"DateTimeFormat");
|
||||
}
|
||||
|
||||
// Ensure the DateTimeFormat internals are resolved.
|
||||
getDateTimeFormatInternals(dtf);
|
||||
|
||||
// Steps 4-5.
|
||||
var x = (date === undefined) ? std_Date_now() : ToNumber(date);
|
||||
|
||||
// Step 6.
|
||||
return intl_FormatDateTime(dtf, x, /* formatToParts = */ true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the resolved options for a DateTimeFormat object.
|
||||
*
|
||||
* Spec: ECMAScript Internationalization API Specification, 12.3.3 and 12.4.
|
||||
*/
|
||||
function Intl_DateTimeFormat_resolvedOptions() {
|
||||
// Invoke |UnwrapDateTimeFormat| per introduction of section 12.3.
|
||||
var dtf = UnwrapDateTimeFormat(this, "resolvedOptions");
|
||||
|
||||
var internals = getDateTimeFormatInternals(dtf);
|
||||
|
||||
var result = {
|
||||
locale: internals.locale,
|
||||
calendar: internals.calendar,
|
||||
numberingSystem: internals.numberingSystem,
|
||||
timeZone: internals.timeZone,
|
||||
};
|
||||
|
||||
if (internals.mozExtensions) {
|
||||
if (internals.patternOption !== undefined) {
|
||||
result.pattern = internals.pattern;
|
||||
} else if (internals.dateStyle || internals.timeStyle) {
|
||||
result.dateStyle = internals.dateStyle;
|
||||
result.timeStyle = internals.timeStyle;
|
||||
}
|
||||
}
|
||||
|
||||
resolveICUPattern(internals.pattern, result);
|
||||
return result;
|
||||
}
|
||||
|
||||
// Table mapping ICU pattern characters back to the corresponding date-time
|
||||
// components of DateTimeFormat. See
|
||||
// http://unicode.org/reports/tr35/tr35-dates.html#Date_Field_Symbol_Table
|
||||
var icuPatternCharToComponent = {
|
||||
E: "weekday",
|
||||
G: "era",
|
||||
y: "year",
|
||||
M: "month",
|
||||
L: "month",
|
||||
d: "day",
|
||||
h: "hour",
|
||||
H: "hour",
|
||||
k: "hour",
|
||||
K: "hour",
|
||||
m: "minute",
|
||||
s: "second",
|
||||
z: "timeZoneName",
|
||||
v: "timeZoneName",
|
||||
V: "timeZoneName"
|
||||
};
|
||||
|
||||
/**
|
||||
* Maps an ICU pattern string to a corresponding set of date-time components
|
||||
* and their values, and adds properties for these components to the result
|
||||
* object, which will be returned by the resolvedOptions method. For the
|
||||
* interpretation of ICU pattern characters, see
|
||||
* http://unicode.org/reports/tr35/tr35-dates.html#Date_Field_Symbol_Table
|
||||
*/
|
||||
function resolveICUPattern(pattern, result) {
|
||||
assert(IsObject(result), "resolveICUPattern");
|
||||
var i = 0;
|
||||
while (i < pattern.length) {
|
||||
var c = pattern[i++];
|
||||
if (c === "'") {
|
||||
while (i < pattern.length && pattern[i] !== "'")
|
||||
i++;
|
||||
i++;
|
||||
} else {
|
||||
var count = 1;
|
||||
while (i < pattern.length && pattern[i] === c) {
|
||||
i++;
|
||||
count++;
|
||||
}
|
||||
var value;
|
||||
switch (c) {
|
||||
// "text" cases
|
||||
case "G":
|
||||
case "E":
|
||||
case "z":
|
||||
case "v":
|
||||
case "V":
|
||||
if (count <= 3)
|
||||
value = "short";
|
||||
else if (count === 4)
|
||||
value = "long";
|
||||
else
|
||||
value = "narrow";
|
||||
break;
|
||||
// "number" cases
|
||||
case "y":
|
||||
case "d":
|
||||
case "h":
|
||||
case "H":
|
||||
case "m":
|
||||
case "s":
|
||||
case "k":
|
||||
case "K":
|
||||
if (count === 2)
|
||||
value = "2-digit";
|
||||
else
|
||||
value = "numeric";
|
||||
break;
|
||||
// "text & number" cases
|
||||
case "M":
|
||||
case "L":
|
||||
if (count === 1)
|
||||
value = "numeric";
|
||||
else if (count === 2)
|
||||
value = "2-digit";
|
||||
else if (count === 3)
|
||||
value = "short";
|
||||
else if (count === 4)
|
||||
value = "long";
|
||||
else
|
||||
value = "narrow";
|
||||
break;
|
||||
default:
|
||||
// skip other pattern characters and literal text
|
||||
}
|
||||
if (hasOwn(c, icuPatternCharToComponent))
|
||||
_DefineDataProperty(result, icuPatternCharToComponent[c], value);
|
||||
switch (c) {
|
||||
case "h":
|
||||
_DefineDataProperty(result, "hourCycle", "h12");
|
||||
_DefineDataProperty(result, "hour12", true);
|
||||
break;
|
||||
case "K":
|
||||
_DefineDataProperty(result, "hourCycle", "h11");
|
||||
_DefineDataProperty(result, "hour12", true);
|
||||
break;
|
||||
case "H":
|
||||
_DefineDataProperty(result, "hourCycle", "h23");
|
||||
_DefineDataProperty(result, "hour12", false);
|
||||
break;
|
||||
case "k":
|
||||
_DefineDataProperty(result, "hourCycle", "h24");
|
||||
_DefineDataProperty(result, "hour12", false);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -747,6 +747,7 @@ selfhosted.inputs = [
|
||||
'builtin/Generator.js',
|
||||
'builtin/Intl.js',
|
||||
'builtin/intl/CurrencyDataGenerated.js',
|
||||
'builtin/intl/DateTimeFormat.js',
|
||||
'builtin/intl/IntlObject.js',
|
||||
'builtin/intl/LangTagMappingsGenerated.js',
|
||||
'builtin/intl/PluralRules.js',
|
||||
|
Loading…
Reference in New Issue
Block a user