Skip to content

Commit

Permalink
ICU-22695 Fix gap in unit preferences
Browse files Browse the repository at this point in the history
See #2911
  • Loading branch information
younies authored and Squash Bot committed Mar 21, 2024
1 parent 9172150 commit 3d69134
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# • no formatted with the skeleton
# • no suppression of zero values (for secondary -and- units such as pound in stone-and-pound)
#
# Generation: Set GENERATE_TESTS in TestUnits.java to regenerate unitPreferencesTest.txt.
# Generation: Use GenerateUnitTestData.java to regenerate unitPreferencesTest.txt.

area; default; 001; 1100000; 1100000.0; square-meter; 11/10; 1.1; square-kilometer
area; default; 001; 1000000; 1000000.0; square-meter; 1; 1.0; square-kilometer
Expand Down Expand Up @@ -473,4 +473,3 @@ year-duration; person-age; 001; 1; 1.0; year; 1; year-person; 0; 0.0; month-pers
year-duration; person-age; 001; 9/10; 0.9; year; 54/5; 10.8; month-person
year-duration; person-age; 001; 1/12; 0.08333333333333333; year; 1; 1.0; month-person
year-duration; person-age; 001; 3/40; 0.075; year; 9/10; 0.9; month-person

4 changes: 2 additions & 2 deletions icu4c/source/test/testdata/cldr/units/unitsTest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# round to 4 decimal digits before comparing.
# Note that certain conversions are approximate, such as degrees to radians
#
# Generation: Set GENERATE_TESTS in TestUnits.java to regenerate unitsTest.txt.
# Generation: Use GenerateUnitTestData.java to regenerate unitsTest.txt.

acceleration ; meter-per-square-second ; meter-per-square-second ; 1 * x ; 1,000.00
acceleration ; g-force ; meter-per-square-second ; 9.80665 * x ; 9806.65
Expand Down Expand Up @@ -243,4 +243,4 @@ year-duration ; quarter ; year ; 0.25 * x ; 250.0
year-duration ; year ; year ; 1 * x ; 1,000.00
year-duration ; year-person ; year ; 1 * x ; 1000.0
year-duration ; decade ; year ; 10 * x ; 10000.0
year-duration ; century ; year ; 100 * x ; 100000.0
year-duration ; century ; year ; 100 * x ; 100000.0

0 comments on commit 3d69134

Please sign in to comment.