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

ICU-7385 rollback the changeset#28856. Hold the change until reviewed by icu-design list.

Browse source 
X-SVN-Rev: 28864
This commit is contained in:
Claire Ho 2010-10-19 01:27:56 +00:00
parent 9474226f53
commit e28ad3610d
4 changed files with 34 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
icu4c/source/i18n/dcfmtsym.cpp
View file

@ -28,7 +28,6 @@
#include "unicode/choicfmt.h"
#include "unicode/unistr.h"
#include "unicode/numsys.h"
#include "unicode/unum.h"
#include "ucurrimp.h"
#include "cstring.h"
#include "locbased.h"
@ -100,7 +99,7 @@ DecimalFormatSymbols::operator=(const DecimalFormatSymbols& rhs)
// fastCopyFrom is safe, see docs on fSymbols
fSymbols[(ENumberFormatSymbol)i].fastCopyFrom(rhs.fSymbols[(ENumberFormatSymbol)i]);
}
for(int32_t i = 0; i < (int32_t)UNUM_CURRENCY_SPACING_COUNT; ++i) {
for(int32_t i = 0; i < (int32_t)kCurrencySpacingCount; ++i) {
currencySpcBeforeSym[i].fastCopyFrom(rhs.currencySpcBeforeSym[i]);
currencySpcAfterSym[i].fastCopyFrom(rhs.currencySpcAfterSym[i]);
}
@ -124,7 +123,7 @@ DecimalFormatSymbols::operator==(const DecimalFormatSymbols& that) const
return FALSE;
}
}
for(int32_t i = 0; i < (int32_t)UNUM_CURRENCY_SPACING_COUNT; ++i) {
for(int32_t i = 0; i < (int32_t)kCurrencySpacingCount; ++i) {
if(currencySpcBeforeSym[i] != that.currencySpcBeforeSym[i]) {
return FALSE;
}
@ -344,7 +343,7 @@ DecimalFormatSymbols::initialize(const Locale& loc, UErrorCode& status, UBool us
gCurrencySpacingTag, NULL, &localStatus);
if (localStatus == U_USING_FALLBACK_WARNING || U_SUCCESS(localStatus)) {
const char* keywords[UNUM_CURRENCY_SPACING_COUNT] = {
const char* keywords[kCurrencySpacingCount] = {
gCurrencyMatchTag, gCurrencySudMatchTag, gCurrencyInsertBtnTag
};
localStatus = U_ZERO_ERROR;
@ -352,7 +351,7 @@ DecimalFormatSymbols::initialize(const Locale& loc, UErrorCode& status, UBool us
gBeforeCurrencyTag, NULL, &localStatus);
if (localStatus == U_USING_FALLBACK_WARNING || U_SUCCESS(localStatus)) {
localStatus = U_ZERO_ERROR;
for (int32_t i = 0; i < UNUM_CURRENCY_SPACING_COUNT; i++) {
for (int32_t i = 0; i < kCurrencySpacingCount; i++) {
currencySpcBeforeSym[i] = ures_getStringByKey(dataRes, keywords[i],
NULL, &localStatus);
}
@ -362,7 +361,7 @@ DecimalFormatSymbols::initialize(const Locale& loc, UErrorCode& status, UBool us
gAfterCurrencyTag, NULL, &localStatus);
if (localStatus == U_USING_FALLBACK_WARNING || U_SUCCESS(localStatus)) {
localStatus = U_ZERO_ERROR;
for (int32_t i = 0; i < UNUM_CURRENCY_SPACING_COUNT; i++) {
for (int32_t i = 0; i < kCurrencySpacingCount; i++) {
currencySpcAfterSym[i] = ures_getStringByKey(dataRes, keywords[i],
NULL, &localStatus);
}
@ -420,7 +419,7 @@ DecimalFormatSymbols::getLocale(ULocDataLocaleType type, UErrorCode& status) con
}
const UnicodeString&
DecimalFormatSymbols::getPatternForCurrencySpacing(UCurrencySpacing type,
DecimalFormatSymbols::getPatternForCurrencySpacing(ECurrencySpacing type,
UBool beforeCurrency,
UErrorCode& status) const {
if (U_FAILURE(status)) {
@ -434,7 +433,7 @@ DecimalFormatSymbols::getPatternForCurrencySpacing(UCurrencySpacing type,
}
void
DecimalFormatSymbols::setPatternForCurrencySpacing(UCurrencySpacing type,
DecimalFormatSymbols::setPatternForCurrencySpacing(ECurrencySpacing type,
UBool beforeCurrency,
const UnicodeString& pattern) {
if (beforeCurrency) {

28
icu4c/source/i18n/unicode/dcfmtsym.h
View file

@ -32,7 +32,6 @@
#include "unicode/uobject.h"
#include "unicode/locid.h"
#include "unum.h"
/**
* \file
@ -167,6 +166,17 @@ public:
kFormatSymbolCount
};
/**
* Constants for specifying currency spacing
* @draft ICU 4.2
*/
enum ECurrencySpacing {
kCurrencyMatch,
kSurroundingMatch,
kInsert,
kCurrencySpacingCount
};
/**
* Create a DecimalFormatSymbols object for the given locale.
*
@ -269,7 +279,7 @@ public:
* This API gets the CurrencySpacing data from ResourceBundle. The pattern can
* be empty if there is no data from current locale and its parent locales.
*
* @param type : UNUM_CURRENCY_MATCH, UNUM_CURRENCY_SURROUNDING_MATCH or UNUM_CURRENCY_INSERT.
* @param type : kCurrencyMatch, kSurroundingMatch or kInsert.
* @param beforeCurrency : true if the pattern is for before currency symbol.
* false if the pattern is for after currency symbol.
* @param status: Input/output parameter, set to success or
@ -277,22 +287,22 @@ public:
* @return pattern string for currencyMatch, surroundingMatch or spaceInsert.
* Return empty string if there is no data for this locale and its parent
* locales.
* @draft ICU 4.6
* @draft ICU 4.2
*/
const UnicodeString& getPatternForCurrencySpacing(UCurrencySpacing type,
const UnicodeString& getPatternForCurrencySpacing(ECurrencySpacing type,
UBool beforeCurrency,
UErrorCode& status) const;
/**
* Set pattern string for 'CurrencySpacing' that can be applied to
* currency format.
*
* @param type : UNUM_CURRENCY_MATCH, UNUM_CURRENCY_SURROUNDING_MATCH or UNUM_CURRENCY_INSERT.
* @param type : kCurrencyMatch, kSurroundingMatch or kInsert.
* @param beforeCurrency : true if the pattern is for before currency symbol.
* false if the pattern is for after currency symbol.
* @param pattern : pattern string to override current setting.
* @draft ICU 4.6
* @draft ICU 4.2
*/
void setPatternForCurrencySpacing(UCurrencySpacing type,
void setPatternForCurrencySpacing(ECurrencySpacing type,
UBool beforeCurrency,
const UnicodeString& pattern);
@ -382,8 +392,8 @@ private:
char validLocale[ULOC_FULLNAME_CAPACITY];
const UChar* currPattern;
UnicodeString currencySpcBeforeSym[UNUM_CURRENCY_SPACING_COUNT];
UnicodeString currencySpcAfterSym[UNUM_CURRENCY_SPACING_COUNT];
UnicodeString currencySpcBeforeSym[kCurrencySpacingCount];
UnicodeString currencySpcAfterSym[kCurrencySpacingCount];
};
// -------------------------------------

11
icu4c/source/i18n/unicode/unum.h
View file

@ -206,17 +206,6 @@ typedef enum UNumberFormatPadPosition {
UNUM_PAD_AFTER_SUFFIX
} UNumberFormatPadPosition;
/**
* Constants for specifying currency spacing
* @draft ICU 4.6
*/
typedef enum UCurrencySpacing {
UNUM_CURRENCY_MATCH,
UNUM_CURRENCY_SURROUNDING_MATCH,
UNUM_CURRENCY_INSERT,
UNUM_CURRENCY_SPACING_COUNT
} UCurrencySpacing;
/**
* Create and return a new UNumberFormat for formatting and parsing
* numbers. A UNumberFormat may be used to format numbers by calling

16
icu4c/source/test/intltest/tsdcfmsy.cpp
View file

@ -124,15 +124,15 @@ void IntlTestDecimalFormatSymbols::testSymbols(/* char *par */)
// Test get currency spacing before the currency.
status = U_ZERO_ERROR;
for (int32_t i = 0; i < (int32_t)UNUM_CURRENCY_SPACING_COUNT; i++) {
for (int32_t i = 0; i < (int32_t)DecimalFormatSymbols::kCurrencySpacingCount; i++) {
UnicodeString enCurrencyPattern = en.getPatternForCurrencySpacing(
(UCurrencySpacing)i, TRUE, status);
(DecimalFormatSymbols::ECurrencySpacing)i, TRUE, status);
if(U_FAILURE(status)) {
errln("Error: cannot get CurrencyMatch for locale:en");
status = U_ZERO_ERROR;
}
UnicodeString frCurrencyPattern = fr.getPatternForCurrencySpacing(
(UCurrencySpacing)i, TRUE, status);
(DecimalFormatSymbols::ECurrencySpacing)i, TRUE, status);
if(U_FAILURE(status)) {
errln("Error: cannot get CurrencyMatch for locale:fr");
}
@ -142,15 +142,15 @@ void IntlTestDecimalFormatSymbols::testSymbols(/* char *par */)
}
// Test get currencySpacing after the currency.
status = U_ZERO_ERROR;
for (int32_t i = 0; i < UNUM_CURRENCY_SPACING_COUNT; i++) {
for (int32_t i = 0; i < DecimalFormatSymbols::kCurrencySpacingCount; i++) {
UnicodeString enCurrencyPattern = en.getPatternForCurrencySpacing(
(UCurrencySpacing)i, FALSE, status);
(DecimalFormatSymbols::ECurrencySpacing)i, FALSE, status);
if(U_FAILURE(status)) {
errln("Error: cannot get CurrencyMatch for locale:en");
status = U_ZERO_ERROR;
}
UnicodeString frCurrencyPattern = fr.getPatternForCurrencySpacing(
(UCurrencySpacing)i, FALSE, status);
(DecimalFormatSymbols::ECurrencySpacing)i, FALSE, status);
if(U_FAILURE(status)) {
errln("Error: cannot get CurrencyMatch for locale:fr");
}
@ -161,9 +161,9 @@ void IntlTestDecimalFormatSymbols::testSymbols(/* char *par */)
// Test set curerncySpacing APIs
status = U_ZERO_ERROR;
UnicodeString dash = UnicodeString("-");
en.setPatternForCurrencySpacing(UNUM_CURRENCY_INSERT, TRUE, dash);
en.setPatternForCurrencySpacing(DecimalFormatSymbols::kInsert, TRUE, dash);
UnicodeString enCurrencyInsert = en.getPatternForCurrencySpacing(
UNUM_CURRENCY_INSERT, TRUE, status);
DecimalFormatSymbols::kInsert, TRUE, status);
if (dash != enCurrencyInsert) {
errln("Error: Failed to setCurrencyInsert for locale:en");
}