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

ICU-8637 fix MessagePattern Part iteration when a plural style contains other followed by a different keyword, and the PluralRules return other

Browse Source 
X-SVN-Rev: 30259
This commit is contained in:
Markus Scherer 2011-06-30 18:33:32 +00:00
parent 1d01381d47
commit ea2123175f
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
icu4j/main/classes/core/src/com/ibm/icu/text/PluralFormat.java
View File

@ -393,8 +393,7 @@ public class PluralFormat extends UFormat {
if(type==MessagePattern.Part.Type.ARG_LIMIT) {
break;
}
//TODO: Fix the assertion error - see ticket#8637
//assert type==MessagePattern.Part.Type.ARG_SELECTOR;
assert type==MessagePattern.Part.Type.ARG_SELECTOR;
// part is an ARG_SELECTOR followed by an optional explicit value, and then a message
if(pattern.getPartType(partIndex).hasNumericValue()) {
// explicit value like "=2"
@ -423,10 +422,10 @@ public class PluralFormat extends UFormat {
// We have already seen an "other" sub-message.
// Do not match "other" again.
haveKeywordMatch=true;
continue;
// Skip keyword matching but do getLimitPartIndex().
}
}
if(pattern.partSubstringMatches(part, keyword)) {
if(!haveKeywordMatch && pattern.partSubstringMatches(part, keyword)) {
// keyword matches
msgStart=partIndex;
// Do not match this keyword again.