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

ICU-6736 Support new CLDR data - CurrencySpacing.

Browse source 
X-SVN-Rev: 25868
This commit is contained in:
Claire Ho 2009-04-22 22:07:52 +00:00
parent 5efc717c00
commit 8e87a3957e
2 changed files with 80 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -41,10 +41,12 @@ U_NAMESPACE_BEGIN
UOBJECT_DEFINE_RTTI_IMPLEMENTATION(DecimalFormatSymbols)
static const char gNumberElements[] = "NumberElements";
static const char gCurrencyFormatsTag[] = "currencyFormats";
static const char gCurrencySpacingTag[] = "currencySpacing";
static const char gBeforeCurrencyTag[] = "beforeCurrency";
static const char gAfterCurrencyTag[] = "afterCurrency";
static const char gCurrencyMatchTag[] = "currencyMatch";
static const char gCurrencySudMatchTag[] = "surroundingMatch";
static const char gCurrencyInsertBtnTag[] = "insertBetween";
static const UChar INTL_CURRENCY_SYMBOL_STR[] = {0xa4, 0xa4, 0};
@ -94,12 +96,10 @@ 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)kCurrencySpacingCount; ++i) {
currencySpcBeforeSym[i].fastCopyFrom(rhs.currencySpcBeforeSym[i]);
currencySpcAfterSym[i].fastCopyFrom(rhs.currencySpcAfterSym[i]);
}
*/
locale = rhs.locale;
uprv_strcpy(validLocale, rhs.validLocale);
uprv_strcpy(actualLocale, rhs.actualLocale);
@ -120,7 +120,6 @@ DecimalFormatSymbols::operator==(const DecimalFormatSymbols& that) const
return FALSE;
}
}
/*
for(int32_t i = 0; i < (int32_t)kCurrencySpacingCount; ++i) {
if(currencySpcBeforeSym[i] != that.currencySpcBeforeSym[i]) {
return FALSE;
@ -129,7 +128,6 @@ DecimalFormatSymbols::operator==(const DecimalFormatSymbols& that) const
return FALSE;
}
}
*/
return locale == that.locale &&
uprv_strcmp(validLocale, that.validLocale) == 0 &&
uprv_strcmp(actualLocale, that.actualLocale) == 0;
@ -250,42 +248,37 @@ DecimalFormatSymbols::initialize(const Locale& loc, UErrorCode& status,
ures_close(numberElementsRes);
// Currency Spacing.
/*
UErrorCode localStatus = U_ZERO_ERROR;
UResourceBundle *currencyFormRes = ures_getByKeyWithFallback(resource,
gCurrencyFormatsTag, NULL, &localStatus);
if (localStatus == U_USING_FALLBACK_WARNING || U_SUCCESS(localStatus)) {
localStatus = U_ZERO_ERROR;
UResourceBundle *currencySpcRes = ures_getByKeyWithFallback(currencyFormRes,
UResourceBundle *currencySpcRes = ures_getByKeyWithFallback(resource,
gCurrencySpacingTag, NULL, &localStatus);
if (localStatus == U_USING_FALLBACK_WARNING || U_SUCCESS(localStatus)) {
const char* keywords[kCurrencySpacingCount] = {
gCurrencyMatchTag, gCurrencySudMatchTag, gCurrencyInsertBtnTag
};
localStatus = U_ZERO_ERROR;
UResourceBundle *dataRes = ures_getByKeyWithFallback(currencySpcRes,
gBeforeCurrencyTag, NULL, &localStatus);
if (localStatus == U_USING_FALLBACK_WARNING || U_SUCCESS(localStatus)) {
localStatus = U_ZERO_ERROR;
UResourceBundle *dataRes = ures_getByKeyWithFallback(currencySpcRes,
gBeforeCurrencyTag, NULL, &localStatus);
if (localStatus == U_USING_FALLBACK_WARNING || U_SUCCESS(localStatus)) {
localStatus = U_ZERO_ERROR;
for (int32_t i = 0; i < kCurrencySpacingCount; i++) {
currencySpcBeforeSym[i] = ures_getStringByIndex(dataRes, i,
NULL, &localStatus);
}
ures_close(dataRes);
for (int32_t i = 0; i < kCurrencySpacingCount; i++) {
currencySpcBeforeSym[i] = ures_getStringByKey(dataRes, keywords[i],
NULL, &localStatus);
}
dataRes = ures_getByKeyWithFallback(currencySpcRes,
gAfterCurrencyTag, NULL, &localStatus);
if (localStatus == U_USING_FALLBACK_WARNING || U_SUCCESS(localStatus)) {
localStatus = U_ZERO_ERROR;
for (int32_t i = 0; i < kCurrencySpacingCount; i++) {
currencySpcAfterSym[i] = ures_getStringByIndex(dataRes, i,
NULL, &localStatus);
}
ures_close(dataRes);
}
ures_close(currencySpcRes);
ures_close(dataRes);
}
ures_close(currencyFormRes);
dataRes = ures_getByKeyWithFallback(currencySpcRes,
gAfterCurrencyTag, NULL, &localStatus);
if (localStatus == U_USING_FALLBACK_WARNING || U_SUCCESS(localStatus)) {
localStatus = U_ZERO_ERROR;
for (int32_t i = 0; i < kCurrencySpacingCount; i++) {
currencySpcAfterSym[i] = ures_getStringByKey(dataRes, keywords[i],
NULL, &localStatus);
}
ures_close(dataRes);
}
ures_close(currencySpcRes);
}
*/
ures_close(resource);
}

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

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2001, International Business Machines Corporation and
* COPYRIGHT:
* Copyright (c) 1997-2009, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@ -17,7 +17,7 @@ void IntlTestDecimalFormatSymbols::runIndexedTest( int32_t index, UBool exec, co
{
if (exec) logln("TestSuite DecimalFormatSymbols");
switch (index) {
case 0: name = "DecimalFormatSymbols test";
case 0: name = "DecimalFormatSymbols test";
if (exec) {
logln("DecimalFormatSymbols test---"); logln("");
testSymbols(/*par*/);
@ -113,16 +113,62 @@ void IntlTestDecimalFormatSymbols::testSymbols(/* char *par */)
if(fr.getSymbol(DecimalFormatSymbols::kMinusSignSymbol) != en.getSymbol(DecimalFormatSymbols::kMinusSignSymbol)) {
errln("ERROR: get/set MinusSign failed");
}
UnicodeString exponential(en.getSymbol(DecimalFormatSymbols::kExponentialSymbol));
fr.setSymbol(DecimalFormatSymbols::kExponentialSymbol, exponential);
if(fr.getSymbol(DecimalFormatSymbols::kExponentialSymbol) != en.getSymbol(DecimalFormatSymbols::kExponentialSymbol)) {
errln("ERROR: get/set Exponential failed");
}
// Test get currency spacing before the currency.
status = U_ZERO_ERROR;
for (int32_t i = 0; i < (int32_t)DecimalFormatSymbols::kCurrencySpacingCount; i++) {
UnicodeString enCurrencyPattern = en.getPatternForCurrencySpacing(
(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(
(DecimalFormatSymbols::ECurrencySpacing)i, TRUE, status);
if(U_FAILURE(status)) {
errln("Error: cannot get CurrencyMatch for locale:fr");
}
if (enCurrencyPattern != frCurrencyPattern) {
errln("ERROR: get CurrencySpacing failed");
}
}
// Test get currencySpacing after the currency.
status = U_ZERO_ERROR;
for (int32_t i = 0; i < DecimalFormatSymbols::kCurrencySpacingCount; i++) {
UnicodeString enCurrencyPattern = en.getPatternForCurrencySpacing(
(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(
(DecimalFormatSymbols::ECurrencySpacing)i, FALSE, status);
if(U_FAILURE(status)) {
errln("Error: cannot get CurrencyMatch for locale:fr");
}
if (enCurrencyPattern != frCurrencyPattern) {
errln("ERROR: get CurrencySpacing failed");
}
}
// Test set curerncySpacing APIs
status = U_ZERO_ERROR;
UnicodeString dash = UnicodeString("-");
en.setPatternForCurrencySpacing(DecimalFormatSymbols::kInsert, TRUE, dash);
UnicodeString enCurrencyInsert = en.getPatternForCurrencySpacing(
DecimalFormatSymbols::kInsert, TRUE, status);
if (dash != enCurrencyInsert) {
errln("Error: Failed to setCurrencyInsert for locale:en");
}
status = U_ZERO_ERROR;
DecimalFormatSymbols foo(status);
DecimalFormatSymbols bar(foo);
en = fr;
@ -149,8 +195,7 @@ void IntlTestDecimalFormatSymbols::testSymbols(/* char *par */)
UnicodeString((UChar32)(0x10330 + i)));
}
}
DecimalFormatSymbols sym(Locale::getUS(), status);
UnicodeString customDecSeperator("S");
@ -163,7 +208,7 @@ void IntlTestDecimalFormatSymbols::testSymbols(/* char *par */)
Verify(34.5, CharsToUnicodeString("\\u00a4##.##"), sym, (UnicodeString)"D34.5");
sym.setSymbol((DecimalFormatSymbols::ENumberFormatSymbol)1, (UnicodeString)"|");
Verify(3456.5, (UnicodeString)"0,000.##", sym, (UnicodeString)"3|456S5");
}
void IntlTestDecimalFormatSymbols::Verify(double value, const UnicodeString& pattern, DecimalFormatSymbols sym, const UnicodeString& expected){
@ -176,7 +221,7 @@ void IntlTestDecimalFormatSymbols::Verify(double value, const UnicodeString& pat
FieldPosition pos(FieldPosition::DONT_CARE);
buffer = df->format(value, buffer, pos);
if(buffer != expected){
errln((UnicodeString)"ERROR: format failed after setSymbols()\n Expected " +
errln((UnicodeString)"ERROR: format failed after setSymbols()\n Expected " +
expected + ", Got " + buffer);
}
delete df;