ICU-21957 Clean-up of TODO and logKnownIssue entries (BRS task):
Removed logKnownIssue(ICU-21322) in plurults.cpp, ICU-21322 is done and the
entire if-statement was commented out.
Replaced CLDR-13700 with CLDR-13701 in several TODOs. 13700 is a duplicate of
13701.
Likewise for CLDR-14502 --> CLDR-14582.
PR#1999 from ICU 71 release missed some of the cases.
diff --git a/icu4c/source/i18n/measunit_extra.cpp b/icu4c/source/i18n/measunit_extra.cpp
index 57eb25b..d9dfd0e 100644
--- a/icu4c/source/i18n/measunit_extra.cpp
+++ b/icu4c/source/i18n/measunit_extra.cpp
@@ -718,7 +718,7 @@
case COMPOUND_PART_PER:
if (sawAnd) {
// Mixed compound units not yet supported,
- // TODO(CLDR-13700).
+ // TODO(CLDR-13701).
status = kUnitIdentifierSyntaxError;
return result;
}
@@ -735,7 +735,7 @@
case COMPOUND_PART_AND:
if (fAfterPer) {
// Can't start with "-and-", and mixed compound units
- // not yet supported, TODO(CLDR-13700).
+ // not yet supported, TODO(CLDR-13701).
status = kUnitIdentifierSyntaxError;
return result;
}
diff --git a/icu4c/source/i18n/number_longnames.cpp b/icu4c/source/i18n/number_longnames.cpp
index b4e9650..be0320c 100644
--- a/icu4c/source/i18n/number_longnames.cpp
+++ b/icu4c/source/i18n/number_longnames.cpp
@@ -1569,7 +1569,7 @@
for (int32_t i = 0; i < fillIn->fMixedUnitCount; i++) {
// Grab data for each of the components.
UnicodeString *unitData = &fillIn->fMixedUnitData[i * ARRAY_LENGTH];
- // TODO(CLDR-14502): check from the CLDR-14502 ticket whether this
+ // TODO(CLDR-14582): check from the CLDR-14582 ticket whether this
// propagation of unitDisplayCase is correct:
getMeasureData(loc, impl.singleUnits[i]->build(status), width, unitDisplayCase, unitData,
status);
diff --git a/icu4c/source/test/intltest/measfmttest.cpp b/icu4c/source/test/intltest/measfmttest.cpp
index c887be2..cf5428a 100644
--- a/icu4c/source/test/intltest/measfmttest.cpp
+++ b/icu4c/source/test/intltest/measfmttest.cpp
@@ -4923,7 +4923,7 @@
"per-hour-and-hertz",
"hertz-and-per-hour",
- // Compound units not supported in mixed units yet. TODO(CLDR-13700).
+ // Compound units not supported in mixed units yet. TODO(CLDR-13701).
"kilonewton-meter-and-newton-meter",
};
@@ -5620,4 +5620,3 @@
}
#endif
-
diff --git a/icu4c/source/test/intltest/plurults.cpp b/icu4c/source/test/intltest/plurults.cpp
index 8de9745..afc8918 100644
--- a/icu4c/source/test/intltest/plurults.cpp
+++ b/icu4c/source/test/intltest/plurults.cpp
@@ -416,10 +416,6 @@
double values[1000];
for (int32_t i = 0; U_SUCCESS(status) && i < numLocales; ++i) {
- //if (uprv_strcmp(locales[i].getLanguage(), "fr") == 0 &&
- // logKnownIssue("21322", "PluralRules::getSamples cannot distinguish 1e5 from 100000")) {
- // continue;
- //}
LocalPointer<PluralRules> rules(PluralRules::forLocale(locales[i], status));
if (U_FAILURE(status)) {
break;
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/units/MeasureUnitImpl.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/units/MeasureUnitImpl.java
index 88a71ba..ed88560 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/units/MeasureUnitImpl.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/units/MeasureUnitImpl.java
@@ -415,7 +415,7 @@
private int fIndex = 0;
// Set to true when we've seen a "-per-" or a "per-", after which all units
// are in the denominator. Until we find an "-and-", at which point the
- // identifier is invalid pending TODO(CLDR-13700).
+ // identifier is invalid pending TODO(CLDR-13701).
private boolean fAfterPer = false;
// If an "-and-" was parsed prior to finding the "single
// * unit", sawAnd is set to true. If not, it is left as is.
@@ -549,7 +549,7 @@
* <p>
*
* @throws IllegalArgumentException if we parse both compound units and "-and-", since mixed
- * compound units are not yet supported - TODO(CLDR-13700).
+ * compound units are not yet supported - TODO(CLDR-13701).
*/
private SingleUnitImpl nextSingleUnit() {
SingleUnitImpl result = new SingleUnitImpl();
@@ -585,7 +585,7 @@
case PER:
if (fSawAnd) {
throw new IllegalArgumentException("Mixed compound units not yet supported");
- // TODO(CLDR-13700).
+ // TODO(CLDR-13701).
}
fAfterPer = true;
@@ -600,7 +600,7 @@
case AND:
if (fAfterPer) {
- // not yet supported, TODO(CLDR-13700).
+ // not yet supported, TODO(CLDR-13701).
throw new IllegalArgumentException("Can't start with \"-and-\", and mixed compound units");
}
fSawAnd = true;
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/MeasureUnitTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/MeasureUnitTest.java
index 290141b..0168cd0 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/MeasureUnitTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/MeasureUnitTest.java
@@ -4184,7 +4184,7 @@
"per-hour-and-hertz",
"hertz-and-per-hour",
- // Compound units not supported in mixed units yet. TODO(CLDR-13700).
+ // Compound units not supported in mixed units yet. TODO(CLDR-13701).
"kilonewton-meter-and-newton-meter",
};
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/NumberFormatterApiTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/NumberFormatterApiTest.java
index 722bc8f..6f5558e 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/NumberFormatterApiTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/NumberFormatterApiTest.java
@@ -2445,7 +2445,7 @@
new UnitInflectionTestCase("centimeter", "de", null, 1, "1 Zentimeter"),
new UnitInflectionTestCase("centimeter", "de", "genitive", 1, "1 Zentimeters"),
new UnitInflectionTestCase("centimeter", "de", "dative", 10, "10 Zentimetern"),
- // TODO(CLDR-14502): check that these inflections are correct, and
+ // TODO(CLDR-14582): check that these inflections are correct, and
// whether CLDR needs any rules for them (presumably CLDR spec
// should mention it, if it's a consistent rule):
new UnitInflectionTestCase("meter-and-centimeter", "de", null, 1.01,
