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

ICU-22073 Do not throw away CompactDecimalFormat's affixes

Browse source
This commit is contained in:
Shane F. Carr 2022-06-24 18:00:14 -07:00 • committed by Peter Edberg
parent 929cf40ecb
commit d7c424b00f
5 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
icu4c/source/i18n/number_formatimpl.cpp
View file

@ -353,7 +353,9 @@ NumberFormatterImpl::macrosToMicroGenerator(const MacroProps& macros, bool safe,
}
fPatternModifier.adoptInstead(patternModifier);
const AffixPatternProvider* affixProvider =
macros.affixProvider != nullptr
macros.affixProvider != nullptr && (
// For more information on this condition, see ICU-22073
!isCompactNotation || isCurrency == macros.affixProvider->hasCurrencySign())
? macros.affixProvider
: static_cast<const AffixPatternProvider*>(fPatternInfo.getAlias());
patternModifier->setPatternInfo(affixProvider, kUndefinedField);

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

@ -256,8 +256,6 @@ MacroProps NumberPropertyMapper::oldToNew(const DecimalFormatProperties& propert
} else {
macros.notation = Notation::compactShort();
}
// Do not forward the affix provider.
macros.affixProvider = nullptr;
}
/////////////////

4
icu4j/main/classes/core/src/com/ibm/icu/number/NumberFormatterImpl.java
View file

@ -363,7 +363,9 @@ class NumberFormatterImpl {
// The default middle modifier is weak (thus the false argument).
MutablePatternModifier patternMod = new MutablePatternModifier(false);
AffixPatternProvider affixProvider =
(macros.affixProvider != null)
(macros.affixProvider != null && (
// For more information on this condition, see ICU-22073
!isCompactNotation || isCurrency == macros.affixProvider.hasCurrencySign()))
? macros.affixProvider
: patternInfo;
patternMod.setPatternInfo(affixProvider, null);

2
icu4j/main/classes/core/src/com/ibm/icu/number/NumberPropertyMapper.java
View file

@ -301,8 +301,6 @@ final class NumberPropertyMapper {
} else {
macros.notation = Notation.compactShort();
}
// Do not forward the affix provider.
macros.affixProvider = null;
}
/////////////////

5
icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/CompactDecimalFormatTest.java
View file

@ -30,6 +30,7 @@ import org.junit.runners.JUnit4;
import com.ibm.icu.dev.test.TestFmwk;
import com.ibm.icu.impl.number.DecimalFormatProperties;
import com.ibm.icu.impl.number.PatternStringParser;
import com.ibm.icu.text.CompactDecimalFormat;
import com.ibm.icu.text.CompactDecimalFormat.CompactStyle;
import com.ibm.icu.text.DecimalFormat;
@ -669,10 +670,12 @@ public class CompactDecimalFormatTest extends TestFmwk {
cdf.setProperties(new PropertySetter() {
@Override
public void set(DecimalFormatProperties props) {
PatternStringParser.parseToExistingProperties(
"0 foo", props, PatternStringParser.IGNORE_ROUNDING_ALWAYS);
props.setCompactCustomData(customData);
}
});
assertEquals("Below custom range", "123", cdf.format(123));
assertEquals("Below custom range", "123 foo", cdf.format(123));
assertEquals("Plural form one", "1 qwerty", cdf.format(1000));
assertEquals("Plural form other", "1.2 dvorak", cdf.format(1234));
assertEquals("Above custom range", "12 dvorak", cdf.format(12345));