mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-05 21:45:37 +00:00
ICU-21480 integrate CLDR release-39-alpha4 to ICU trunk
This commit is contained in:
Peter Edberg
Peter Edberg
parent
8b48e1862c
commit
31182a99b4
15 changed files with 27 additions and 137 deletions
|
|
@ -201,14 +201,6 @@ ant copy-cldr-testdata
|
|||
# and add the following line to the beginning of these two files
|
||||
# # File copied from cldr common/testData/localeIdentifiers/localeCanonicalization.txt
|
||||
|
||||
# 4e. Temporary fix until ICU-21496 is addressed: Need to remove bogus content.
|
||||
cd $ICU4C_DIR/source/data
|
||||
open rbnf/nb.txt
|
||||
# Edit to remove bogus content leaving just the following after header comments, then save:
|
||||
nb{
|
||||
%%Parent{"no"}
|
||||
}
|
||||
|
||||
# 5. Check which data files have modifications, which have been added or removed
|
||||
# (if there are no changes, you may not need to proceed further). Make sure the
|
||||
# list seems reasonable.
|
||||
|
|
|
|||
|
|
@ -1126,11 +1126,6 @@ units:table(nofallback){
|
|||
unit{"meter-and-centimeter"}
|
||||
}
|
||||
}
|
||||
BR{
|
||||
{
|
||||
unit{"meter-and-centimeter"}
|
||||
}
|
||||
}
|
||||
CA{
|
||||
{
|
||||
geq{"3.0"}
|
||||
|
|
@ -1140,21 +1135,6 @@ units:table(nofallback){
|
|||
unit{"inch"}
|
||||
}
|
||||
}
|
||||
CN{
|
||||
{
|
||||
unit{"meter-and-centimeter"}
|
||||
}
|
||||
}
|
||||
DE{
|
||||
{
|
||||
unit{"meter-and-centimeter"}
|
||||
}
|
||||
}
|
||||
DK{
|
||||
{
|
||||
unit{"meter-and-centimeter"}
|
||||
}
|
||||
}
|
||||
DZ{
|
||||
{
|
||||
unit{"meter-and-centimeter"}
|
||||
|
|
@ -1218,41 +1198,11 @@ units:table(nofallback){
|
|||
unit{"meter-and-centimeter"}
|
||||
}
|
||||
}
|
||||
MX{
|
||||
{
|
||||
unit{"meter-and-centimeter"}
|
||||
}
|
||||
}
|
||||
MY{
|
||||
{
|
||||
unit{"meter-and-centimeter"}
|
||||
}
|
||||
}
|
||||
NL{
|
||||
{
|
||||
unit{"meter-and-centimeter"}
|
||||
}
|
||||
}
|
||||
NO{
|
||||
{
|
||||
unit{"meter-and-centimeter"}
|
||||
}
|
||||
}
|
||||
PL{
|
||||
{
|
||||
unit{"meter-and-centimeter"}
|
||||
}
|
||||
}
|
||||
PT{
|
||||
{
|
||||
unit{"meter-and-centimeter"}
|
||||
}
|
||||
}
|
||||
RU{
|
||||
{
|
||||
unit{"meter-and-centimeter"}
|
||||
}
|
||||
}
|
||||
SA{
|
||||
{
|
||||
unit{"meter-and-centimeter"}
|
||||
|
|
@ -1407,11 +1357,6 @@ units:table(nofallback){
|
|||
unit{"foot-and-inch"}
|
||||
}
|
||||
}
|
||||
MX{
|
||||
{
|
||||
unit{"meter-and-centimeter"}
|
||||
}
|
||||
}
|
||||
US{
|
||||
{
|
||||
unit{"foot-and-inch"}
|
||||
|
|
@ -1507,21 +1452,6 @@ units:table(nofallback){
|
|||
unit{"gram"}
|
||||
}
|
||||
}
|
||||
DZ{
|
||||
{
|
||||
unit{"kilogram-and-gram"}
|
||||
}
|
||||
}
|
||||
EG{
|
||||
{
|
||||
unit{"kilogram-and-gram"}
|
||||
}
|
||||
}
|
||||
ES{
|
||||
{
|
||||
unit{"kilogram-and-gram"}
|
||||
}
|
||||
}
|
||||
GB{
|
||||
{
|
||||
unit{"stone-and-pound"}
|
||||
|
|
@ -1535,16 +1465,6 @@ units:table(nofallback){
|
|||
unit{"pound-and-ounce"}
|
||||
}
|
||||
}
|
||||
JO{
|
||||
{
|
||||
unit{"kilogram-and-gram"}
|
||||
}
|
||||
}
|
||||
SA{
|
||||
{
|
||||
unit{"kilogram-and-gram"}
|
||||
}
|
||||
}
|
||||
US{
|
||||
{
|
||||
unit{"pound"}
|
||||
|
|
|
|||
|
|
@ -5,8 +5,6 @@ nn{
|
|||
%%Parent{"no"}
|
||||
RBNFRules{
|
||||
SpelloutRules{
|
||||
"%%lenient-parse:",
|
||||
"&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
|
||||
"%spellout-numbering-year:",
|
||||
"-x: minus >>;",
|
||||
"x.x: =0.0=;",
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@
|
|||
no{
|
||||
RBNFRules{
|
||||
SpelloutRules{
|
||||
"%%lenient-parse:",
|
||||
"&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
|
||||
"%spellout-numbering-year:",
|
||||
"-x: minus >>;",
|
||||
"x.x: =0.0=;",
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!--
|
||||
Copyright (C) 2016 and later: Unicode, Inc. and others.
|
||||
License & terms of use: http://www.unicode.org/copyright.html
|
||||
Copyright (c) 2010-2015 International Business Machines Corporation and others. All rights reserved.
|
||||
-->
|
||||
<!DOCTYPE ldml SYSTEM "../../dtd/cldr-35.1/common/dtd/ldml.dtd">
|
||||
<ldml>
|
||||
<identity>
|
||||
<version number="$Revision$"/>
|
||||
<language type="nn"/>
|
||||
</identity>
|
||||
<rbnf>
|
||||
<rulesetGrouping type="SpelloutRules">
|
||||
<ruleset type="lenient-parse" access="private">
|
||||
<rbnfrule value="0">&[last primary ignorable ] ←← ' ' ←← ',' ←← '-' ←← '';</rbnfrule>
|
||||
</ruleset>
|
||||
</rulesetGrouping>
|
||||
|
||||
</rbnf>
|
||||
</ldml>
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
<ldml>
|
||||
<identity>
|
||||
<version number="$Revision$"/>
|
||||
<language type="nb"/>
|
||||
<language type="no"/>
|
||||
</identity>
|
||||
<rbnf>
|
||||
<rulesetGrouping type="SpelloutRules">
|
||||
|
|
@ -1691,7 +1691,7 @@ void NumberFormatterApiTest::unitUsage() {
|
|||
u"measure-unit/length-meter usage/person-height",
|
||||
u"unit/meter usage/person-height",
|
||||
NumberFormatter::with().unit(METER).usage("person-height"),
|
||||
Locale("de-DE"),
|
||||
Locale("sv-SE"),
|
||||
uprv_getNaN(),
|
||||
u"0 m, NaN cm");
|
||||
|
||||
|
|
|
|||
|
|
@ -113,10 +113,9 @@ void UnitsDataTest::testGetPreferencesFor() {
|
|||
{"XX default falls back to 001", "length", "default", "XX", WorldLenMax, WorldLenMin},
|
||||
{"Unknown usage US", "length", "foobar", "US", USLenMax, USLenMin},
|
||||
{"Unknown usage 001", "length", "foobar", "XX", WorldLenMax, WorldLenMin},
|
||||
{"Fallback", "length", "person-height-xyzzy", "DE", "meter-and-centimeter",
|
||||
"meter-and-centimeter"},
|
||||
{"Fallback twice", "length", "person-height-xyzzy-foo", "DE", "meter-and-centimeter",
|
||||
"meter-and-centimeter"},
|
||||
{"Fallback", "length", "person-height-xyzzy", "DE", "centimeter", "centimeter"},
|
||||
{"Fallback twice", "length", "person-height-xyzzy-foo", "DE", "centimeter",
|
||||
"centimeter"},
|
||||
// Confirming results for some unitPreferencesTest.txt test cases
|
||||
{"001 area", "area", "default", "001", "square-kilometer", "square-centimeter"},
|
||||
{"GB area", "area", "default", "GB", "square-mile", "square-inch"},
|
||||
|
|
|
|||
|
|
@ -237,9 +237,9 @@ length; vehicle; 001; 11 / 10; 1.1; meter; 11 / 10; 1.1; meter
|
|||
length; vehicle; 001; 1; 1.0; meter; 1; 1.0; meter
|
||||
length; vehicle; 001; 9 / 10; 0.9; meter; 9 / 10; 0.9; meter
|
||||
|
||||
length; vehicle; MX; 11 / 10; 1.1; meter; 1; meter; 10; 10.0; centimeter
|
||||
length; vehicle; MX; 1; 1.0; meter; 1; meter; 0; 0.0; centimeter
|
||||
length; vehicle; MX; 9 / 10; 0.9; meter; 0; meter; 90; 90.0; centimeter
|
||||
length; vehicle; MX; 11 / 10; 1.1; meter; 11 / 10; 1.1; meter
|
||||
length; vehicle; MX; 1; 1.0; meter; 1; 1.0; meter
|
||||
length; vehicle; MX; 9 / 10; 0.9; meter; 9 / 10; 0.9; meter
|
||||
|
||||
length; visiblty; 001; 200; 200.0; meter; 1 / 5; 0.2; kilometer
|
||||
length; visiblty; 001; 100; 100.0; meter; 1 / 10; 0.1; kilometer
|
||||
|
|
@ -283,9 +283,9 @@ mass; person; 001; 9 / 10; 0.9; kilogram; 900; 900.0; gram
|
|||
mass; person; 001; 1 / 1000; 0.001; kilogram; 1; 1.0; gram
|
||||
mass; person; 001; 9 / 10000; 9.0E-4; kilogram; 9 / 10; 0.9; gram
|
||||
|
||||
mass; person; DZ; 11 / 10; 1.1; kilogram; 1; kilogram; 100; 100.0; gram
|
||||
mass; person; DZ; 1; 1.0; kilogram; 1; kilogram; 0; 0.0; gram
|
||||
mass; person; DZ; 9 / 10; 0.9; kilogram; 0; kilogram; 900; 900.0; gram
|
||||
mass; person; DZ; 11 / 10; 1.1; kilogram; 11 / 10; 1.1; kilogram
|
||||
mass; person; DZ; 1; 1.0; kilogram; 1; 1.0; kilogram
|
||||
mass; person; DZ; 9 / 10; 0.9; kilogram; 900; 900.0; gram
|
||||
|
||||
mass; person; US; 498951607 / 1000000000; 0.498951607; kilogram; 11 / 10; 1.1; pound
|
||||
mass; person; US; 45359237 / 100000000; 0.45359237; kilogram; 1; 1.0; pound
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9f438270baa10fbae595a2c84184276867437c2c414331ccdc0939e1af530cd3
|
||||
size 13302830
|
||||
oid sha256:fd5ad664553e56cbbd89e7eb9721d6e78dbace888a12dfabdd56e4565e92d675
|
||||
size 13302692
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7ca9c9bb368c6d12e8c5e0a973f8147bb3a5b69282b273b7f676174386face31
|
||||
oid sha256:5deb1e854be1bbc3c1038fc02e95e779ae5f69fb857f9ccd63f7cdccdbc7da9c
|
||||
size 95094
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:18b9a95ba92f05a9f754b81cb4b575a55bd5f7e1ded655879a0b5c6b29231182
|
||||
size 726591
|
||||
oid sha256:b39f56ea6d1f099a49aec4265c53c3355ff43a91f926d8fde1355887ae562de4
|
||||
size 723620
|
||||
|
|
|
|||
|
|
@ -237,9 +237,9 @@ length; vehicle; 001; 11 / 10; 1.1; meter; 11 / 10; 1.1; meter
|
|||
length; vehicle; 001; 1; 1.0; meter; 1; 1.0; meter
|
||||
length; vehicle; 001; 9 / 10; 0.9; meter; 9 / 10; 0.9; meter
|
||||
|
||||
length; vehicle; MX; 11 / 10; 1.1; meter; 1; meter; 10; 10.0; centimeter
|
||||
length; vehicle; MX; 1; 1.0; meter; 1; meter; 0; 0.0; centimeter
|
||||
length; vehicle; MX; 9 / 10; 0.9; meter; 0; meter; 90; 90.0; centimeter
|
||||
length; vehicle; MX; 11 / 10; 1.1; meter; 11 / 10; 1.1; meter
|
||||
length; vehicle; MX; 1; 1.0; meter; 1; 1.0; meter
|
||||
length; vehicle; MX; 9 / 10; 0.9; meter; 9 / 10; 0.9; meter
|
||||
|
||||
length; visiblty; 001; 200; 200.0; meter; 1 / 5; 0.2; kilometer
|
||||
length; visiblty; 001; 100; 100.0; meter; 1 / 10; 0.1; kilometer
|
||||
|
|
@ -283,9 +283,9 @@ mass; person; 001; 9 / 10; 0.9; kilogram; 900; 900.0; gram
|
|||
mass; person; 001; 1 / 1000; 0.001; kilogram; 1; 1.0; gram
|
||||
mass; person; 001; 9 / 10000; 9.0E-4; kilogram; 9 / 10; 0.9; gram
|
||||
|
||||
mass; person; DZ; 11 / 10; 1.1; kilogram; 1; kilogram; 100; 100.0; gram
|
||||
mass; person; DZ; 1; 1.0; kilogram; 1; kilogram; 0; 0.0; gram
|
||||
mass; person; DZ; 9 / 10; 0.9; kilogram; 0; kilogram; 900; 900.0; gram
|
||||
mass; person; DZ; 11 / 10; 1.1; kilogram; 11 / 10; 1.1; kilogram
|
||||
mass; person; DZ; 1; 1.0; kilogram; 1; 1.0; kilogram
|
||||
mass; person; DZ; 9 / 10; 0.9; kilogram; 900; 900.0; gram
|
||||
|
||||
mass; person; US; 498951607 / 1000000000; 0.498951607; kilogram; 11 / 10; 1.1; pound
|
||||
mass; person; US; 45359237 / 100000000; 0.45359237; kilogram; 1; 1.0; pound
|
||||
|
|
|
|||
|
|
@ -650,9 +650,9 @@ public class UnitsTest {
|
|||
UnitsRouter router = new UnitsRouter(testCase.inputUnit.second, testCase.region, testCase.usage);
|
||||
List<Measure> measures = router.route(testCase.input, null).complexConverterResult.measures;
|
||||
|
||||
assertEquals("Measures size must be the same as expected units",
|
||||
assertEquals("For " + testCase.toString() + ", Measures size must be the same as expected units",
|
||||
measures.size(), testCase.expectedInOrder.size());
|
||||
assertEquals("Measures size must be the same as output units",
|
||||
assertEquals("For " + testCase.toString() + ", Measures size must be the same as output units",
|
||||
measures.size(), testCase.outputUnitInOrder.size());
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1505,7 +1505,7 @@ public class NumberFormatterApiTest extends TestFmwk {
|
|||
"measure-unit/length-meter usage/person-height",
|
||||
"unit/meter usage/person-height",
|
||||
NumberFormatter.with().unit(MeasureUnit.METER).usage("person-height"),
|
||||
new ULocale("en-DE"),
|
||||
new ULocale("sv-SE"),
|
||||
Double.NaN,
|
||||
// "0 m, NaN cm");
|
||||
"0 m, 0 cm");
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue