organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-07 22:44:49 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-22686 Fix Unit preferences calculation in Cpp

Browse source
This commit is contained in:
Younies Mahmoud 2024-03-18 12:50:52 +01:00
parent 80b33416e8
commit 4405c543ad
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -440,7 +440,7 @@ MaybeStackVector<UnitPreference>
}
}
CharString region = ulocimp_getRegionForSupplementalData(locale.getName(), false, status);
CharString region = ulocimp_getRegionForSupplementalData(locale.getName(), true, status);
// Check the locale system tag, e.g `ms=metric`.
UErrorCode internalMeasureTagStatus = U_ZERO_ERROR;

10
icu4c/source/test/intltest/numbertest_api.cpp
View file

@ -1680,7 +1680,7 @@ void NumberFormatterApiTest::unitUsage() {
NumberFormatter::with().unit(MeasureUnit::getAcre()).usage("default"),
Locale::getEnglish(),
-uprv_getInfinity(),
u"-∞ km²");
u"-∞ sq mi");
// // TODO(icu-units#131): do we care about NaN?
// // TODO: on some platforms with MSVC, "-NaN sec" is returned.
@ -3004,6 +3004,14 @@ void NumberFormatterApiTest::unitLocaleTags() {
"celsius", 0, "default", "celsius", 0.0, u"0 degrees Celsius"},
{u"Test the locale with ms,rg --> ms tag wins", "en-US-u-ms-metric-rg-uszzzz", "foot", 1,
"default", "centimeter", 30.0, u"30 centimeters"},
// Test the liklihood of the languages
{"Test the region of `en` --> region should be US", "en", "celsius", 1, "default", "fahrenheit",
34.0, u"34 degrees Fahrenheit"},
{"Test the region of `de` --> region should be DE", "de", "celsius", 1, "default", "celsius",
1.0, u"1 Grad Celsius"},
{"Test the region of `ar` --> region should be EG", "ar", "celsius", 1, "default", "celsius",
1.0, u"١ درجة مئوية"},
};
for (const auto &testCase : cases) {