mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-15 01:42:37 +00:00
ICU-10761 C: pre-integrate changes per cldrbug 8048: to use 'r' in chinese calendar formats
X-SVN-Rev: 37054
This commit is contained in:
Peter Edberg
parent
f149f89059
commit
77775f1b2d
7 changed files with 262 additions and 166 deletions
|
|
@ -1,6 +1,6 @@
|
|||
// ***************************************************************************
|
||||
// *
|
||||
// * Copyright (C) 2014 International Business Machines
|
||||
// * Copyright (C) 2015 International Business Machines
|
||||
// * Corporation and others. All Rights Reserved.
|
||||
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
|
||||
// * Source File: <path>/common/main/en.xml
|
||||
|
|
@ -154,7 +154,7 @@ en{
|
|||
}
|
||||
}
|
||||
}
|
||||
Version{"2.1.10.42"}
|
||||
Version{"2.1.12.90"}
|
||||
calendar{
|
||||
buddhist{
|
||||
eras{
|
||||
|
|
@ -169,10 +169,10 @@ en{
|
|||
"h:mm:ss a z",
|
||||
"h:mm:ss a",
|
||||
"h:mm a",
|
||||
"EEEE, MMMM d, U",
|
||||
"MMMM d, U",
|
||||
"MMM d, U",
|
||||
"M/d/yy",
|
||||
"EEEE, MMMM d, r(U)",
|
||||
"MMMM d, r(U)",
|
||||
"MMM d, r",
|
||||
"M/d/r",
|
||||
"{1}, {0}",
|
||||
"{1} 'at' {0}",
|
||||
"{1} 'at' {0}",
|
||||
|
|
@ -186,10 +186,10 @@ en{
|
|||
Ed{"d E"}
|
||||
Ehm{"E h:mm a"}
|
||||
Ehms{"E h:mm:ss a"}
|
||||
Gy{"U"}
|
||||
GyMMM{"MMM U"}
|
||||
GyMMMEd{"E, MMM d, U"}
|
||||
GyMMMd{"MMM d, U"}
|
||||
Gy{"r(U)"}
|
||||
GyMMM{"MMM r(U)"}
|
||||
GyMMMEd{"E, MMM d, r(U)"}
|
||||
GyMMMd{"MMM d, r"}
|
||||
H{"HH"}
|
||||
Hm{"HH:mm"}
|
||||
Hms{"HH:mm:ss"}
|
||||
|
|
@ -199,22 +199,26 @@ en{
|
|||
MMMEd{"E, MMM d"}
|
||||
MMMd{"MMM d"}
|
||||
Md{"M/d"}
|
||||
UM{"M/U"}
|
||||
UMMM{"MMM U"}
|
||||
UMMMd{"MMM d, U"}
|
||||
UMd{"M/d/U"}
|
||||
d{"d"}
|
||||
h{"h a"}
|
||||
hm{"h:mm a"}
|
||||
hms{"h:mm:ss a"}
|
||||
ms{"mm:ss"}
|
||||
y{"U"}
|
||||
yMd{"M/d/y"}
|
||||
yyyy{"U"}
|
||||
yyyyM{"M/y"}
|
||||
yyyyMEd{"E, M/d/y"}
|
||||
yyyyMMM{"MMM U"}
|
||||
yyyyMMMEd{"E, MMM d, U"}
|
||||
yyyyMMMd{"MMM d, U"}
|
||||
yyyyMd{"M/d/y"}
|
||||
yyyyQQQ{"QQQ U"}
|
||||
yyyyQQQQ{"QQQQ U"}
|
||||
y{"r(U)"}
|
||||
yMd{"M/d/r"}
|
||||
yyyy{"r(U)"}
|
||||
yyyyM{"M/r"}
|
||||
yyyyMEd{"E, M/d/r"}
|
||||
yyyyMMM{"MMM r(U)"}
|
||||
yyyyMMMEd{"E, MMM d, r(U)"}
|
||||
yyyyMMMd{"MMM d, r"}
|
||||
yyyyMd{"M/d/r"}
|
||||
yyyyQQQ{"QQQ r(U)"}
|
||||
yyyyQQQQ{"QQQQ r(U)"}
|
||||
}
|
||||
cyclicNameSets{
|
||||
zodiacs{
|
||||
|
|
|
|||
|
|
@ -1,11 +1,91 @@
|
|||
// ***************************************************************************
|
||||
// *
|
||||
// * Copyright (C) 2014 International Business Machines
|
||||
// * Copyright (C) 2015 International Business Machines
|
||||
// * Corporation and others. All Rights Reserved.
|
||||
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
|
||||
// * Source File: <path>/common/main/en_001.xml
|
||||
// *
|
||||
// ***************************************************************************
|
||||
en_001{
|
||||
Version{"2.1.6.69"}
|
||||
Version{"2.1.12.90"}
|
||||
calendar{
|
||||
chinese{
|
||||
DateTimePatterns{
|
||||
"h:mm:ss a zzzz",
|
||||
"h:mm:ss a z",
|
||||
"h:mm:ss a",
|
||||
"h:mm a",
|
||||
"EEEE, d MMMM r(U)",
|
||||
"d MMMM r(U)",
|
||||
"d MMM r",
|
||||
"dd/MM/r",
|
||||
"{1}, {0}",
|
||||
"{1} 'at' {0}",
|
||||
"{1} 'at' {0}",
|
||||
"{1}, {0}",
|
||||
"{1}, {0}",
|
||||
}
|
||||
availableFormats{
|
||||
Ed{"E d"}
|
||||
GyMMMEd{"E, d MMM r(U)"}
|
||||
GyMMMd{"d MMM r"}
|
||||
M{"LL"}
|
||||
MEd{"E, dd/MM"}
|
||||
MMMEd{"E, d MMM"}
|
||||
MMMMd{"d MMMM"}
|
||||
MMMd{"d MMM"}
|
||||
Md{"dd/MM"}
|
||||
UMMMd{"d MMM U"}
|
||||
UMd{"dd/MM/U"}
|
||||
yMd{"dd/MM/r"}
|
||||
yyyyM{"MM/r"}
|
||||
yyyyMEd{"E, dd/MM/r"}
|
||||
yyyyMMMEd{"E, d MMM r(U)"}
|
||||
yyyyMMMd{"d MMM r"}
|
||||
yyyyMd{"dd/MM/r"}
|
||||
}
|
||||
intervalFormats{
|
||||
MEd{
|
||||
M{"E dd/MM – E dd/MM"}
|
||||
d{"E dd/MM – E dd/MM"}
|
||||
}
|
||||
MMMEd{
|
||||
M{"E d MMM – E d MMM"}
|
||||
d{"E d – E d MMM"}
|
||||
}
|
||||
MMMd{
|
||||
M{"d MMM – d MMM"}
|
||||
d{"d – d MMM"}
|
||||
}
|
||||
Md{
|
||||
M{"dd/MM – dd/MM"}
|
||||
d{"dd/MM – dd/MM"}
|
||||
}
|
||||
yM{
|
||||
M{"MM/y – MM/y"}
|
||||
y{"MM/y – MM/y"}
|
||||
}
|
||||
yMEd{
|
||||
M{"E, dd/MM/y – E, dd/MM/y"}
|
||||
d{"E, dd/MM/y – E, dd/MM/y"}
|
||||
y{"E, dd/MM/y – E, dd/MM/y"}
|
||||
}
|
||||
yMMMEd{
|
||||
M{"E, d MMM – E, d MMM U"}
|
||||
d{"E, d – E, d MMM U"}
|
||||
y{"E, d MMM U – E, d MMM U"}
|
||||
}
|
||||
yMMMd{
|
||||
M{"d MMM – d MMM U"}
|
||||
d{"d – d MMM U"}
|
||||
y{"d MMM U – d MMM U"}
|
||||
}
|
||||
yMd{
|
||||
M{"dd/MM/y – dd/MM/y"}
|
||||
d{"dd/MM/y – dd/MM/y"}
|
||||
y{"dd/MM/y – dd/MM/y"}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
// ***************************************************************************
|
||||
// *
|
||||
// * Copyright (C) 2014 International Business Machines
|
||||
// * Copyright (C) 2015 International Business Machines
|
||||
// * Corporation and others. All Rights Reserved.
|
||||
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
|
||||
// * Source File: <path>/common/main/root.xml
|
||||
|
|
@ -324,7 +324,7 @@ root{
|
|||
}
|
||||
}
|
||||
}
|
||||
Version{"2.1.7.12"}
|
||||
Version{"2.1.12.90"}
|
||||
calendar{
|
||||
buddhist{
|
||||
AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"}
|
||||
|
|
@ -354,10 +354,10 @@ root{
|
|||
"HH:mm:ss z",
|
||||
"HH:mm:ss",
|
||||
"HH:mm",
|
||||
"U MMMM d, EEEE",
|
||||
"U MMMM d",
|
||||
"U MMM d",
|
||||
"y-MM-dd",
|
||||
"r(U) MMMM d, EEEE",
|
||||
"r(U) MMMM d",
|
||||
"r MMM d",
|
||||
"r-MM-dd",
|
||||
"{1} {0}",
|
||||
"{1} {0}",
|
||||
"{1} {0}",
|
||||
|
|
@ -382,10 +382,10 @@ root{
|
|||
availableFormats{
|
||||
E{"ccc"}
|
||||
Ed{"d, E"}
|
||||
Gy{"U"}
|
||||
GyMMM{"U MMM"}
|
||||
GyMMMEd{"U MMM d, E"}
|
||||
GyMMMd{"U MMM d"}
|
||||
Gy{"r U"}
|
||||
GyMMM{"r(U) MMM"}
|
||||
GyMMMEd{"r(U) MMM d, E"}
|
||||
GyMMMd{"r MMM d"}
|
||||
H{"HH"}
|
||||
Hm{"HH:mm"}
|
||||
Hms{"HH:mm:ss"}
|
||||
|
|
@ -395,22 +395,26 @@ root{
|
|||
MMMEd{"MMM d, E"}
|
||||
MMMd{"MMM d"}
|
||||
Md{"MM-dd"}
|
||||
UM{"U MM"}
|
||||
UMMM{"U MMM"}
|
||||
UMMMd{"U MMM d"}
|
||||
UMd{"U MM-d"}
|
||||
d{"d"}
|
||||
h{"h a"}
|
||||
hm{"h:mm a"}
|
||||
hms{"h:mm:ss a"}
|
||||
ms{"mm:ss"}
|
||||
y{"U"}
|
||||
yMd{"y-MM-dd"}
|
||||
yyyy{"U"}
|
||||
yyyyM{"y-MM"}
|
||||
yyyyMEd{"y-MM-dd, E"}
|
||||
yyyyMMM{"U MMM"}
|
||||
yyyyMMMEd{"U MMM d, E"}
|
||||
yyyyMMMd{"U MMM d"}
|
||||
yyyyMd{"y-MM-dd"}
|
||||
yyyyQQQ{"U QQQ"}
|
||||
yyyyQQQQ{"U QQQQ"}
|
||||
y{"r(U)"}
|
||||
yMd{"r-MM-dd"}
|
||||
yyyy{"r(U)"}
|
||||
yyyyM{"r-MM"}
|
||||
yyyyMEd{"r-MM-dd, E"}
|
||||
yyyyMMM{"r(U) MMM"}
|
||||
yyyyMMMEd{"r(U) MMM d, E"}
|
||||
yyyyMMMd{"r MMM d"}
|
||||
yyyyMd{"r-MM-dd"}
|
||||
yyyyQQQ{"r(U) QQQ"}
|
||||
yyyyQQQQ{"r(U) QQQQ"}
|
||||
}
|
||||
cyclicNameSets{
|
||||
dayParts{
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
// ***************************************************************************
|
||||
// *
|
||||
// * Copyright (C) 2014 International Business Machines
|
||||
// * Copyright (C) 2015 International Business Machines
|
||||
// * Corporation and others. All Rights Reserved.
|
||||
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
|
||||
// * Source File: <path>/common/main/zh.xml
|
||||
|
|
@ -201,7 +201,7 @@ zh{
|
|||
native{"hanidec"}
|
||||
traditional{"hans"}
|
||||
}
|
||||
Version{"2.1.8.9"}
|
||||
Version{"2.1.12.90"}
|
||||
calendar{
|
||||
buddhist{
|
||||
DateTimePatterns{
|
||||
|
|
@ -252,18 +252,18 @@ zh{
|
|||
"ah:mm:ss",
|
||||
"ah:mm",
|
||||
{
|
||||
"U年MMMdEEEE",
|
||||
"rU年MMMdEEEE",
|
||||
"d=hanidays",
|
||||
}
|
||||
{
|
||||
"U年MMMd",
|
||||
"rU年MMMd",
|
||||
"d=hanidays",
|
||||
}
|
||||
{
|
||||
"U年MMMd",
|
||||
"r年MMMd",
|
||||
"d=hanidays",
|
||||
}
|
||||
"U-M-d",
|
||||
"r-M-d",
|
||||
"{1} {0}",
|
||||
"{1} {0}",
|
||||
"{1} {0}",
|
||||
|
|
@ -272,27 +272,31 @@ zh{
|
|||
}
|
||||
availableFormats{
|
||||
Ed{"d日E"}
|
||||
Gy{"U年"}
|
||||
GyMMM{"U年MMM"}
|
||||
GyMMMEd{"U年MMMd日E"}
|
||||
GyMMMd{"U年MMMd日"}
|
||||
Gy{"rU年"}
|
||||
GyMMM{"rU年MMM"}
|
||||
GyMMMEd{"rU年MMMdE"}
|
||||
GyMMMd{"r年MMMd"}
|
||||
M{"MMM"}
|
||||
MEd{"M-dE"}
|
||||
MMMEd{"MMMd日E"}
|
||||
MMMd{"MMMd日"}
|
||||
Md{"M-d"}
|
||||
UM{"U年MMM"}
|
||||
UMMM{"U年MMM"}
|
||||
UMMMd{"U年MMMd"}
|
||||
UMd{"U年MMMd"}
|
||||
d{"d日"}
|
||||
y{"U年"}
|
||||
yMd{"U年MMMd日"}
|
||||
yyyy{"U年"}
|
||||
yyyyM{"U年MMM"}
|
||||
yyyyMEd{"U年MMMd日，E"}
|
||||
yyyyMMM{"U年MMM"}
|
||||
yyyyMMMEd{"U年MMMd日E"}
|
||||
yyyyMMMd{"U年MMMd日"}
|
||||
yyyyMd{"U年MMMd日"}
|
||||
yyyyQQQ{"U年QQQQ"}
|
||||
yyyyQQQQ{"U年QQQQ"}
|
||||
y{"rU年"}
|
||||
yMd{"r年MMMd"}
|
||||
yyyy{"rU年"}
|
||||
yyyyM{"rU年MMM"}
|
||||
yyyyMEd{"rU年MMMd，E"}
|
||||
yyyyMMM{"rU年MMM"}
|
||||
yyyyMMMEd{"rU年MMMdE"}
|
||||
yyyyMMMd{"r年MMMd"}
|
||||
yyyyMd{"r年MMMd"}
|
||||
yyyyQQQ{"rU年QQQQ"}
|
||||
yyyyQQQQ{"rU年QQQQ"}
|
||||
}
|
||||
cyclicNameSets{
|
||||
dayParts{
|
||||
|
|
@ -477,39 +481,39 @@ zh{
|
|||
h{"vah至h时"}
|
||||
}
|
||||
y{
|
||||
y{"U至U"}
|
||||
y{"rU至rU"}
|
||||
}
|
||||
yM{
|
||||
M{"U-M至U-M"}
|
||||
y{"U-M至U-M"}
|
||||
M{"r-M至r-M"}
|
||||
y{"r-M至r-M"}
|
||||
}
|
||||
yMEd{
|
||||
M{"U-M-dE至U-M-dE"}
|
||||
d{"U-M-dE至U-M-dE"}
|
||||
y{"U-M-dE至U-M-dE"}
|
||||
M{"r-M-dE至r-M-dE"}
|
||||
d{"r-M-dE至r-M-dE"}
|
||||
y{"r-M-dE至r-M-dE"}
|
||||
}
|
||||
yMMM{
|
||||
M{"U年MMM至MMM"}
|
||||
y{"U年MMM至U年MMM"}
|
||||
M{"rU年MMM至MMM"}
|
||||
y{"rU年MMM至rU年MMM"}
|
||||
}
|
||||
yMMMEd{
|
||||
M{"U年MMMd日E至MMMd日E"}
|
||||
d{"U年MMMd日E至d日E"}
|
||||
y{"U年MMMd日E至U年MMMd日E"}
|
||||
M{"rU年MMMdE至MMMdE"}
|
||||
d{"rU年MMMdE至dE"}
|
||||
y{"rU年MMMdE至rU年MMMdE"}
|
||||
}
|
||||
yMMMM{
|
||||
M{"U年MMMM至MMMM"}
|
||||
y{"U年MMMM至U年MMMM"}
|
||||
M{"rU年MMMM至MMMM"}
|
||||
y{"rU年MMMM至rU年MMMM"}
|
||||
}
|
||||
yMMMd{
|
||||
M{"U年MMMd日至MMMd日"}
|
||||
d{"U年MMMd日至d日"}
|
||||
y{"U年MMMd日至U年MMMd日"}
|
||||
M{"r年MMMd至MMMd"}
|
||||
d{"r年MMMd至d"}
|
||||
y{"r年MMMd至r年MMMd"}
|
||||
}
|
||||
yMd{
|
||||
M{"U-M-d至U-M-d"}
|
||||
d{"U-M-d至U-M-d"}
|
||||
y{"U-M-d至U-M-d"}
|
||||
M{"r-M-d至r-M-d"}
|
||||
d{"r-M-d至r-M-d"}
|
||||
y{"r-M-d至r-M-d"}
|
||||
}
|
||||
}
|
||||
monthNames{
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
// ***************************************************************************
|
||||
// *
|
||||
// * Copyright (C) 2014 International Business Machines
|
||||
// * Copyright (C) 2015 International Business Machines
|
||||
// * Corporation and others. All Rights Reserved.
|
||||
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
|
||||
// * Source File: <path>/common/main/zh_Hant.xml
|
||||
|
|
@ -207,7 +207,7 @@ zh_Hant{
|
|||
native{"hanidec"}
|
||||
traditional{"hant"}
|
||||
}
|
||||
Version{"2.1.8.95"}
|
||||
Version{"2.1.12.90"}
|
||||
calendar{
|
||||
buddhist{
|
||||
DateTimePatterns{
|
||||
|
|
@ -262,18 +262,18 @@ zh_Hant{
|
|||
"ah:mm:ss",
|
||||
"ah:mm",
|
||||
{
|
||||
"U年MMMdEEEE",
|
||||
"rU年MMMdEEEE",
|
||||
"d=hanidays",
|
||||
}
|
||||
{
|
||||
"U年MMMd",
|
||||
"rU年MMMd",
|
||||
"d=hanidays",
|
||||
}
|
||||
{
|
||||
"U年MMMd",
|
||||
"r年MMMd",
|
||||
"d=hanidays",
|
||||
}
|
||||
"U/M/d",
|
||||
"r/M/d",
|
||||
"{1} {0}",
|
||||
"{1} {0}",
|
||||
"{1} {0}",
|
||||
|
|
@ -282,27 +282,31 @@ zh_Hant{
|
|||
}
|
||||
availableFormats{
|
||||
Ed{"d日E"}
|
||||
Gy{"U年"}
|
||||
GyMMM{"U年MMM"}
|
||||
GyMMMEd{"U年MMMd日E"}
|
||||
GyMMMd{"U年MMMd日"}
|
||||
Gy{"rU年"}
|
||||
GyMMM{"rU年MMM"}
|
||||
GyMMMEd{"rU年MMMdE"}
|
||||
GyMMMd{"r年MMMd"}
|
||||
M{"MMM"}
|
||||
MEd{"M/dE"}
|
||||
MMMEd{"MMMd日E"}
|
||||
MMMd{"MMMd日"}
|
||||
Md{"M/d"}
|
||||
UM{"U年MMM"}
|
||||
UMMM{"U年MMM"}
|
||||
UMMMd{"U年MMMd"}
|
||||
UMd{"U年MMMd"}
|
||||
d{"d日"}
|
||||
y{"U年"}
|
||||
yMd{"U年MMMd日"}
|
||||
yyyy{"U年"}
|
||||
yyyyM{"U年MMM"}
|
||||
yyyyMEd{"U年MMMd日，E"}
|
||||
yyyyMMM{"U年MMM"}
|
||||
yyyyMMMEd{"U年MMMd日E"}
|
||||
yyyyMMMd{"U年MMMd日"}
|
||||
yyyyMd{"U年MMMd日"}
|
||||
yyyyQQQ{"U年QQQQ"}
|
||||
yyyyQQQQ{"U年QQQQ"}
|
||||
y{"rU年"}
|
||||
yMd{"r年MMMd"}
|
||||
yyyy{"rU年"}
|
||||
yyyyM{"rU年MMM"}
|
||||
yyyyMEd{"rU年MMMd，E"}
|
||||
yyyyMMM{"rU年MMM"}
|
||||
yyyyMMMEd{"rU年MMMdE"}
|
||||
yyyyMMMd{"r年MMMd"}
|
||||
yyyyMd{"r年MMMd"}
|
||||
yyyyQQQ{"rU年QQQQ"}
|
||||
yyyyQQQQ{"rU年QQQQ"}
|
||||
}
|
||||
cyclicNameSets{
|
||||
dayParts{
|
||||
|
|
@ -494,39 +498,39 @@ zh_Hant{
|
|||
h{"ah時至h時 [v]"}
|
||||
}
|
||||
y{
|
||||
y{"U至U"}
|
||||
y{"rU至rU"}
|
||||
}
|
||||
yM{
|
||||
M{"U/M至U/M"}
|
||||
y{"U/M至U/M"}
|
||||
M{"r/M至r/M"}
|
||||
y{"r/M至r/M"}
|
||||
}
|
||||
yMEd{
|
||||
M{"U/M/dE至U/M/dE"}
|
||||
d{"U/M/dE至U/M/dE"}
|
||||
y{"U/M/dE至U/M/dE"}
|
||||
M{"r/M/dE至r/M/dE"}
|
||||
d{"r/M/dE至r/M/dE"}
|
||||
y{"r/M/dE至r/M/dE"}
|
||||
}
|
||||
yMMM{
|
||||
M{"U年MMM至MMM"}
|
||||
y{"U年MMM至U年MMM"}
|
||||
M{"rU年MMM至MMM"}
|
||||
y{"rU年MMM至rU年MMM"}
|
||||
}
|
||||
yMMMEd{
|
||||
M{"U年MMMd日E至MMMd日E"}
|
||||
d{"U年MMMd日E至d日E"}
|
||||
y{"U年MMMd日E至U年MMMd日E"}
|
||||
M{"rU年MMMdE至MMMdE"}
|
||||
d{"rU年MMMdE至dE"}
|
||||
y{"rU年MMMdE至rU年MMMdE"}
|
||||
}
|
||||
yMMMM{
|
||||
M{"U年MMMM至MMMM"}
|
||||
y{"U年MMMM至U年MMMM"}
|
||||
M{"rU年MMMM至MMMM"}
|
||||
y{"rU年MMMM至rU年MMMM"}
|
||||
}
|
||||
yMMMd{
|
||||
M{"U年MMMd日至MMMd日"}
|
||||
d{"U年MMMd日至d日"}
|
||||
y{"U年MMMd日至U年MMMd日"}
|
||||
M{"r年MMMd至MMMd"}
|
||||
d{"r年MMMd至d"}
|
||||
y{"r年MMMd至r年MMMd"}
|
||||
}
|
||||
yMd{
|
||||
M{"U/M/d至U/M/d"}
|
||||
d{"U/M/d至U/M/d"}
|
||||
y{"U/M/d至U/M/d"}
|
||||
M{"r/M/d至r/M/d"}
|
||||
d{"r/M/d至r/M/d"}
|
||||
y{"r/M/d至r/M/d"}
|
||||
}
|
||||
}
|
||||
monthNames{
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/********************************************************************
|
||||
* COPYRIGHT:
|
||||
* Copyright (c) 1997-2014, International Business Machines
|
||||
* Copyright (c) 1997-2015, International Business Machines
|
||||
* Corporation and others. All Rights Reserved.
|
||||
********************************************************************/
|
||||
|
||||
|
|
@ -4001,39 +4001,39 @@ void DateFormatTest::TestMonthPatterns()
|
|||
|
||||
const MonthPatternItem items[] = {
|
||||
// locale date style; expected formats for the 3 dates above
|
||||
{ "root@calendar=chinese", DateFormat::kLong, { UnicodeString("ren-chen M04 2"), UnicodeString("ren-chen M04bis 2"), UnicodeString("ren-chen M05 2") } },
|
||||
{ "root@calendar=chinese", DateFormat::kShort, { UnicodeString("29-04-02"), UnicodeString("29-04bis-02"), UnicodeString("29-05-02") } },
|
||||
{ "root@calendar=chinese", DateFormat::kLong, { UnicodeString("2012(ren-chen) M04 2"), UnicodeString("2012(ren-chen) M04bis 2"), UnicodeString("2012(ren-chen) M05 2") } },
|
||||
{ "root@calendar=chinese", DateFormat::kShort, { UnicodeString("2012-04-02"), UnicodeString("2012-04bis-02"), UnicodeString("2012-05-02") } },
|
||||
{ "root@calendar=chinese", -1, { UnicodeString("29-4-2"), UnicodeString("29-4bis-2"), UnicodeString("29-5-2") } },
|
||||
{ "root@calendar=chinese", -2, { UnicodeString("78x29-4-2"), UnicodeString("78x29-4bis-2"), UnicodeString("78x29-5-2") } },
|
||||
{ "root@calendar=chinese", -3, { UnicodeString("ren-chen-4-2"), UnicodeString("ren-chen-4bis-2"), UnicodeString("ren-chen-5-2") } },
|
||||
{ "root@calendar=chinese", -4, { UnicodeString("ren-chen M04 2"), UnicodeString("ren-chen M04bis 2"), UnicodeString("ren-chen M05 2") } },
|
||||
{ "en@calendar=gregorian", -3, { UnicodeString("2012-4-22"), UnicodeString("2012-5-22"), UnicodeString("2012-6-20") } },
|
||||
{ "en@calendar=chinese", DateFormat::kLong, { UnicodeString("Month4 2, ren-chen"), UnicodeString("Month4bis 2, ren-chen"), UnicodeString("Month5 2, ren-chen") } },
|
||||
{ "en@calendar=chinese", DateFormat::kShort, { UnicodeString("4/2/29"), UnicodeString("4bis/2/29"), UnicodeString("5/2/29") } },
|
||||
{ "zh@calendar=chinese", DateFormat::kLong, { CharsToUnicodeString("\\u58EC\\u8FB0\\u5E74\\u56DB\\u6708\\u521D\\u4E8C"),
|
||||
CharsToUnicodeString("\\u58EC\\u8FB0\\u5E74\\u95F0\\u56DB\\u6708\\u521D\\u4E8C"),
|
||||
CharsToUnicodeString("\\u58EC\\u8FB0\\u5E74\\u4E94\\u6708\\u521D\\u4E8C") } },
|
||||
{ "zh@calendar=chinese", DateFormat::kShort, { CharsToUnicodeString("\\u58EC\\u8FB0-4-2"),
|
||||
CharsToUnicodeString("\\u58EC\\u8FB0-\\u95F04-2"),
|
||||
CharsToUnicodeString("\\u58EC\\u8FB0-5-2") } },
|
||||
{ "en@calendar=chinese", DateFormat::kLong, { UnicodeString("Month4 2, 2012(ren-chen)"), UnicodeString("Month4bis 2, 2012(ren-chen)"), UnicodeString("Month5 2, 2012(ren-chen)") } },
|
||||
{ "en@calendar=chinese", DateFormat::kShort, { UnicodeString("4/2/2012"), UnicodeString("4bis/2/2012"), UnicodeString("5/2/2012") } },
|
||||
{ "zh@calendar=chinese", DateFormat::kLong, { CharsToUnicodeString("2012\\u58EC\\u8FB0\\u5E74\\u56DB\\u6708\\u521D\\u4E8C"),
|
||||
CharsToUnicodeString("2012\\u58EC\\u8FB0\\u5E74\\u95F0\\u56DB\\u6708\\u521D\\u4E8C"),
|
||||
CharsToUnicodeString("2012\\u58EC\\u8FB0\\u5E74\\u4E94\\u6708\\u521D\\u4E8C") } },
|
||||
{ "zh@calendar=chinese", DateFormat::kShort, { CharsToUnicodeString("2012-4-2"),
|
||||
CharsToUnicodeString("2012-\\u95F04-2"),
|
||||
CharsToUnicodeString("2012-5-2") } },
|
||||
{ "zh@calendar=chinese", -3, { CharsToUnicodeString("\\u58EC\\u8FB0-4-2"),
|
||||
CharsToUnicodeString("\\u58EC\\u8FB0-\\u95F04-2"),
|
||||
CharsToUnicodeString("\\u58EC\\u8FB0-5-2") } },
|
||||
{ "zh@calendar=chinese", -4, { CharsToUnicodeString("\\u58EC\\u8FB0 \\u56DB\\u6708 2"),
|
||||
CharsToUnicodeString("\\u58EC\\u8FB0 \\u95F0\\u56DB\\u6708 2"),
|
||||
CharsToUnicodeString("\\u58EC\\u8FB0 \\u4E94\\u6708 2") } },
|
||||
{ "zh_Hant@calendar=chinese", DateFormat::kLong, { CharsToUnicodeString("\\u58EC\\u8FB0\\u5E74\\u56DB\\u6708\\u521D\\u4E8C"),
|
||||
CharsToUnicodeString("\\u58EC\\u8FB0\\u5E74\\u958F\\u56DB\\u6708\\u521D\\u4E8C"),
|
||||
CharsToUnicodeString("\\u58EC\\u8FB0\\u5E74\\u4E94\\u6708\\u521D\\u4E8C") } },
|
||||
{ "zh_Hant@calendar=chinese", DateFormat::kShort, { CharsToUnicodeString("\\u58EC\\u8FB0/4/2"),
|
||||
CharsToUnicodeString("\\u58EC\\u8FB0/\\u958F4/2"),
|
||||
CharsToUnicodeString("\\u58EC\\u8FB0/5/2") } },
|
||||
{ "zh_Hant@calendar=chinese", DateFormat::kLong, { CharsToUnicodeString("2012\\u58EC\\u8FB0\\u5E74\\u56DB\\u6708\\u521D\\u4E8C"),
|
||||
CharsToUnicodeString("2012\\u58EC\\u8FB0\\u5E74\\u958F\\u56DB\\u6708\\u521D\\u4E8C"),
|
||||
CharsToUnicodeString("2012\\u58EC\\u8FB0\\u5E74\\u4E94\\u6708\\u521D\\u4E8C") } },
|
||||
{ "zh_Hant@calendar=chinese", DateFormat::kShort, { CharsToUnicodeString("2012/4/2"),
|
||||
CharsToUnicodeString("2012/\\u958F4/2"),
|
||||
CharsToUnicodeString("2012/5/2") } },
|
||||
{ "fr@calendar=chinese", DateFormat::kLong, { CharsToUnicodeString("2 s\\u00ECyu\\u00E8 ren-chen"),
|
||||
CharsToUnicodeString("2 s\\u00ECyu\\u00E8bis ren-chen"),
|
||||
CharsToUnicodeString("2 w\\u01D4yu\\u00E8 ren-chen") } },
|
||||
{ "fr@calendar=chinese", DateFormat::kShort, { UnicodeString("2/4/29"), UnicodeString("2/4bis/29"), UnicodeString("2/5/29") } },
|
||||
{ "en@calendar=dangi", DateFormat::kLong, { UnicodeString("Month3bis 2, 29"), UnicodeString("Month4 2, 29"), UnicodeString("Month5 1, 29") } },
|
||||
{ "en@calendar=dangi", DateFormat::kShort, { UnicodeString("3bis/2/29"), UnicodeString("4/2/29"), UnicodeString("5/1/29") } },
|
||||
{ "en@calendar=dangi", DateFormat::kLong, { UnicodeString("Month3bis 2, 2012(29)"), UnicodeString("Month4 2, 2012(29)"), UnicodeString("Month5 1, 2012(29)") } },
|
||||
{ "en@calendar=dangi", DateFormat::kShort, { UnicodeString("3bis/2/2012"), UnicodeString("4/2/2012"), UnicodeString("5/1/2012") } },
|
||||
{ "en@calendar=dangi", -2, { UnicodeString("78x29-3bis-2"), UnicodeString("78x29-4-2"), UnicodeString("78x29-5-1") } },
|
||||
{ "ko@calendar=dangi", DateFormat::kLong, { CharsToUnicodeString("\\uC784\\uC9C4\\uB144 \\uC7243\\uC6D4 2\\uC77C"),
|
||||
CharsToUnicodeString("\\uC784\\uC9C4\\uB144 4\\uC6D4 2\\uC77C"),
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/********************************************************************
|
||||
* COPYRIGHT:
|
||||
* Copyright (c) 2008-2014, International Business Machines Corporation and
|
||||
* Copyright (c) 2008-2015, International Business Machines Corporation and
|
||||
* others. All Rights Reserved.
|
||||
********************************************************************/
|
||||
|
||||
|
|
@ -269,19 +269,19 @@ void IntlTestDateTimePatternGeneratorAPI::testAPI(/*char *par*/)
|
|||
UnicodeString("23:58"), // 16: JJmm
|
||||
|
||||
// zh@calendar=chinese // 10 zh@calendar=chinese
|
||||
CharsToUnicodeString("\\u620A\\u5BC5\\u5E74\\u51AC\\u6708"), // 00: yMMM
|
||||
CharsToUnicodeString("\\u620A\\u5BC5\\u5E74\\u51AC\\u6708"), // 01: yMMM
|
||||
CharsToUnicodeString("\\u620A\\u5BC5\\u5E74\\u51AC\\u670826\\u65E5"), // 02: yMMMd
|
||||
CharsToUnicodeString("\\u620A\\u5BC5\\u5E74\\u51AC\\u670826\\u65E5"), // 03: yMMMd
|
||||
CharsToUnicodeString("1998\\u620A\\u5BC5\\u5E74\\u51AC\\u6708"), // 00: yMMM
|
||||
CharsToUnicodeString("1998\\u620A\\u5BC5\\u5E74\\u51AC\\u6708"), // 01: yMMM
|
||||
CharsToUnicodeString("1998\\u5E74\\u51AC\\u670826"), // 02: yMMMd
|
||||
CharsToUnicodeString("1998\\u5E74\\u51AC\\u670826"), // 03: yMMMd
|
||||
UnicodeString("11-26"), // 04: Md
|
||||
CharsToUnicodeString("\\u51AC\\u670826\\u65E5"), // 05: MMMd
|
||||
CharsToUnicodeString("\\u51AC\\u670826\\u65E5"), // 06: MMMMd
|
||||
CharsToUnicodeString("\\u620A\\u5BC5\\u5E74\\u7b2c\\u56db\\u5B63\\u5EA6"), // 07: yQQQ
|
||||
CharsToUnicodeString("1998\\u620A\\u5BC5\\u5E74\\u7b2c\\u56db\\u5B63\\u5EA6"), // 07: yQQQ
|
||||
CharsToUnicodeString("\\u4E0B\\u534811:58"), // 08: hhmm
|
||||
UnicodeString("23:58"), // 09: HHmm
|
||||
CharsToUnicodeString("\\u4E0B\\u534811:58"), // 10: jjmm
|
||||
UnicodeString("58:59"), // 11: mmss
|
||||
CharsToUnicodeString("\\u620A\\u5BC5\\u5E74\\u51AC\\u6708"), // 12: yyyyMMMM
|
||||
CharsToUnicodeString("1998\\u620A\\u5BC5\\u5E74\\u51AC\\u6708"), // 12: yyyyMMMM
|
||||
CharsToUnicodeString("\\u51AC\\u670826\\u65E5\\u5468\\u4E09"), // 13: MMMEd
|
||||
CharsToUnicodeString("26\\u65E5\\u5468\\u4E09"), // 14: Ed -> d\u65E5EEE
|
||||
CharsToUnicodeString("\\u4E0B\\u534811:58:59.123"), // 15: jmmssSS
|
||||
|
|
@ -869,22 +869,22 @@ void IntlTestDateTimePatternGeneratorAPI::testOptions(/*char *par*/)
|
|||
{ "en@calendar=japanese", "yyyy", "y G", UDATPG_MATCH_NO_OPTIONS },
|
||||
{ "en@calendar=japanese", "YYYY", "Y G", UDATPG_MATCH_NO_OPTIONS },
|
||||
{ "en@calendar=japanese", "U", "y G", UDATPG_MATCH_NO_OPTIONS },
|
||||
{ "en@calendar=chinese", "yyyy", "U", UDATPG_MATCH_NO_OPTIONS },
|
||||
{ "en@calendar=chinese", "YYYY", "Y", UDATPG_MATCH_NO_OPTIONS },
|
||||
{ "en@calendar=chinese", "U", "U", UDATPG_MATCH_NO_OPTIONS },
|
||||
{ "en@calendar=chinese", "Gy", "U", UDATPG_MATCH_NO_OPTIONS },
|
||||
{ "en@calendar=chinese", "GU", "U", UDATPG_MATCH_NO_OPTIONS },
|
||||
{ "en@calendar=chinese", "ULLL", "MMM U", UDATPG_MATCH_NO_OPTIONS },
|
||||
{ "en@calendar=chinese", "yMMM", "MMM U", UDATPG_MATCH_NO_OPTIONS },
|
||||
{ "en@calendar=chinese", "GUMMM", "MMM U", UDATPG_MATCH_NO_OPTIONS },
|
||||
{ "zh@calendar=chinese", "yyyy", "U\\u5E74", UDATPG_MATCH_NO_OPTIONS },
|
||||
{ "zh@calendar=chinese", "YYYY", "Y\\u5E74", UDATPG_MATCH_NO_OPTIONS },
|
||||
{ "zh@calendar=chinese", "U", "U\\u5E74", UDATPG_MATCH_NO_OPTIONS },
|
||||
{ "zh@calendar=chinese", "Gy", "U\\u5E74", UDATPG_MATCH_NO_OPTIONS },
|
||||
{ "zh@calendar=chinese", "GU", "U\\u5E74", UDATPG_MATCH_NO_OPTIONS },
|
||||
{ "zh@calendar=chinese", "ULLL", "U\\u5E74MMM", UDATPG_MATCH_NO_OPTIONS },
|
||||
{ "zh@calendar=chinese", "yMMM", "U\\u5E74MMM", UDATPG_MATCH_NO_OPTIONS },
|
||||
{ "zh@calendar=chinese", "GUMMM", "U\\u5E74MMM", UDATPG_MATCH_NO_OPTIONS },
|
||||
{ "en@calendar=chinese", "yyyy", "r(U)", UDATPG_MATCH_NO_OPTIONS },
|
||||
{ "en@calendar=chinese", "YYYY", "Y(Y)", UDATPG_MATCH_NO_OPTIONS }, // not a good result, want r(Y) or r(U)
|
||||
{ "en@calendar=chinese", "U", "r(U)", UDATPG_MATCH_NO_OPTIONS },
|
||||
{ "en@calendar=chinese", "Gy", "r(U)", UDATPG_MATCH_NO_OPTIONS },
|
||||
{ "en@calendar=chinese", "GU", "r(U)", UDATPG_MATCH_NO_OPTIONS },
|
||||
{ "en@calendar=chinese", "ULLL", "MMM U", UDATPG_MATCH_NO_OPTIONS },
|
||||
{ "en@calendar=chinese", "yMMM", "MMM r(U)", UDATPG_MATCH_NO_OPTIONS },
|
||||
{ "en@calendar=chinese", "GUMMM", "MMM r(U)", UDATPG_MATCH_NO_OPTIONS },
|
||||
{ "zh@calendar=chinese", "yyyy", "rU\\u5E74", UDATPG_MATCH_NO_OPTIONS },
|
||||
{ "zh@calendar=chinese", "YYYY", "YY\\u5E74", UDATPG_MATCH_NO_OPTIONS }, // not a good result, may want r(Y) or r(U)
|
||||
{ "zh@calendar=chinese", "U", "rU\\u5E74", UDATPG_MATCH_NO_OPTIONS },
|
||||
{ "zh@calendar=chinese", "Gy", "rU\\u5E74", UDATPG_MATCH_NO_OPTIONS },
|
||||
{ "zh@calendar=chinese", "GU", "rU\\u5E74", UDATPG_MATCH_NO_OPTIONS },
|
||||
{ "zh@calendar=chinese", "ULLL", "U\\u5E74MMM", UDATPG_MATCH_NO_OPTIONS },
|
||||
{ "zh@calendar=chinese", "yMMM", "rU\\u5E74MMM", UDATPG_MATCH_NO_OPTIONS },
|
||||
{ "zh@calendar=chinese", "GUMMM", "rU\\u5E74MMM", UDATPG_MATCH_NO_OPTIONS },
|
||||
};
|
||||
|
||||
int count = sizeof(testData) / sizeof(testData[0]);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue