AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-4017 Fix behavior of explicitly requested non-existent currency

Browse Source 
X-SVN-Rev: 16137
This commit is contained in:
George Rhoten 2004-08-10 05:37:11 +00:00
parent 0b3e40f7aa
commit a89a43144b
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
icu4c/source/i18n/numfmt.cpp
View File

@ -862,26 +862,31 @@ NumberFormat::makeInstance(const Locale& desiredLocale,
// Here we assume that the locale passed in is in the canonical
// form, e.g: pt_PT_@currency=PTE not pt_PT_PREEURO
if(style==kCurrencyStyle){
char buf[20]={0};
int32_t bufCap = 20;
char buf[8]={0};
int32_t bufCap = 8;
const char* locName = desiredLocale.getName();
bufCap = uloc_getKeywordValue(locName, "currency", buf, bufCap, &status);
if(U_SUCCESS(status) && bufCap > 0) {
/* An explicit currency was requested */
ResourceBundle currencies(resource.getWithFallback("Currencies", status));
ResourceBundle currency(currencies.getWithFallback(buf,status));
if(U_SUCCESS(status) && currency.getSize()>2){
ResourceBundle elements = currency.get(2, status);
UnicodeString currPattern = elements.getStringEx((int32_t)0, status);
UnicodeString decimalSep = elements.getStringEx((int32_t)1, status);
UnicodeString groupingSep = elements.getStringEx((int32_t)2, status);
if(U_SUCCESS(status)){
UErrorCode localStatus = U_ZERO_ERROR;
ResourceBundle currencies(resource.getWithFallback("Currencies", localStatus));
ResourceBundle currency(currencies.getWithFallback(buf,localStatus));
if(U_SUCCESS(localStatus) && currency.getSize()>2) {
ResourceBundle elements = currency.get(2, localStatus);
UnicodeString currPattern = elements.getStringEx((int32_t)0, localStatus);
UnicodeString decimalSep = elements.getStringEx((int32_t)1, localStatus);
UnicodeString groupingSep = elements.getStringEx((int32_t)2, localStatus);
if(U_SUCCESS(localStatus)){
symbolsToAdopt->setSymbol(DecimalFormatSymbols::kGroupingSeparatorSymbol, groupingSep);
symbolsToAdopt->setSymbol(DecimalFormatSymbols::kMonetarySeparatorSymbol, decimalSep);
pattern = currPattern;
}
if (status == U_ZERO_ERROR) {
status = localStatus;
}
}
/* else An explicit currency was requested and is unknown or locale data is malformed. */
/* ucurr_* API will get the correct value later on. */
}
}
if (U_FAILURE(status)) {

17
icu4c/source/test/cintltst/cnumtst.c
View File

@ -1167,12 +1167,25 @@ static void test_fmt(UNumberFormat* fmt, UBool isDecimal) {
static void TestNonExistentCurrency() {
UNumberFormat *format;
UErrorCode status = U_ZERO_ERROR;
UChar currencySymbol[8];
static const UChar QQQ[] = {0x51, 0x51, 0x51, 0};
/* Get a non-existent currency and make sure it fails correctly */
/* Get a non-existent currency and make sure it returns the correct currency code. */
format = unum_open(UNUM_CURRENCY, NULL, 0, "th_TH@currency=QQQ", NULL, &status);
if (format != NULL || status != U_MISSING_RESOURCE_ERROR) {
if (format == NULL || U_FAILURE(status)) {
log_err("unum_open did not return expected result for non-existent requested currency: '%s'\n", u_errorName(status));
}
else {
unum_getSymbol(format,
UNUM_CURRENCY_SYMBOL,
currencySymbol,
sizeof(currencySymbol)/sizeof(currencySymbol[0]),
&status);
if (u_strcmp(currencySymbol, QQQ) != 0) {
log_err("unum_open set the currency to QQQ\n");
}
}
unum_close(format);
}
static void TestRBNFFormat() {