From f6296491cc4ee30d95c97d3ba6e4d8092724b8e1 Mon Sep 17 00:00:00 2001 From: Markus Scherer Date: Wed, 16 Dec 2015 22:29:44 +0000 Subject: [PATCH] ICU-12041 check that per-unit patterns have one placeholder, fix patterns X-SVN-Rev: 38140 --- .../main/classes/core/src/com/ibm/icu/text/MeasureFormat.java | 4 +--- icu4j/main/shared/data/icudata.jar | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) 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 cb08f625465..9b64ad3314e 100644 --- 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 1516555960c..48cb0865675 100755 --- 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