ICU-13419 Imported the latest CLDR 32 locale data, updated some test cases.

X-SVN-Rev: 40616
This commit is contained in:
Yoshito Umaoka 2017-10-12 12:24:55 +00:00
parent 1c794eb111
commit 6873ed8e2c
11 changed files with 28 additions and 28 deletions

View File

@ -2504,5 +2504,5 @@ fi{
one{"{0} {1}"} one{"{0} {1}"}
other{"{0} {1}"} other{"{0} {1}"}
} }
Version{"2.1.37.1"} Version{"2.1.37.67"}
} }

View File

@ -1117,7 +1117,7 @@ fi{
Variants%secondary{ Variants%secondary{
FONUPA{"suomalais-ugrilainen tarkekirjoitus"} FONUPA{"suomalais-ugrilainen tarkekirjoitus"}
} }
Version{"2.1.37.1"} Version{"2.1.37.67"}
characterLabelPattern{ characterLabelPattern{
all{"{0} kaikki"} all{"{0} kaikki"}
category-list{"{0}: {1}"} category-list{"{0}: {1}"}

View File

@ -190,7 +190,7 @@ fi{
symbols{ symbols{
decimal{","} decimal{","}
exponential{"E"} exponential{"E"}
group{""} group{" "}
infinity{"∞"} infinity{"∞"}
list{";"} list{";"}
minusSign{""} minusSign{""}
@ -214,7 +214,7 @@ fi{
minimumGroupingDigits{"1"} minimumGroupingDigits{"1"}
native{"latn"} native{"latn"}
} }
Version{"2.1.37.1"} Version{"2.1.37.67"}
calendar{ calendar{
buddhist{ buddhist{
DateTimePatterns{ DateTimePatterns{
@ -675,9 +675,9 @@ fi{
Ehm{"E h.mm a"} Ehm{"E h.mm a"}
Ehms{"E h.mm.ss a"} Ehms{"E h.mm.ss a"}
Gy{"y G"} Gy{"y G"}
GyMMM{"LLLL y G"} GyMMM{"LLL y G"}
GyMMMEd{"E d.M.y G"} GyMMMEd{"E d. MMM y G"}
GyMMMd{"d.M.y G"} GyMMMd{"d. MMM y G"}
H{"H"} H{"H"}
Hm{"H.mm"} Hm{"H.mm"}
Hms{"H.mm.ss"} Hms{"H.mm.ss"}
@ -685,14 +685,14 @@ fi{
Hmv{"H.mm v"} Hmv{"H.mm v"}
M{"L"} M{"L"}
MEd{"E d.M."} MEd{"E d.M."}
MMM{"LLLL"} MMM{"LLL"}
MMMEd{"ccc d.M."} MMMEd{"ccc d. MMM"}
MMMMW{ MMMMW{
one{"LLLL'n' W. 'viikko'"} one{"LLLL'n' W. 'viikko'"}
other{"LLLL'n' W. 'viikko'"} other{"LLLL'n' W. 'viikko'"}
} }
MMMMd{"d. MMMM"} MMMMd{"d. MMMM"}
MMMd{"d.M."} MMMd{"d. MMM"}
Md{"d.M."} Md{"d.M."}
d{"d"} d{"d"}
h{"h a"} h{"h a"}
@ -705,11 +705,11 @@ fi{
yM{"L.y"} yM{"L.y"}
yMEd{"E d.M.y"} yMEd{"E d.M.y"}
yMM{"M.y"} yMM{"M.y"}
yMMM{"M.y"} yMMM{"LLL y"}
yMMMEd{"E d.M.y"} yMMMEd{"E d. MMM y"}
yMMMM{"LLLL y"} yMMMM{"LLLL y"}
yMMMMccccd{"cccc d. MMMM y"} yMMMMccccd{"cccc d. MMMM y"}
yMMMd{"d.M.y"} yMMMd{"d. MMM y"}
yMd{"d.M.y"} yMd{"d.M.y"}
yQQQ{"QQQ y"} yQQQ{"QQQ y"}
yQQQQ{"QQQQ y"} yQQQQ{"QQQQ y"}

View File

@ -311,5 +311,5 @@ fi{
MK{"EJT Makedonia"} MK{"EJT Makedonia"}
TL{"Timor-Leste"} TL{"Timor-Leste"}
} }
Version{"2.1.37.1"} Version{"2.1.37.67"}
} }

View File

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others. // © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License // License & terms of use: http://www.unicode.org/copyright.html#License
fi{ fi{
Version{"2.1.37.1"} Version{"2.1.37.67"}
durationUnits{ durationUnits{
hm{"h.mm"} hm{"h.mm"}
hms{"h.mm.ss"} hms{"h.mm.ss"}

View File

@ -1,7 +1,7 @@
// © 2016 and later: Unicode, Inc. and others. // © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License // License & terms of use: http://www.unicode.org/copyright.html#License
fi{ fi{
Version{"2.1.37.1"} Version{"2.1.37.67"}
zoneStrings{ zoneStrings{
"Africa:Abidjan"{ "Africa:Abidjan"{
ec{"Abidjan"} ec{"Abidjan"}

View File

@ -143,11 +143,11 @@ void IntlTestDateTimePatternGeneratorAPI::testAPI(/*char *par*/)
// fi // 3 fi // fi // 3 fi
UnicodeString("1.1999"), // 00: yM (fixed expected result per ticket:6626:) UnicodeString("1.1999"), // 00: yM (fixed expected result per ticket:6626:)
UnicodeString("1.1999"), // 01: yMMM UnicodeString("tammi 1999"), // 01: yMMM
UnicodeString("13.1.1999"), // 02: yMd UnicodeString("13.1.1999"), // 02: yMd
UnicodeString("13.1.1999"), // 03: yMMMd UnicodeString("13. tammik. 1999"), // 03: yMMMd
UnicodeString("13.1."), // 04: Md UnicodeString("13.1."), // 04: Md
UnicodeString("13.1."), // 05: MMMd UnicodeString("13. tammik."), // 05: MMMd
UnicodeString("13. tammikuuta"), // 06: MMMMd UnicodeString("13. tammikuuta"), // 06: MMMMd
UnicodeString("1. nelj. 1999"), // 07: yQQQ UnicodeString("1. nelj. 1999"), // 07: yQQQ
UnicodeString("11.58 ip."), // 08: hhmm UnicodeString("11.58 ip."), // 08: hhmm
@ -155,7 +155,7 @@ void IntlTestDateTimePatternGeneratorAPI::testAPI(/*char *par*/)
UnicodeString("23.58"), // 10: jjmm UnicodeString("23.58"), // 10: jjmm
UnicodeString("58.59"), // 11: mmss UnicodeString("58.59"), // 11: mmss
UnicodeString("tammikuu 1999"), // 12: yyyyMMMM UnicodeString("tammikuu 1999"), // 12: yyyyMMMM
UnicodeString("ke 13.1."), // 13: MMMEd -> EEE d. MMM UnicodeString("ke 13. tammik."), // 13: MMMEd -> EEE d. MMM
UnicodeString("ke 13."), // 14: Ed -> ccc d. UnicodeString("ke 13."), // 14: Ed -> ccc d.
UnicodeString("23.58.59,123"), // 15: jmmssSSS -> "H.mm.ss,SSS" UnicodeString("23.58.59,123"), // 15: jmmssSSS -> "H.mm.ss,SSS"
UnicodeString("23.58"), // 16: JJmm UnicodeString("23.58"), // 16: JJmm

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:af06fc6894d8a366d1d9a12f68d1562ca602ddbcf574673aadc0a017f01583a8 oid sha256:9d9e1962263203f4c7c071c58cc0da6f23212294b163f6a7047df4e858c908c8
size 12459424 size 12459520

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:07ca360bece76117efc098b97cf6bf082df398e4afe6150081de59a9d8f1a940 oid sha256:8fadf7128f36cdc4d838a57d07e526f08a91ed0de53500cfd5ea84f33c9ca67b
size 92486 size 92486

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:bc37dab789d1d29379040fa938b58d63a21d0e8bf5e7b6ec07a7e6e26fc0cab7 oid sha256:49fc3149b6f7691682845386826d43267e196a0286eef1dc9ffaf7100690cab1
size 813106 size 813106

View File

@ -427,11 +427,11 @@ public class DateTimeGeneratorTest extends TestFmwk {
new ULocale("fi"), new ULocale("fi"),
new String[] {"yM", "1.1999"}, // (fixed expected result per ticket 6872<-6626) new String[] {"yM", "1.1999"}, // (fixed expected result per ticket 6872<-6626)
new String[] {"yMMM", "1.1999"}, // (fixed expected result per ticket 6872<-7007) new String[] {"yMMM", "tammi 1999"}, // (fixed expected result per ticket 6872<-7007)
new String[] {"yMd", "13.1.1999"}, new String[] {"yMd", "13.1.1999"},
new String[] {"yMMMd", "13.1.1999"}, new String[] {"yMMMd", "13. tammik. 1999"},
new String[] {"Md", "13.1."}, new String[] {"Md", "13.1."},
new String[] {"MMMd", "13.1."}, new String[] {"MMMd", "13. tammik."},
new String[] {"MMMMd", "13. tammikuuta"}, new String[] {"MMMMd", "13. tammikuuta"},
new String[] {"yQQQ", "1. nelj. 1999"}, new String[] {"yQQQ", "1. nelj. 1999"},
new String[] {"hhmm", "11.58 ip."}, new String[] {"hhmm", "11.58 ip."},
@ -439,7 +439,7 @@ public class DateTimeGeneratorTest extends TestFmwk {
new String[] {"jjmm", "23.58"}, new String[] {"jjmm", "23.58"},
new String[] {"mmss", "58.59"}, new String[] {"mmss", "58.59"},
new String[] {"yyyyMMMM", "tammikuu 1999"}, // (new item for testing 6872<-5702,7007) new String[] {"yyyyMMMM", "tammikuu 1999"}, // (new item for testing 6872<-5702,7007)
new String[] {"MMMEd", "ke 13.1."}, new String[] {"MMMEd", "ke 13. tammik."},
new String[] {"Ed", "ke 13."}, new String[] {"Ed", "ke 13."},
new String[] {"jmmssSSS", "23.58.59,123"}, new String[] {"jmmssSSS", "23.58.59,123"},
new String[] {"JJmm", "23.58"}, new String[] {"JJmm", "23.58"},