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-8806 fix MessageFormat plural # formatting: fix offset lookup

Browse source 
X-SVN-Rev: 30635
This commit is contained in:
Markus Scherer 2011-09-07 23:18:54 +00:00
parent 49407c6a1e
commit e71be2e3b7
2 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
icu4c/source/i18n/msgfmt.cpp
View file

@ -1067,7 +1067,7 @@ void MessageFormat::format(int32_t msgStart, double pluralNumber,
double number = arg->getDouble(success);
int32_t subMsgStart = PluralFormat::findSubMessage(msgPattern, i, pluralProvider, number,
success);
double offset = msgPattern.getPluralOffset(subMsgStart);
double offset = msgPattern.getPluralOffset(i);
formatComplexSubMessage(subMsgStart, number-offset, arguments, argumentNames,
cnt, appendTo, success);
} else if (argType == UMSGPAT_ARG_TYPE_SELECT) {

26
icu4c/source/test/intltest/plurfmts.cpp
View file

@ -11,10 +11,10 @@
#include "plurults.h"
#include "plurfmts.h"
#include "cmemory.h"
#include "unicode/msgfmt.h"
#include "unicode/plurrule.h"
#include "unicode/plurfmt.h"
#define PLURAL_PATTERN_DATA 4
#define PLURAL_TEST_ARRAY_SIZE 256
@ -518,7 +518,11 @@ PluralFormatTest::pluralFormatExtendedTest(void) {
UErrorCode status = U_ZERO_ERROR;
UnicodeString fmtString(fmt, -1, US_INV);
PluralFormat pf(fmtString, status);
PluralFormat pf(Locale::getEnglish(), fmtString, status);
MessageFormat mf(UNICODE_STRING_SIMPLE("{0,plural,").append(fmtString).append((UChar)0x7d /* '}' */),
Locale::getEnglish(), status);
Formattable args;
FieldPosition ignore;
if (U_FAILURE(status)) {
dataerrln("Failed to apply pattern - %s", u_errorName(status));
return;
@ -526,18 +530,32 @@ PluralFormatTest::pluralFormatExtendedTest(void) {
for (int i = 0; i < 7; ++i) {
UnicodeString result = pf.format(i, status);
if (U_FAILURE(status)) {
errln("Failed to format - %s", u_errorName(status));
errln("PluralFormat.format(value %d) failed - %s", i, u_errorName(status));
return;
}
UnicodeString expected(targets[i], -1, US_INV);
if (expected != result) {
UnicodeString message("Expected '", -1, US_INV);
UnicodeString message("PluralFormat.format(): Expected '", -1, US_INV);
message.append(expected);
message.append(UnicodeString("' but got '", -1, US_INV));
message.append(result);
message.append("'", -1, US_INV);
errln(message);
}
args.setLong(i);
mf.format(&args, 1, result.remove(), ignore, status);
if (U_FAILURE(status)) {
errln("MessageFormat.format(value %d) failed - %s", i, u_errorName(status));
return;
}
if (expected != result) {
UnicodeString message("MessageFormat.format(): Expected '", -1, US_INV);
message.append(expected);
message.append(UnicodeString("' but got '", -1, US_INV));
message.append(result);
message.append("'", -1, US_INV);
errln(message);
}
}
}