diff options
Diffstat (limited to 'Source/JavaScriptCore/icu/unicode/uloc.h')
| -rw-r--r-- | Source/JavaScriptCore/icu/unicode/uloc.h | 43 |
1 files changed, 26 insertions, 17 deletions
diff --git a/Source/JavaScriptCore/icu/unicode/uloc.h b/Source/JavaScriptCore/icu/unicode/uloc.h index 95758c3a3..28ab902b5 100644 --- a/Source/JavaScriptCore/icu/unicode/uloc.h +++ b/Source/JavaScriptCore/icu/unicode/uloc.h @@ -1,6 +1,6 @@ /* ********************************************************************** -* Copyright (C) 1997-2010, International Business Machines +* Copyright (C) 1997-2013, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** * @@ -289,7 +289,7 @@ /** * Unicode code point for '@' separating keywords from the locale string. * @see ULOC_KEYWORD_SEPARATOR - * @draft ICU 4.6 + * @stable ICU 4.6 */ #define ULOC_KEYWORD_SEPARATOR_UNICODE 0x40 @@ -302,7 +302,7 @@ /** * Unicode code point for '=' for assigning value to a keyword. * @see ULOC_KEYWORD_ASSIGN - * @draft ICU 4.6 + * @stable ICU 4.6 */ #define ULOC_KEYWORD_ASSIGN_UNICODE 0x3D @@ -315,7 +315,7 @@ /** * Unicode code point for ';' separating keywords * @see ULOC_KEYWORD_ITEM_SEPARATOR - * @draft ICU 4.6 + * @stable ICU 4.6 */ #define ULOC_KEYWORD_ITEM_SEPARATOR_UNICODE 0x3B @@ -353,7 +353,7 @@ typedef enum { ULOC_DATA_LOCALE_TYPE_LIMIT = 3 } ULocDataLocaleType ; - +#ifndef U_HIDE_SYSTEM_API /** * Gets ICU's default locale. * The returned string is a snapshot in time, and will remain valid @@ -388,6 +388,7 @@ uloc_getDefault(void); U_STABLE void U_EXPORT2 uloc_setDefault(const char* localeID, UErrorCode* status); +#endif /* U_HIDE_SYSTEM_API */ /** * Gets the language code for the specified locale. @@ -752,7 +753,9 @@ U_STABLE int32_t U_EXPORT2 uloc_countAvailable(void); /** * - * Gets a list of all available language codes defined in ISO 639. This is a pointer + * Gets a list of all available 2-letter language codes defined in ISO 639, + * plus additional 3-letter codes determined to be useful for locale generation as + * defined by Unicode CLDR. This is a pointer * to an array of pointers to arrays of char. All of these pointers are owned * by ICU-- do not delete them, and do not write through them. The array is * terminated with a null pointer. @@ -797,12 +800,15 @@ uloc_getParent(const char* localeID, /** - * Gets the full name for the specified locale. + * Gets the full name for the specified locale, like uloc_getName(), + * but without keywords. + * * Note: This has the effect of 'canonicalizing' the string to * a certain extent. Upper and lower case are set as needed, * and if the components were in 'POSIX' format they are changed to * ICU format. It does NOT map aliased names in any way. * See the top of this header file. + * * This API strips off the keyword part, so "de_DE\@collation=phonebook" * will become "de_DE". * This API supports preflighting. @@ -853,13 +859,16 @@ uloc_getKeywordValue(const char* localeID, /** - * Set the value of the specified keyword. + * Sets or removes the value of the specified keyword. + * + * For removing all keywords, use uloc_getBaseName(). + * * NOTE: Unlike almost every other ICU function which takes a * buffer, this function will NOT truncate the output text. If a * BUFFER_OVERFLOW_ERROR is received, it means that the original * buffer is untouched. This is done to prevent incorrect or possibly * even malformed locales from being generated and used. - * + * * @param keywordName name of the keyword to be set. Case insensitive. * @param keywordValue value of the keyword to be set. If 0-length or * NULL, will result in the keyword being removed. No error is given if @@ -1065,7 +1074,7 @@ uloc_minimizeSubtags(const char* localeID, int32_t minimizedLocaleIDCapacity, UErrorCode* err); -/** +/** * Returns a locale ID for the specified BCP47 language tag string. * If the specified language tag contains any ill-formed subtags, * the first such subtag and all following subtags are ignored. @@ -1081,21 +1090,21 @@ uloc_minimizeSubtags(const char* localeID, * @param localeID the output buffer receiving a locale ID for the * specified BCP47 language tag. * @param localeIDCapacity the size of the locale ID output buffer. - * @param parsedLength if not NULL, succsessfully parsed length + * @param parsedLength if not NULL, successfully parsed length * for the input language tag is set. * @param err error information if receiving the locald ID * failed. * @return the length of the locale ID. - * @draft ICU 4.2 + * @stable ICU 4.2 */ -U_DRAFT int32_t U_EXPORT2 +U_STABLE int32_t U_EXPORT2 uloc_forLanguageTag(const char* langtag, char* localeID, int32_t localeIDCapacity, int32_t* parsedLength, UErrorCode* err); -/** +/** * Returns a well-formed language tag for this locale ID. * <p> * <b>Note</b>: When <code>strict</code> is FALSE, any locale @@ -1104,7 +1113,7 @@ uloc_forLanguageTag(const char* langtag, * TRUE, this function sets U_ILLEGAL_ARGUMENT_ERROR to the * <code>err</code> if any locale fields do not satisfy the * BCP47 syntax requirement. - * @param localeID the input lcoale ID + * @param localeID the input locale ID * @param langtag the output buffer receiving BCP47 language * tag for the locale ID. * @param langtagCapacity the size of the BCP47 language tag @@ -1114,9 +1123,9 @@ uloc_forLanguageTag(const char* langtag, * @param err error information if receiving the language * tag failed. * @return The length of the BCP47 language tag. - * @draft ICU 4.2 + * @stable ICU 4.2 */ -U_DRAFT int32_t U_EXPORT2 +U_STABLE int32_t U_EXPORT2 uloc_toLanguageTag(const char* localeID, char* langtag, int32_t langtagCapacity, |