Skip to content

CLDR-19548 Remove mil and add milliinch - #5977

Merged
macchiati merged 5 commits into
mainfrom
CLDR-19548-Remove-mil-and-add-milliinch
Aug 8, 2026
Merged

CLDR-19548 Remove mil and add milliinch#5977
macchiati merged 5 commits into
mainfrom
CLDR-19548-Remove-mil-and-add-milliinch

Conversation

@macchiati

Copy link
Copy Markdown
Member

CLDR-19548

  • This PR completes the ticket.

ALLOW_MANY_COMMITS=true

Comment thread common/main/root.xml Outdated
@macchiati
macchiati marked this pull request as ready for review July 30, 2026 17:32
@srl295

srl295 commented Jul 31, 2026

Copy link
Copy Markdown
Member

Looks ok, but

  • the java settings could go against CLDR-19326 deps: JDK 21 (CLDR-19326 deps: JDK 21 #5845) instead - want me to split this into another pr?

  • "mil" is in the incoming vxml, so this will just break again when that merges.

@macchiati

Copy link
Copy Markdown
Member Author

Yes, splitting this would be good.

Merging this should also wait until the vxml is in.

<!-- length -->
<convertUnit source='mil' baseUnit='meter' factor='ft_to_m/12*1000' systems="ussystem uksystem"/>
<convertUnit source='point' baseUnit='meter' factor='ft_to_m/864' systems="metric_adjacent ussystem uksystem"/>
<convertUnit source='inch' baseUnit='meter' factor='ft_to_m/12' systems="ussystem uksystem"/>

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need to set "prefixable" on inch

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefixable is not a hard requirement; the goal is to indicate that typically the prefixes are used with the unit. In the case of the inch, it isn't really typical. The wording is the following; if we need improvements we should discuss that. (Sorry for not attending to this comment earlier.)

"Those units that typically use SI prefixes or the IEC binary prefixes. This can include measures like parsec that are not SI units. It allows implementations to group those units together, and to do sanity checks on the prefix+unit combinations, if they choose. However, implementations may choose to allow prefixes on other units, especially since there is a significant variance in usage: even a term like megafoot might be acceptable in some contexts."

@robertbastian

robertbastian commented Jul 31, 2026

Copy link
Copy Markdown
Member
  • "mil" is in the incoming vxml, so this will just break again when that merges.

It's just in root and en, which didn't change in vxml. It should be a clean merge.

@srl295

srl295 commented Jul 31, 2026

Copy link
Copy Markdown
Member
  • "mil" is in the incoming vxml, so this will just break again when that merges.

It's just in root and en, which didn't change in vxml. It should be a clean merge.

But there are translations in sub locales for mil that will just become invalid

Anyway I can fix up vxml once this merges

srl295
srl295 previously approved these changes Jul 31, 2026
@macchiati

macchiati commented Jul 31, 2026 via email

Copy link
Copy Markdown
Member Author

@macchiati

macchiati commented Aug 3, 2026

Copy link
Copy Markdown
Member Author

the java settings could go against CLDR-19326 deps: JDK 21 (#5845) instead - want me to split this into another pr?

I fixed this, and a dangling reference to 'mil'.
The data for mil needs to be transferred once we have vxml merged.

@macchiati
macchiati marked this pull request as draft August 3, 2026 01:04
@macchiati

Copy link
Copy Markdown
Member Author

Converting to draft so it doesn't get merged prematurely.

@srl295

srl295 commented Aug 3, 2026

Copy link
Copy Markdown
Member

VXML is now merged.

List of files with `length-mil` in main now
common/main/en.xml:			<unit type="length-mil">
common/main/en.xml-				<displayName>mils</displayName>
--
common/main/en.xml:			<unit type="length-mil">
common/main/en.xml-				<displayName>mil</displayName>
--
common/main/en.xml:			<unit type="length-mil">
common/main/en.xml-				<displayName>mil</displayName>
--
common/main/en_CA.xml:			<unit type="length-mil">
common/main/en_CA.xml-				<displayName>↑↑↑</displayName>
--
common/main/en_CA.xml:			<unit type="length-mil">
common/main/en_CA.xml-				<displayName>↑↑↑</displayName>
--
common/main/en_CA.xml:			<unit type="length-mil">
common/main/en_CA.xml-				<displayName>↑↑↑</displayName>
--
common/main/root.xml:			<unit type="length-mil">
common/main/root.xml-				<displayName>mil [US]</displayName>
--
common/main/en_AU.xml:			<unit type="length-mil">
common/main/en_AU.xml-				<displayName>↑↑↑</displayName>
--
common/main/en_AU.xml:			<unit type="length-mil">
common/main/en_AU.xml-				<displayName>↑↑↑</displayName>
--
common/main/en_AU.xml:			<unit type="length-mil">
common/main/en_AU.xml-				<displayName>↑↑↑</displayName>
--
common/main/en_IN.xml:			<unit type="length-mil">
common/main/en_IN.xml-				<displayName>↑↑↑</displayName>
--
common/main/en_IN.xml:			<unit type="length-mil">
common/main/en_IN.xml-				<displayName>↑↑↑</displayName>
--
common/main/en_IN.xml:			<unit type="length-mil">
common/main/en_IN.xml-				<displayName>↑↑↑</displayName>
--
common/main/cv.xml:			<unit type="length-mil">
common/main/cv.xml-				<displayName>мил</displayName>
--
common/main/cv.xml:			<unit type="length-mil">
common/main/cv.xml-				<displayName>мил</displayName>
--
common/main/cv.xml:			<unit type="length-mil">
common/main/cv.xml-				<displayName>мил</displayName>
--
common/main/en_GB.xml:			<unit type="length-mil">
common/main/en_GB.xml-				<displayName>↑↑↑</displayName>
--
common/main/en_GB.xml:			<unit type="length-mil">
common/main/en_GB.xml-				<displayName>↑↑↑</displayName>
--
common/main/en_GB.xml:			<unit type="length-mil">
common/main/en_GB.xml-				<displayName>↑↑↑</displayName>

The above will need to be fixed or they will error, Chuvash is the only one who put in a new translation.

@macchiati
macchiati force-pushed the CLDR-19548-Remove-mil-and-add-milliinch branch from 91fb30a to 43403ae Compare August 3, 2026 21:21
@jira-pull-request-webhook

Copy link
Copy Markdown

Hooray! The files in the branch are the same across the force-push. 😃

~ Your Friendly Jira-GitHub PR Checker Bot

@macchiati
macchiati marked this pull request as ready for review August 3, 2026 21:31
@macchiati

macchiati commented Aug 3, 2026

Copy link
Copy Markdown
Member Author

I rebased on main, then just checked, and no other locales need to change (none of them had <unit type="length-mil">. So if the tests pass we're cool.

srl295
srl295 previously approved these changes Aug 3, 2026

@srl295 srl295 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's here LGTM but still failing tests

@srl295

srl295 commented Aug 3, 2026

Copy link
Copy Markdown
Member

I rebased on main, then just checked, and no other locales need to change (none of them had <unit type="length-mil">. So if the tests pass we're cool.

not what i'm seeing in this PR:

16 results - 6 files

common/main/cv.xml:
  22892  			</unit>
  22893: 			<unit type="length-mil">
  22894  				<displayName>мил</displayName>

  24421  			</unit>
  24422: 			<unit type="length-mil">
  24423  				<displayName>мил</displayName>

  25950  			</unit>
  25951: 			<unit type="length-mil">
  25952  				<displayName>мил</displayName>

common/main/en_AU.xml:
   8309  			</unit>
   8310: 			<unit type="length-mil">
   8311  				<displayName>↑↑↑</displayName>

   9628  			</unit>
   9629: 			<unit type="length-mil">
   9630  				<displayName>↑↑↑</displayName>

  10947  			</unit>
  10948: 			<unit type="length-mil">
  10949  				<displayName>↑↑↑</displayName>

common/main/en_CA.xml:
   7890  			</unit>
   7891: 			<unit type="length-mil">
   7892  				<displayName>↑↑↑</displayName>

   9207  			</unit>
   9208: 			<unit type="length-mil">
   9209  				<displayName>↑↑↑</displayName>

  10524  			</unit>
  10525: 			<unit type="length-mil">
  10526  				<displayName>↑↑↑</displayName>

common/main/en_GB.xml:
   9049  			</unit>
   9050: 			<unit type="length-mil">
   9051  				<displayName>↑↑↑</displayName>

  10368  			</unit>
  10369: 			<unit type="length-mil">
  10370  				<displayName>↑↑↑</displayName>

  11687  			</unit>
  11688: 			<unit type="length-mil">
  11689  				<displayName>↑↑↑</displayName>

common/main/en_IN.xml:
   7984  			</unit>
   7985: 			<unit type="length-mil">
   7986  				<displayName>↑↑↑</displayName>

   9303  			</unit>
   9304: 			<unit type="length-mil">
   9305  				<displayName>↑↑↑</displayName>

  10622  			</unit>
  10623: 			<unit type="length-mil">
  10624  				<displayName>↑↑↑</displayName>

common/supplemental/coverageLevels.xml:
  175  		<coverageVariable key="%unitLengths" value="(long|short|narrow)"/>
  176: 		<coverageVariable key="%unitsEnglish" value="(force-dyne|force-poundal|length-fathom|length-mil|length-furlong|mass-stone|volume-bushel|energy-british-thermal-unit|volume-pint-imperial|volume-cup-imperial|temperature-rankine|mass-slug|pressure-gasoline-energy-density|energy-british-thermal-unit-it|length-rod|length-chain|duration-fortnight)"/>
  177  		<coverageVariable key="%unitsJapanese" value="(area-bu-jp|area-cho|area-se-jp|length-jo-jp|length-ken|length-ri-jp|length-rin|length-shaku-cloth|length-shaku-length|length-sun|mass-fun|volume-cup-jp|volume-koku|volume-kosaji|volume-osaji|volume-sai|volume-shaku|volume-to-jp)"/>

@srl295

srl295 commented Aug 3, 2026

Copy link
Copy Markdown
Member

@macchiati see and merge #6009 if LGTU

(Note: I didn't make it a stack! 🥞 )

@srl295

srl295 commented Aug 4, 2026

Copy link
Copy Markdown
Member

Err, fixing

@srl295

srl295 commented Aug 4, 2026

Copy link
Copy Markdown
Member
    testCoverage {
      Error: (TestUnits.java:2478) : en Modern ⊇ VALID_REGULAR_UNITS: expected java.util.Collections$EmptySet<[]>, got java.util.LinkedHashSet<[milliinch, poundal, dyne]>
      Error: (TestUnits.java:2478) : de Modern ⊇ VALID_REGULAR_UNITS: expected java.util.Collections$EmptySet<[]>, got java.util.LinkedHashSet<[milliinch]>

I am getting that locally

"sai",
"shaku",
"to-jp",
"mil",

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@macchiati should this have milliinch added?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll look it over later today.

@robertbastian

Copy link
Copy Markdown
Member

@macchiati did you see my comment?

@robertbastian robertbastian left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.

@srl295

srl295 commented Aug 4, 2026

Copy link
Copy Markdown
Member

@macchiati did you see my comment?

#5977 (review) i assume?

@macchiati
macchiati merged commit fa4596a into main Aug 8, 2026
12 checks passed
@macchiati
macchiati deleted the CLDR-19548-Remove-mil-and-add-milliinch branch August 8, 2026 03:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants