Skip to content

Commit 1ffe269

Browse files
authored
CLDR-19003 Add missing unit aliases (#5077)
1 parent f92f643 commit 1ffe269

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed

common/dtd/ldmlSupplemental.dtd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
771771
<!ATTLIST unitAlias type NMTOKEN #REQUIRED >
772772
<!--@MATCH:validity/short-unit/deprecated-->
773773
<!ATTLIST unitAlias replacement NMTOKEN #REQUIRED >
774-
<!--@MATCH:regex/[A-Za-z][-A-Za-z0-9]*-->
774+
<!--@MATCH:regex/[A-Za-z0-9][-A-Za-z0-9]*-->
775775
<!--@VALUE-->
776776
<!ATTLIST unitAlias reason (deprecated) #IMPLIED >
777777
<!--@VALUE-->

common/supplemental/units.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,8 @@ For terms of use, see http://www.unicode.org/copyright.html
629629
<unitAlias type="metric-ton" replacement="tonne" reason="deprecated"/>
630630
<unitAlias type="permillion" replacement="part-per-1e6" reason="deprecated"/>
631631
<unitAlias type="portion-per-1e9" replacement="part-per-1e9" reason="deprecated"/>
632-
632+
<unitAlias type="portion" replacement="part" reason="deprecated"/>
633+
<unitAlias type="million" replacement="1e6" reason="deprecated"/>
633634

634635
<!-- Usage aliases -->
635636

common/validity/unit.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ For terms of use, see http://www.unicode.org/copyright.html
258258
mass-metric-ton
259259
length-100-kilometer
260260
concentr-permillion
261+
concentr-million
261262
concentr-portion
262263
concentr-portion-per-1e9
263264
</id>

tools/cldr-code/src/main/java/org/unicode/cldr/util/DtdData.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1687,6 +1687,7 @@ private static final class UnitOrderHolder {
16871687
"concentr-portion", // deprecated
16881688
"concentr-part",
16891689
"concentr-permillion", // deprecated
1690+
"concentr-million", // deprecated
16901691
"concentr-part-per-million", // deprecated
16911692
"concentr-part-per-1e6",
16921693
"concentr-percent",

0 commit comments

Comments
 (0)