mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-15 01:42:37 +00:00
ICU-5247 update data
X-SVN-Rev: 19830
This commit is contained in:
parent
7fbceb5fe0
commit
b4504a450f
3 changed files with 91 additions and 7 deletions
|
@ -2047,7 +2047,7 @@ static void TestFallback()
|
|||
UResourceBundle* resLocID = ures_getByKey(myResB, "Version", NULL, &err);
|
||||
UResourceBundle* tResB;
|
||||
const UChar* version = NULL;
|
||||
static const UChar versionStr[] = { 0x0031, 0x002E, 0x0033, 0x0033, 0x0000};
|
||||
static const UChar versionStr[] = { 0x0031, 0x002E, 0x0033, 0x0037, 0x0000};
|
||||
|
||||
if(err != U_ZERO_ERROR){
|
||||
log_data_err("Expected U_ZERO_ERROR when trying to test no_NO_NY aliased to nn_NO for Version err=%s\n",u_errorName(err));
|
||||
|
|
|
@ -1009,14 +1009,18 @@ TimeZoneTest::TestAliasedNames()
|
|||
}
|
||||
if(!quick) {
|
||||
for(loc = 0; loc < noLoc; loc++) {
|
||||
const char* locale = uloc_getAvailable(loc);
|
||||
for(j = 0; j < (int32_t)(sizeof(styles)/sizeof(styles[0])); j++) {
|
||||
for(k = 0; k < (int32_t)(sizeof(useDst)/sizeof(useDst[0])); k++) {
|
||||
fromName.remove();
|
||||
toName.remove();
|
||||
from->getDisplayName(useDst[k], styles[j], uloc_getAvailable(loc), fromName);
|
||||
to->getDisplayName(useDst[k], styles[j], uloc_getAvailable(loc), toName);
|
||||
from->getDisplayName(useDst[k], styles[j],locale, fromName);
|
||||
to->getDisplayName(useDst[k], styles[j], locale, toName);
|
||||
if(fromName.compare(toName) != 0) {
|
||||
errln("Fail: Expected "+toName+" but got " + fromName);
|
||||
errln("Fail: Expected "+toName+" but got " + prettify(fromName)
|
||||
+ " for locale: " + locale + " index: "+ loc
|
||||
+ " to id "+ kData[i].to
|
||||
+ " from id " + kData[i].from);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
86
icu4c/source/test/testdata/structLocale.txt
vendored
86
icu4c/source/test/testdata/structLocale.txt
vendored
|
@ -2084,7 +2084,79 @@ structLocale:table(nofallback){
|
|||
"",
|
||||
}
|
||||
}
|
||||
coptic{
|
||||
monthNames{
|
||||
format{
|
||||
abbreviated{
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
}
|
||||
wide{
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
default{""}
|
||||
ethiopic{
|
||||
monthNames{
|
||||
format{
|
||||
abbreviated{
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
}
|
||||
wide{
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
gregorian{
|
||||
AmPmMarkers{
|
||||
"",
|
||||
|
@ -2106,9 +2178,17 @@ structLocale:table(nofallback){
|
|||
"",
|
||||
}
|
||||
appendItems{
|
||||
E{"{1} {0}"}
|
||||
c{"{1} {0}"}
|
||||
e{"{1} {0}"}
|
||||
Day{"{0} ({2}: {1})"}
|
||||
Day-Of-Week{"{0} {1}"}
|
||||
Era{"{0} {1}"}
|
||||
Hour{"{0} ({2}: {1})"}
|
||||
Minute{"{0} ({2}: {1})"}
|
||||
Month{"{0} ({2}: {1})"}
|
||||
Quarter{"{0} ({2}: {1})"}
|
||||
Second{"{0} ({2}: {1})"}
|
||||
Timezone{"{0} {1}"}
|
||||
Week{"{0} ({2}: {1})"}
|
||||
Year{"{0} {1}"}
|
||||
}
|
||||
availableFormats{
|
||||
HHmm{""}
|
||||
|
|
Loading…
Add table
Reference in a new issue