organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-08 23:10:40 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-9586 undo r32398 as it pertains to ICU-9569 - accidentally checked in

Browse source 
X-SVN-Rev: 32400
This commit is contained in:
Steven R. Loomis 2012-09-17 22:36:37 +00:00
parent da3f855b46
commit 58a86d0fe6
2 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
icu4c/source/i18n/udat.cpp
View file

@ -138,7 +138,7 @@ udat_open(UDateFormatStyle timeStyle,
return (UDateFormat*)fmt;
} // else fall through.
}
if(timeStyle != UDAT_PATTERN) {
if(timeStyle != UDAT_IGNORE) {
if(locale == 0) {
fmt = DateFormat::createDateTimeInstance((DateFormat::EStyle)dateStyle,
(DateFormat::EStyle)timeStyle);

16
icu4c/source/i18n/unicode/udat.h
View file

@ -167,16 +167,9 @@ typedef enum UDateFormatStyle {
/** No style */
UDAT_NONE = -1,
/** for internal API use only */
UDAT_IGNORE = -2
/**
* Use the pattern given in the parameter to udat_open
* @see udat_open
* @draft ICU 50
*/
UDAT_PATTERN = -2,
/** @internal alias to UDAT_PATTERN */
UDAT_IGNORE = UDAT_PATTERN,
} UDateFormatStyle;
/* Cannot use #ifndef U_HIDE_DRAFT_API for UDateFormatContextType and UDateFormatContextValue
@ -588,12 +581,9 @@ udat_toCalendarDateField(UDateFormatField field);
* @param timeStyle The style used to format times; one of UDAT_FULL, UDAT_LONG,
* UDAT_MEDIUM, UDAT_SHORT, UDAT_DEFAULT, or UDAT_NONE (relative time styles
* are not currently supported).
* When the pattern parameter is used, pass in UDAT_PATTERN for both timeStyle and dateStyle.
* @param dateStyle The style used to format dates; one of UDAT_FULL, UDAT_LONG,
* UDAT_MEDIUM, UDAT_SHORT, UDAT_DEFAULT, UDAT_FULL_RELATIVE, UDAT_LONG_RELATIVE,
* UDAT_MEDIUM_RELATIVE, UDAT_SHORT_RELATIVE, or UDAT_NONE.
* When the pattern parameter is used, pass in UDAT_PATTERN for both timeStyle and dateStyle.
* As currently implemented,
* UDAT_MEDIUM_RELATIVE, UDAT_SHORT_RELATIVE, or UDAT_NONE. As currently implemented,
* relative date formatting only affects a limited range of calendar days before or
* after the current date, based on the CLDR <field type="day">/<relative> data: For
* example, in English, "Yesterday", "Today", and "Tomorrow". Outside of this range,