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

ICU-9110 C - Name tweaks for consistency with some improvements in J

Browse source 
X-SVN-Rev: 31483
This commit is contained in:
Peter Edberg 2012-02-22 09:06:12 +00:00
parent 331eea1d3f
commit efc03a774b
4 changed files with 44 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
icu4c/source/i18n/smpdtfmt.cpp
View file

@ -235,7 +235,7 @@ SimpleDateFormat::SimpleDateFormat(UErrorCode& status)
fTimeZoneFormat(NULL),
fNumberFormatters(NULL),
fOverrideList(NULL),
fDefaultCapitalizationContext(UDAT_CAPITALIZATION_UNKNOWN)
fDefaultCapitalizationContext(UDAT_CONTEXT_UNKNOWN)
{
construct(kShort, (EStyle) (kShort + kDateOffset), fLocale, status);
initializeDefaultCentury();
@ -251,7 +251,7 @@ SimpleDateFormat::SimpleDateFormat(const UnicodeString& pattern,
fTimeZoneFormat(NULL),
fNumberFormatters(NULL),
fOverrideList(NULL),
fDefaultCapitalizationContext(UDAT_CAPITALIZATION_UNKNOWN)
fDefaultCapitalizationContext(UDAT_CONTEXT_UNKNOWN)
{
fDateOverride.setToBogus();
fTimeOverride.setToBogus();
@ -271,7 +271,7 @@ SimpleDateFormat::SimpleDateFormat(const UnicodeString& pattern,
fTimeZoneFormat(NULL),
fNumberFormatters(NULL),
fOverrideList(NULL),
fDefaultCapitalizationContext(UDAT_CAPITALIZATION_UNKNOWN)
fDefaultCapitalizationContext(UDAT_CONTEXT_UNKNOWN)
{
fDateOverride.setTo(override);
fTimeOverride.setToBogus();
@ -293,7 +293,7 @@ SimpleDateFormat::SimpleDateFormat(const UnicodeString& pattern,
fTimeZoneFormat(NULL),
fNumberFormatters(NULL),
fOverrideList(NULL),
fDefaultCapitalizationContext(UDAT_CAPITALIZATION_UNKNOWN)
fDefaultCapitalizationContext(UDAT_CONTEXT_UNKNOWN)
{
fDateOverride.setToBogus();
@ -315,7 +315,7 @@ SimpleDateFormat::SimpleDateFormat(const UnicodeString& pattern,
fTimeZoneFormat(NULL),
fNumberFormatters(NULL),
fOverrideList(NULL),
fDefaultCapitalizationContext(UDAT_CAPITALIZATION_UNKNOWN)
fDefaultCapitalizationContext(UDAT_CONTEXT_UNKNOWN)
{
fDateOverride.setTo(override);
@ -340,7 +340,7 @@ SimpleDateFormat::SimpleDateFormat(const UnicodeString& pattern,
fTimeZoneFormat(NULL),
fNumberFormatters(NULL),
fOverrideList(NULL),
fDefaultCapitalizationContext(UDAT_CAPITALIZATION_UNKNOWN)
fDefaultCapitalizationContext(UDAT_CONTEXT_UNKNOWN)
{
fDateOverride.setToBogus();
@ -362,7 +362,7 @@ SimpleDateFormat::SimpleDateFormat(const UnicodeString& pattern,
fTimeZoneFormat(NULL),
fNumberFormatters(NULL),
fOverrideList(NULL),
fDefaultCapitalizationContext(UDAT_CAPITALIZATION_UNKNOWN)
fDefaultCapitalizationContext(UDAT_CONTEXT_UNKNOWN)
{
fDateOverride.setToBogus();
@ -385,7 +385,7 @@ SimpleDateFormat::SimpleDateFormat(EStyle timeStyle,
fTimeZoneFormat(NULL),
fNumberFormatters(NULL),
fOverrideList(NULL),
fDefaultCapitalizationContext(UDAT_CAPITALIZATION_UNKNOWN)
fDefaultCapitalizationContext(UDAT_CONTEXT_UNKNOWN)
{
construct(timeStyle, dateStyle, fLocale, status);
if(U_SUCCESS(status)) {
@ -408,7 +408,7 @@ SimpleDateFormat::SimpleDateFormat(const Locale& locale,
fTimeZoneFormat(NULL),
fNumberFormatters(NULL),
fOverrideList(NULL),
fDefaultCapitalizationContext(UDAT_CAPITALIZATION_UNKNOWN)
fDefaultCapitalizationContext(UDAT_CONTEXT_UNKNOWN)
{
if (U_FAILURE(status)) return;
initializeSymbols(fLocale, initializeCalendar(NULL, fLocale, status),status);
@ -442,7 +442,7 @@ SimpleDateFormat::SimpleDateFormat(const SimpleDateFormat& other)
fTimeZoneFormat(NULL),
fNumberFormatters(NULL),
fOverrideList(NULL),
fDefaultCapitalizationContext(UDAT_CAPITALIZATION_UNKNOWN)
fDefaultCapitalizationContext(UDAT_CONTEXT_UNKNOWN)
{
*this = other;
}
@ -1518,13 +1518,13 @@ SimpleDateFormat::subFormat(UnicodeString &appendTo,
// first field, check to see whether we need to titlecase it
UBool titlecase = FALSE;
switch (capitalizationContext) {
case UDAT_CAPITALIZATION_BEGINNING_OF_SENTENCE:
case UDAT_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE:
titlecase = TRUE;
break;
case UDAT_CAPITALIZATION_UI_LIST_OR_MENU:
case UDAT_CAPITALIZATION_FOR_UI_LIST_OR_MENU:
titlecase = fSymbols->fCapitalization[capContextUsageType][0];
break;
case UDAT_CAPITALIZATION_STANDALONE:
case UDAT_CAPITALIZATION_FOR_STANDALONE:
titlecase = fSymbols->fCapitalization[capContextUsageType][1];
break;
default:

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

@ -190,39 +190,41 @@ typedef enum UDateFormatContextType {
* @draft ICU 49
*/
typedef enum UDateFormatContextValue {
/** Values for type (key) UDAT_CAPITALIZATION */
/** Values for any UDateFormatContextType (key) */
/**
* UDAT_CAPITALIZATION value if the capitalization context for which a date
* (or date symbol) is to be formatted is unknown (this is the default if
* no UDAT_CAPITALIZATION value is explicitly specified).
* Value for any UDateFormatContextType (such as UDAT_CAPITALIZATION) if the
* relevant context to be used in formatting a date is unknown (this is the
* default value for any UDateFormatContextType when no value has been
* explicitly specified for that UDateFormatContextType).
* @draft ICU 49
*/
UDAT_CAPITALIZATION_UNKNOWN = 0,
UDAT_CONTEXT_UNKNOWN = 0,
/** Values for type (key) UDAT_CAPITALIZATION */
/**
* UDAT_CAPITALIZATION value if a date (or date symbol) is to be formatted
* with capitalization appropriate for the middle of a sentence.
* @draft ICU 49
*/
UDAT_CAPITALIZATION_MIDDLE_OF_SENTENCE = 1,
UDAT_CAPITALIZATION_FOR_MIDDLE_OF_SENTENCE = 1,
/**
* UDAT_CAPITALIZATION value if a date (or date symbol) is to be formatted
* with capitalization appropriate for the beginning of a sentence.
* @draft ICU 49
*/
UDAT_CAPITALIZATION_BEGINNING_OF_SENTENCE = 2,
UDAT_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE = 2,
/**
* UDAT_CAPITALIZATION value if a date (or date symbol) is to be formatted
* with capitalization appropriate for a user-interface list or menu item.
* @draft ICU 49
*/
UDAT_CAPITALIZATION_UI_LIST_OR_MENU = 3,
UDAT_CAPITALIZATION_FOR_UI_LIST_OR_MENU = 3,
/**
* UDAT_CAPITALIZATION value if a date (or date symbol) is to be formatted
* with capitalization appropriate for stand-alone usage such as an
* isolated name on a calendar page.
* @draft ICU 49
*/
UDAT_CAPITALIZATION_STANDALONE = 4
UDAT_CAPITALIZATION_FOR_STANDALONE = 4
} UDateFormatContextValue;
/**

20
icu4c/source/test/cintltst/cdattst.c
View file

@ -1250,16 +1250,16 @@ typedef struct {
} TestContextItem;
static const TestContextItem textContextItems[] = {
{ "fr", skeleton_yMMMM, UDAT_CAPITALIZATION_UNKNOWN, july2008_frDefault },
{ "fr", skeleton_yMMMM, UDAT_CAPITALIZATION_MIDDLE_OF_SENTENCE, july2008_frDefault },
{ "fr", skeleton_yMMMM, UDAT_CAPITALIZATION_BEGINNING_OF_SENTENCE, july2008_frTitle },
{ "fr", skeleton_yMMMM, UDAT_CAPITALIZATION_UI_LIST_OR_MENU, july2008_frDefault },
{ "fr", skeleton_yMMMM, UDAT_CAPITALIZATION_STANDALONE, july2008_frTitle },
{ "cs", skeleton_yMMMM, UDAT_CAPITALIZATION_UNKNOWN, july2008_csDefault },
{ "cs", skeleton_yMMMM, UDAT_CAPITALIZATION_MIDDLE_OF_SENTENCE, july2008_csDefault },
{ "cs", skeleton_yMMMM, UDAT_CAPITALIZATION_BEGINNING_OF_SENTENCE, july2008_csTitle },
{ "cs", skeleton_yMMMM, UDAT_CAPITALIZATION_UI_LIST_OR_MENU, july2008_csTitle },
{ "cs", skeleton_yMMMM, UDAT_CAPITALIZATION_STANDALONE, july2008_csDefault },
{ "fr", skeleton_yMMMM, UDAT_CONTEXT_UNKNOWN, july2008_frDefault },
{ "fr", skeleton_yMMMM, UDAT_CAPITALIZATION_FOR_MIDDLE_OF_SENTENCE, july2008_frDefault },
{ "fr", skeleton_yMMMM, UDAT_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE, july2008_frTitle },
{ "fr", skeleton_yMMMM, UDAT_CAPITALIZATION_FOR_UI_LIST_OR_MENU, july2008_frDefault },
{ "fr", skeleton_yMMMM, UDAT_CAPITALIZATION_FOR_STANDALONE, july2008_frTitle },
{ "cs", skeleton_yMMMM, UDAT_CONTEXT_UNKNOWN, july2008_csDefault },
{ "cs", skeleton_yMMMM, UDAT_CAPITALIZATION_FOR_MIDDLE_OF_SENTENCE, july2008_csDefault },
{ "cs", skeleton_yMMMM, UDAT_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE, july2008_csTitle },
{ "cs", skeleton_yMMMM, UDAT_CAPITALIZATION_FOR_UI_LIST_OR_MENU, july2008_csTitle },
{ "cs", skeleton_yMMMM, UDAT_CAPITALIZATION_FOR_STANDALONE, july2008_csDefault },
{ NULL, NULL, 0, NULL }
};

20
icu4c/source/test/intltest/dtfmttst.cpp
View file

@ -3844,16 +3844,16 @@ void DateFormatTest::TestContext()
const UDate july022008 = 1215000001979.0;
const TestContextItem items[] = {
//locale pattern capitalizationContext expected formatted date
{ "fr", UnicodeString("MMMM y"), UDAT_CAPITALIZATION_UNKNOWN, UnicodeString("juillet 2008") },
{ "fr", UnicodeString("MMMM y"), UDAT_CAPITALIZATION_MIDDLE_OF_SENTENCE, UnicodeString("juillet 2008") },
{ "fr", UnicodeString("MMMM y"), UDAT_CAPITALIZATION_BEGINNING_OF_SENTENCE, UnicodeString("Juillet 2008") },
{ "fr", UnicodeString("MMMM y"), UDAT_CAPITALIZATION_UI_LIST_OR_MENU, UnicodeString("juillet 2008") },
{ "fr", UnicodeString("MMMM y"), UDAT_CAPITALIZATION_STANDALONE, UnicodeString("Juillet 2008") },
{ "cs", UnicodeString("LLLL y"), UDAT_CAPITALIZATION_UNKNOWN, CharsToUnicodeString("\\u010Dervenec 2008") },
{ "cs", UnicodeString("LLLL y"), UDAT_CAPITALIZATION_MIDDLE_OF_SENTENCE, CharsToUnicodeString("\\u010Dervenec 2008") },
{ "cs", UnicodeString("LLLL y"), UDAT_CAPITALIZATION_BEGINNING_OF_SENTENCE, CharsToUnicodeString("\\u010Cervenec 2008") },
{ "cs", UnicodeString("LLLL y"), UDAT_CAPITALIZATION_UI_LIST_OR_MENU, CharsToUnicodeString("\\u010Cervenec 2008") },
{ "cs", UnicodeString("LLLL y"), UDAT_CAPITALIZATION_STANDALONE, CharsToUnicodeString("\\u010Dervenec 2008") },
{ "fr", UnicodeString("MMMM y"), UDAT_CONTEXT_UNKNOWN, UnicodeString("juillet 2008") },
{ "fr", UnicodeString("MMMM y"), UDAT_CAPITALIZATION_FOR_MIDDLE_OF_SENTENCE, UnicodeString("juillet 2008") },
{ "fr", UnicodeString("MMMM y"), UDAT_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE, UnicodeString("Juillet 2008") },
{ "fr", UnicodeString("MMMM y"), UDAT_CAPITALIZATION_FOR_UI_LIST_OR_MENU, UnicodeString("juillet 2008") },
{ "fr", UnicodeString("MMMM y"), UDAT_CAPITALIZATION_FOR_STANDALONE, UnicodeString("Juillet 2008") },
{ "cs", UnicodeString("LLLL y"), UDAT_CONTEXT_UNKNOWN, CharsToUnicodeString("\\u010Dervenec 2008") },
{ "cs", UnicodeString("LLLL y"), UDAT_CAPITALIZATION_FOR_MIDDLE_OF_SENTENCE, CharsToUnicodeString("\\u010Dervenec 2008") },
{ "cs", UnicodeString("LLLL y"), UDAT_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE, CharsToUnicodeString("\\u010Cervenec 2008") },
{ "cs", UnicodeString("LLLL y"), UDAT_CAPITALIZATION_FOR_UI_LIST_OR_MENU, CharsToUnicodeString("\\u010Cervenec 2008") },
{ "cs", UnicodeString("LLLL y"), UDAT_CAPITALIZATION_FOR_STANDALONE, CharsToUnicodeString("\\u010Dervenec 2008") },
// terminator
{ NULL, UnicodeString(""), (UDateFormatContextValue)0, UnicodeString("") }
};