ICU-12041 check that per-unit patterns have one placeholder, fix patterns

X-SVN-Rev: 38140

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/MeasureFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/MeasureFormat.java
index cb08f625465b5b241c84b5511e054ddb9e2f5eee..9b64ad3314edcad16b986c1b8f0cfd4132e0c517 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/MeasureFormat.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/MeasureFormat.java
@@ -777,9 +777,7 @@ public class MeasureFormat extends UFormat {
                     // Skip the unit display name for now.
                 } else if (key.contentEquals("per")) {
                     // For example, "{0}/h".
-                    // TODO: Set minPlaceholders=1
-                    // after http://unicode.org/cldr/trac/ticket/9129 is fixed.
-                    setFormatterIfAbsent(MeasureFormatData.PER_UNIT_INDEX, value, 0);
+                    setFormatterIfAbsent(MeasureFormatData.PER_UNIT_INDEX, value, 1);
                 } else {
                     // The key must be one of the plural form strings. For example:
                     // one{"{0} hr"}

diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar
index 1516555960caa49c34c99f7a45cb97afc8589daf..48cb0865675ea1b9e31b6374fe464e94544cddfb 100755 (executable)
--- a/icu4j/main/shared/data/icudata.jar
+++ b/icu4j/main/shared/data/icudata.jar
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:66385b6822df39beb828c9b70233a65f3420d77cf74982800ee41cd53c309f3e
-size 11622349
+oid sha256:626ed2484fc25dccca603b448372f479724a094a6006aa89be6764cc1af30fc4
+size 11622359