ICU-11276 Replying to Mark review feedback.

diff --git a/icu4c/source/i18n/number_modifiers.h b/icu4c/source/i18n/number_modifiers.h
index 9cc74b37974a15e1ebe1a735c7eebf9c84367ead..65ada937d033452ebe581795739770ac4d8eeb6b 100644 (file)
--- a/icu4c/source/i18n/number_modifiers.h
+++ b/icu4c/source/i18n/number_modifiers.h
@@ -18,12 +18,6 @@
 U_NAMESPACE_BEGIN namespace number {
 namespace impl {
 
-class ReferencingPluralsModifierStore : public ModifierStore {
-  public:
-    virtual const Modifier* getModifier(int8_t signum, StandardPlural::Form plural) const;
-    const Modifier* mods[StandardPlural::COUNT] = {};
-};
-
 /**
  * The canonical implementation of {@link Modifier}, containing a prefix and suffix string.
  * TODO: This is not currently being used by real code and could be removed.
@@ -296,6 +290,7 @@ class U_I18N_API AdoptingModifierStore : public ModifierStore, public UMemory {
      * Sets the Modifier with the specified signum and plural form.
      */
     void adoptModifier(int8_t signum, StandardPlural::Form plural, const Modifier *mod) {
+        U_ASSERT(mods[getModIndex(signum, plural)] == nullptr);
         mods[getModIndex(signum, plural)] = mod;
     }
 
@@ -304,6 +299,7 @@ class U_I18N_API AdoptingModifierStore : public ModifierStore, public UMemory {
      * The modifier will apply to all plural forms.
      */
     void adoptModifierWithoutPlural(int8_t signum, const Modifier *mod) {
+        U_ASSERT(mods[getModIndex(signum, DEFAULT_STANDARD_PLURAL)] == nullptr);
         mods[getModIndex(signum, DEFAULT_STANDARD_PLURAL)] = mod;
     }
 

diff --git a/icu4c/source/i18n/numrange_impl.cpp b/icu4c/source/i18n/numrange_impl.cpp
index b240c3140d6352e7653b71052d133f3c5ac0918c..096609bfd41e36a3a36d88dcbc07d1e8d433e377 100644 (file)
--- a/icu4c/source/i18n/numrange_impl.cpp
+++ b/icu4c/source/i18n/numrange_impl.cpp
@@ -74,7 +74,7 @@ void getNumberRangeData(const char* localeName, const char* nsName, NumberRangeD
 
     if (data.rangePattern.getArgumentLimit() == 0) {
         // No data!
-        data.rangePattern = {u"{0} --- {1}", status};
+        data.rangePattern = {u"{0}–{1}", status};
     }
     if (data.approximatelyPattern.getArgumentLimit() == 0) {
         // No data!

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/number/NumberRangeFormatterImpl.java b/icu4j/main/classes/core/src/com/ibm/icu/number/NumberRangeFormatterImpl.java
index cdccb5e6df6c7475fe83b4678bdf93b27f6d99ec..c05a9155711079a872e754ff22a65487c5b4aa08 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/number/NumberRangeFormatterImpl.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/number/NumberRangeFormatterImpl.java
@@ -93,7 +93,7 @@ class NumberRangeFormatterImpl {
         // TODO: Is it necessary to manually fall back to latn, or does the data sink take care of that?
 
         if (sink.rangePattern == null) {
-            sink.rangePattern = SimpleFormatterImpl.compileToStringMinMaxArguments("{0} --- {1}", sb, 2, 2);
+            sink.rangePattern = SimpleFormatterImpl.compileToStringMinMaxArguments("{0}–{1}", sb, 2, 2);
         }
         if (sink.approximatelyPattern == null) {
             sink.approximatelyPattern = SimpleFormatterImpl.compileToStringMinMaxArguments("~{0}", sb, 1, 1);