From d25163bfc042dbef00577180ee21dd3460fc3715 Mon Sep 17 00:00:00 2001 From: Apple Date: Wed, 9 Dec 2015 05:09:14 +0000 Subject: [PATCH] ICU-551.41.tar.gz --- icuSources/config.sub | 2 +- icuSources/data/locales/ar.txt | 56 +++---- icuSources/data/locales/ar_MA.txt | 8 +- icuSources/data/locales/cs.txt | 4 +- icuSources/data/locales/da.txt | 2 +- icuSources/data/locales/de.txt | 14 +- icuSources/data/locales/el.txt | 4 +- icuSources/data/locales/en_GB.txt | 58 ++++++- icuSources/data/locales/en_IE.txt | 16 +- icuSources/data/locales/es_US.txt | 215 ++++++++++++++++++++++++++ icuSources/data/locales/he.txt | 8 +- icuSources/data/locales/nb.txt | 8 +- icuSources/data/locales/nl.txt | 8 +- icuSources/data/locales/pl.txt | 28 ++-- icuSources/data/locales/th.txt | 4 +- icuSources/data/locales/vi.txt | 2 + icuSources/test/intltest/dtfmttst.cpp | 4 +- icuSources/test/intltest/dtifmtts.cpp | 26 ++-- icuSources/test/intltest/dtptngts.cpp | 4 +- icuSources/test/testdata/format.txt | 4 +- makefile | 2 +- 21 files changed, 374 insertions(+), 103 deletions(-) diff --git a/icuSources/config.sub b/icuSources/config.sub index bff8173f..5e13c911 100644 --- a/icuSources/config.sub +++ b/icuSources/config.sub @@ -253,7 +253,7 @@ case $basic_machine in | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arceb \ - | arm | arm64 | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | armv7s | armv7k \ + | arm | arm64 | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | armv7s \ | avr | avr32 \ | be32 | be64 \ | bfin \ diff --git a/icuSources/data/locales/ar.txt b/icuSources/data/locales/ar.txt index 07ba4542..3a76f17b 100644 --- a/icuSources/data/locales/ar.txt +++ b/icuSources/data/locales/ar.txt @@ -628,13 +628,13 @@ ar{ dayNames{ format{ abbreviated{ - "الأحد", - "الاثنين", - "الثلاثاء", - "الأربعاء", - "الخميس", - "الجمعة", - "السبت", + "أحد", + "اثنين", + "ثلاثاء", + "أربعاء", + "خميس", + "جمعة", + "سبت", } narrow{ "ح", @@ -646,13 +646,13 @@ ar{ "س", } short{ - "الأحد", - "الاثنين", - "الثلاثاء", - "الأربعاء", - "الخميس", - "الجمعة", - "السبت", + "أحد", + "اثنين", + "ثلاثاء", + "أربعاء", + "خميس", + "جمعة", + "سبت", } wide{ "الأحد", @@ -666,13 +666,13 @@ ar{ } stand-alone{ abbreviated{ - "الأحد", - "الاثنين", - "الثلاثاء", - "الأربعاء", - "الخميس", - "الجمعة", - "السبت", + "أحد", + "اثنين", + "ثلاثاء", + "أربعاء", + "خميس", + "جمعة", + "سبت", } narrow{ "ح", @@ -684,13 +684,13 @@ ar{ "س", } short{ - "الأحد", - "الاثنين", - "الثلاثاء", - "الأربعاء", - "الخميس", - "الجمعة", - "السبت", + "أحد", + "اثنين", + "ثلاثاء", + "أربعاء", + "خميس", + "جمعة", + "سبت", } wide{ "الأحد", diff --git a/icuSources/data/locales/ar_MA.txt b/icuSources/data/locales/ar_MA.txt index 1beaa457..9c7b96f7 100644 --- a/icuSources/data/locales/ar_MA.txt +++ b/icuSources/data/locales/ar_MA.txt @@ -30,7 +30,7 @@ ar_MA{ "يونيو", "يوليوز", "غشت", - "سبتمبر", + "شتنبر", "أكتوبر", "نونبر", "دجنبر", @@ -58,7 +58,7 @@ ar_MA{ "يونيو", "يوليوز", "غشت", - "سبتمبر", + "شتنبر", "أكتوبر", "نونبر", "دجنبر", @@ -74,7 +74,7 @@ ar_MA{ "يونيو", "يوليوز", "غشت", - "سبتمبر", + "شتنبر", "أكتوبر", "نونبر", "دجنبر", @@ -102,7 +102,7 @@ ar_MA{ "يونيو", "يوليوز", "غشت", - "سبتمبر", + "شتنبر", "أكتوبر", "نونبر", "دجنبر", diff --git a/icuSources/data/locales/cs.txt b/icuSources/data/locales/cs.txt index fc6ca681..a3d5d8e7 100644 --- a/icuSources/data/locales/cs.txt +++ b/icuSources/data/locales/cs.txt @@ -500,8 +500,8 @@ cs{ } gregorian{ AmPmMarkers{ - "dopoledne", - "odpoledne", + "dop.", + "odp.", } AmPmMarkersAbbr{ "dop.", diff --git a/icuSources/data/locales/da.txt b/icuSources/data/locales/da.txt index 69ef603c..6b401d7d 100644 --- a/icuSources/data/locales/da.txt +++ b/icuSources/data/locales/da.txt @@ -340,7 +340,7 @@ da{ Timezone{"{0} {1}"} } availableFormats{ - E{"ccc"} + E{"E"} EHm{"E HH.mm"} EHms{"E HH.mm.ss"} Ed{"E d."} diff --git a/icuSources/data/locales/de.txt b/icuSources/data/locales/de.txt index 79628ca3..50e2813e 100644 --- a/icuSources/data/locales/de.txt +++ b/icuSources/data/locales/de.txt @@ -188,7 +188,7 @@ de{ "{1} {0}", } availableFormats{ - Ed{"E, d."} + Ed{"E d."} Gy{"U"} GyMMM{"MMM U"} GyMMMEd{"E, d. MMM U"} @@ -257,7 +257,7 @@ de{ "{1}, {0}", } availableFormats{ - Ed{"E, d."} + Ed{"E d."} Gy{"y G"} GyMMM{"MMM y G"} GyMMMEd{"E, d. MMM y G"} @@ -389,12 +389,12 @@ de{ } gregorian{ AmPmMarkers{ - "vorm.", - "nachm.", + "AM", + "PM", } AmPmMarkersNarrow{ - "vm.", - "nm.", + "AM", + "PM", } DateTimePatterns{ "HH:mm:ss zzzz", @@ -420,7 +420,7 @@ de{ E{"ccc"} EHm{"E, HH:mm"} EHms{"E, HH:mm:ss"} - Ed{"E, d."} + Ed{"E d."} Ehm{"E h:mm a"} Ehms{"E, h:mm:ss a"} Gy{"y G"} diff --git a/icuSources/data/locales/el.txt b/icuSources/data/locales/el.txt index 5c9d5ff7..dcd57d08 100644 --- a/icuSources/data/locales/el.txt +++ b/icuSources/data/locales/el.txt @@ -319,8 +319,8 @@ el{ } gregorian{ AmPmMarkers{ - "π.μ.", - "μ.μ.", + "πμ", + "μμ", } AmPmMarkersNarrow{ "π", diff --git a/icuSources/data/locales/en_GB.txt b/icuSources/data/locales/en_GB.txt index be7718ea..79349782 100644 --- a/icuSources/data/locales/en_GB.txt +++ b/icuSources/data/locales/en_GB.txt @@ -10,10 +10,49 @@ en_GB{ %%Parent{"en_001"} Version{"2.1.11.59"} calendar{ + chinese{ + 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"} + } + } + generic{ + availableFormats{ + Ed{"E d"} + GyMMMEd{"E, d MMM y G"} + GyMMMd{"d MMM y G"} + M{"LL"} + MEd{"E dd/MM"} + MMMEd{"E d MMM"} + MMMMd{"d MMMM"} + MMMd{"d MMM"} + Md{"dd/MM"} + yyyyM{"MM/y GGGGG"} + yyyyMEd{"E, dd/MM/y GGGGG"} + yyyyMMMEd{"E, d MMM y G"} + yyyyMMMd{"d MMM y G"} + yyyyMd{"dd/MM/y GGGGG"} + } + } gregorian{ AmPmMarkers{ - "a.m.", - "p.m.", + "am", + "pm", } DateTimePatterns{ "HH:mm:ss zzzz", @@ -30,6 +69,21 @@ en_GB{ "{1}, {0}", "{1}, {0}", } + availableFormats{ + GyMMMEd{"E, d MMM y G"} + GyMMMd{"d MMM y G"} + MEd{"E dd/MM"} + MMMEd{"E d MMM"} + MMMMd{"d MMMM"} + MMMd{"d MMM"} + MMdd{"dd/MM"} + Md{"dd/MM"} + yM{"MM/y"} + yMEd{"E, dd/MM/y"} + yMMMEd{"E, d MMM y"} + yMMMd{"d MMM y"} + yMd{"dd/MM/y"} + } } } fields{ diff --git a/icuSources/data/locales/en_IE.txt b/icuSources/data/locales/en_IE.txt index ee3d3b1e..5b77d21f 100644 --- a/icuSources/data/locales/en_IE.txt +++ b/icuSources/data/locales/en_IE.txt @@ -12,10 +12,10 @@ en_IE{ calendar{ generic{ DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "HH:mm:ss zzzz", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", "EEEE d MMMM y G", "d MMMM y G", "d MMM y G", @@ -61,10 +61,10 @@ en_IE{ "p.m.", } DateTimePatterns{ - "h:mm:ss a zzzz", - "h:mm:ss a z", - "h:mm:ss a", - "h:mm a", + "HH:mm:ss zzzz", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", "EEEE d MMMM y", "d MMMM y", "d MMM y", diff --git a/icuSources/data/locales/es_US.txt b/icuSources/data/locales/es_US.txt index d0eaf982..ed3629d9 100644 --- a/icuSources/data/locales/es_US.txt +++ b/icuSources/data/locales/es_US.txt @@ -10,6 +10,114 @@ es_US{ %%Parent{"es_419"} Version{"2.1.13.23"} calendar{ + generic{ + DateTimePatterns{ + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", + "EEEE, d 'de' MMMM 'de' y G", + "d 'de' MMMM 'de' y G", + "MMM d, y G", + "M/d/yy GGGGG", + "{1} {0}", + "{1}, {0}", + "{1}, {0}", + "{1} {0}", + "{1} {0}", + } + availableFormats{ + GyMMM{"MMM y G"} + GyMMMEd{"E, MMM d, y G"} + GyMMMM{"MMMM 'de' y G"} + GyMMMMEd{"E, d 'de' MMMM 'de' y G"} + GyMMMMd{"d 'de' MMMM 'de' y G"} + GyMMMd{"MMM d, y G"} + MEd{"E, MM/dd"} + MMMEd{"E, MMM d"} + MMMMEd{"E, d 'de' MMMM"} + MMMMd{"d 'de' MMMM"} + MMMd{"MMM d"} + Md{"M/d"} + yyyyM{"M/y G"} + yyyyMEd{"E, M/d/y G"} + yyyyMMM{"MMM y G"} + yyyyMMMEd{"E, MMM d, y G"} + yyyyMMMM{"MMMM 'de' y G"} + yyyyMMMMEd{"E, d 'de' MMMM 'de' y G"} + yyyyMMMMd{"d 'de' MMMM 'de' y G"} + yyyyMMMd{"MMM d, y G"} + yyyyMd{"M/d/y G"} + } + intervalFormats{ + MEd{ + M{"E, M/d – E, M/d"} + d{"E, M/d – E, M/d"} + } + MMMEd{ + M{"E, MMM d – E, MMM d"} + d{"E, MMM d – E, MMM d"} + } + MMMMEd{ + M{"E, d 'de' MMMM–E, d 'de' MMMM"} + d{"E, d 'de' MMMM–E, d 'de' MMMM"} + } + MMMMd{ + M{"d 'de' MMMM–d 'de' MMMM"} + d{"d–d 'de' MMMM"} + } + MMMd{ + M{"MMM d – MMM d"} + d{"MMM d – d"} + } + Md{ + M{"M/d – M/d"} + d{"M/d – M/d"} + } + yM{ + M{"M/y – M/y GGGGG"} + y{"M/y – M/y GGGGG"} + } + yMEd{ + M{"E, M/d/y – E, M/d/y GGGGG"} + d{"E, M/d/y – E, M/d/y GGGGG"} + y{"E, M/d/y – E, M/d/y GGGGG"} + } + yMMM{ + M{"MMM – MMM y G"} + y{"MMM y – MMM y G"} + } + yMMMEd{ + M{"E, MMM d – E, MMM d, y G"} + d{"E, MMM d – E, MMM d, y G"} + y{"E, MMM d, y – E, MMM d, y G"} + } + yMMMM{ + M{"MMMM–MMMM 'de' y G"} + y{"MMMM 'de' y–MMMM 'de' y G"} + } + yMMMMEd{ + M{"E, d 'de' MMMM–E, d 'de' MMMM 'de' y G"} + d{"E, d 'de' MMMM–E, d 'de' MMMM 'de' y G"} + y{"E, d 'de' MMMM 'de' y–E, d 'de' MMMM 'de' y G"} + } + yMMMMd{ + M{"d 'de' MMMM–d 'de' MMMM y G"} + d{"d–d 'de' MMMM 'de' y G"} + y{"d 'de' MMMM 'de' y–d 'de' MMMM 'de' y G"} + } + yMMMd{ + M{"MMM d – MMM d, y G"} + d{"MMM d – d, y G"} + y{"MMM d, y – MMM d, y G"} + } + yMd{ + M{"M/d/y – M/d/y GGGGG"} + d{"M/d/y – M/d/y GGGGG"} + y{"M/d/y – M/d/y GGGGG"} + } + } + } gregorian{ AmPmMarkers{ "AM", @@ -19,7 +127,114 @@ es_US{ "a", "p", } + DateTimePatterns{ + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", + "EEEE, d 'de' MMMM 'de' y", + "d 'de' MMMM 'de' y", + "MMM d, y", + "M/d/yy", + "{1} {0}", + "{1}, {0}", + "{1}, {0}", + "{1} {0}", + "{1} {0}", + } NoonMarkerNarrow{"m"} + availableFormats{ + GyMMM{"MMM y G"} + GyMMMEd{"E, MMM d, y G"} + GyMMMM{"MMMM 'de' y G"} + GyMMMMEd{"E, d 'de' MMMM 'de' y G"} + GyMMMMd{"d 'de' MMMM 'de' y G"} + GyMMMd{"MMM d, y G"} + MEd{"E, MM/dd"} + MMMEd{"E, MMM d"} + MMMMEd{"E, d 'de' MMMM"} + MMMd{"MMM d"} + Md{"M/d"} + yMEd{"E, M/d/y"} + yMMM{"MMM y"} + yMMMEd{"E, MMM d, y"} + yMMMM{"MMMM 'de' y"} + yMMMMEd{"E, d 'de' MMMM 'de' y"} + yMMMMd{"d 'de' MMMM 'de' y"} + yMMMd{"MMM d, y"} + yMd{"M/d/y"} + } + intervalFormats{ + MEd{ + M{"E, M/d – E, M/d"} + d{"E, M/d – E, M/d"} + } + MMM{ + M{"MMM – MMM"} + } + MMMEd{ + M{"E, MMM d – E, MMM d"} + d{"E, MMM d – E, MMM d"} + } + MMMMEd{ + M{"E, d 'de' MMMM–E, d 'de' MMMM"} + d{"E, d 'de' MMMM–E, d 'de' MMMM"} + } + MMMMd{ + M{"d 'de' MMMM–d 'de' MMMM"} + d{"d–d 'de' MMMM"} + } + MMMd{ + M{"MMM d – MMM d"} + d{"MMM d – d"} + } + Md{ + M{"M/d – M/d"} + d{"M/d – M/d"} + } + yM{ + M{"M/y – M/y"} + y{"M/y – M/y"} + } + yMEd{ + M{"E, M/d/y – E, M/d/y"} + d{"E, M/d/y – E, M/d/y"} + y{"E, M/d/y – E, M/d/y"} + } + yMMM{ + M{"MMM – MMM y"} + y{"MMM y – MMM y"} + } + yMMMEd{ + M{"E, MMM d – E, MMM d, y"} + d{"E, MMM d – E, MMM d, y"} + y{"E, MMM d, y – E, MMM d, y"} + } + yMMMM{ + M{"MMMM–MMMM 'de' y"} + y{"MMMM 'de' y–MMMM 'de' y"} + } + yMMMMEd{ + M{"E, d 'de' MMMM–E, d 'de' MMMM 'de' y"} + d{"E, d 'de' MMMM–E, d 'de' MMMM 'de' y"} + y{"E, d 'de' MMMM 'de' y–E, d 'de' MMMM 'de' y"} + } + yMMMMd{ + M{"d 'de' MMMM–d 'de' MMMM 'de' y"} + d{"d–d 'de' MMMM 'de' y"} + y{"d 'de' MMMM 'de' y–d 'de' MMMM 'de' y"} + } + yMMMd{ + M{"MMM d – MMM d, y"} + d{"MMM d – d, y"} + y{"MMM d, y – MMM d, y"} + } + yMd{ + M{"M/d/y – M/d/y"} + d{"M/d/y – M/d/y"} + y{"M/d/y – M/d/y"} + } + } } } } diff --git a/icuSources/data/locales/he.txt b/icuSources/data/locales/he.txt index 95bb855f..6db91228 100644 --- a/icuSources/data/locales/he.txt +++ b/icuSources/data/locales/he.txt @@ -359,12 +359,12 @@ he{ } gregorian{ AmPmMarkers{ - "לפנה״צ", - "אחה״צ", + "לפ׳", + "אח׳", } AmPmMarkersNarrow{ - "לפנה״צ", - "אחה״צ", + "לפ׳", + "אח׳", } DateTimePatterns{ "H:mm:ss zzzz", diff --git a/icuSources/data/locales/nb.txt b/icuSources/data/locales/nb.txt index 4251c392..7a3decae 100644 --- a/icuSources/data/locales/nb.txt +++ b/icuSources/data/locales/nb.txt @@ -313,12 +313,12 @@ nb{ } gregorian{ AmPmMarkers{ - "a.m.", - "p.m.", + "am", + "pm", } AmPmMarkersAbbr{ - "a.m.", - "p.m.", + "am", + "pm", } AmPmMarkersNarrow{ "a", diff --git a/icuSources/data/locales/nl.txt b/icuSources/data/locales/nl.txt index 1698e5ff..5b35a0a6 100644 --- a/icuSources/data/locales/nl.txt +++ b/icuSources/data/locales/nl.txt @@ -1276,12 +1276,12 @@ nl{ } gregorian{ AmPmMarkers{ - "a.m.", - "p.m.", + "AM", + "PM", } AmPmMarkersNarrow{ - "a.m.", - "p.m.", + "AM", + "PM", } DateTimePatterns{ "HH:mm:ss zzzz", diff --git a/icuSources/data/locales/pl.txt b/icuSources/data/locales/pl.txt index 5cf8b24d..00ea34e0 100644 --- a/icuSources/data/locales/pl.txt +++ b/icuSources/data/locales/pl.txt @@ -675,13 +675,13 @@ pl{ "S", } short{ - "niedz.", - "pon.", - "wt.", - "śr.", - "czw.", - "pt.", - "sob.", + "nie", + "pon", + "wto", + "śro", + "czw", + "pią", + "sob", } wide{ "niedziela", @@ -713,13 +713,13 @@ pl{ "S", } short{ - "niedz.", - "pon.", - "wt.", - "śr.", - "czw.", - "pt.", - "sob.", + "nie", + "pon", + "wto", + "śro", + "czw", + "pią", + "sob", } wide{ "niedziela", diff --git a/icuSources/data/locales/th.txt b/icuSources/data/locales/th.txt index 3253329b..56abe036 100644 --- a/icuSources/data/locales/th.txt +++ b/icuSources/data/locales/th.txt @@ -1118,8 +1118,8 @@ th{ } gregorian{ AmPmMarkers{ - "ก่อนเที่ยง", - "หลังเที่ยง", + "AM", + "PM", } AmPmMarkersNarrow{ "a", diff --git a/icuSources/data/locales/vi.txt b/icuSources/data/locales/vi.txt index 5cba853c..a805dfe5 100644 --- a/icuSources/data/locales/vi.txt +++ b/icuSources/data/locales/vi.txt @@ -590,6 +590,7 @@ vi{ yyyyMMMEd{"E, dd MMM y G"} yyyyMMMM{"MMMM y G"} yyyyMMMd{"dd MMM, y G"} + yyyyMMdd{"dd/MM/y"} yyyyMd{"d/M/y G"} yyyyQQQ{"QQQ y G"} yyyyQQQQ{"QQQQ y G"} @@ -756,6 +757,7 @@ vi{ yMMMEd{"E, dd MMM y"} yMMMM{"MMMM 'năm' y"} yMMMd{"dd MMM, y"} + yMMdd{"dd/MM/y"} yMd{"d/M/y"} yQQQ{"QQQ y"} yQQQQ{"QQQQ y"} diff --git a/icuSources/test/intltest/dtfmttst.cpp b/icuSources/test/intltest/dtfmttst.cpp index 1c008399..e4fa37b6 100644 --- a/icuSources/test/intltest/dtfmttst.cpp +++ b/icuSources/test/intltest/dtfmttst.cpp @@ -1807,8 +1807,8 @@ void DateFormatTest::TestNarrowNames() "ccccc", "1970 01 02 0:00:00", "P", "ccccc", "1970 01 03 0:00:00", "S", - "h:mm a", "2015 01 01 10:00:00", "10:00 dopoledne", - "h:mm a", "2015 01 01 22:00:00", "10:00 odpoledne", + "h:mm a", "2015 01 01 10:00:00", "10:00 dop.", + "h:mm a", "2015 01 01 22:00:00", "10:00 odp.", "h:mm aaaaa", "2015 01 01 10:00:00", "10:00 dop.", "h:mm aaaaa", "2015 01 01 22:00:00", "10:00 odp.", }; diff --git a/icuSources/test/intltest/dtifmtts.cpp b/icuSources/test/intltest/dtifmtts.cpp index 55ba8738..ffe6a368 100644 --- a/icuSources/test/intltest/dtifmtts.cpp +++ b/icuSources/test/intltest/dtifmtts.cpp @@ -899,7 +899,7 @@ void DateIntervalFormatTest::testFormat() { "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "M", "10.2007 \\u2013 10.2008", - "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "hm", "10.10.2007, 10:10 vorm. \\u2013 10.10.2008, 10:10 vorm.", + "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "hm", "10.10.2007, 10:10 AM \\u2013 10.10.2008, 10:10 AM", "de", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "Hm", "10.10.2007, 10:10 \\u2013 10.10.2008, 10:10", "de", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EEEEdMMMy", "Mittwoch, 10. Okt. \\u2013 Samstag, 10. Nov. 2007", @@ -925,7 +925,7 @@ void DateIntervalFormatTest::testFormat() { "de", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "MMM", "Okt.\\u2013Nov.", - "de", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "hms", "10.10.2007, 10:10:10 vorm. \\u2013 10.11.2007, 10:10:10 vorm.", + "de", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "hms", "10.10.2007, 10:10:10 AM \\u2013 10.11.2007, 10:10:10 AM", "de", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "Hms", "10.10.2007, 10:10:10 \\u2013 10.11.2007, 10:10:10", "de", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EEEEdMMMy", "Samstag, 10. \\u2013 Dienstag, 20. Nov. 2007", @@ -950,7 +950,7 @@ void DateIntervalFormatTest::testFormat() { "de", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "y", "2007", - "de", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hmv", "10.11.2007, 10:10 vorm. Los Angeles Zeit \\u2013 20.11.2007, 10:10 vorm. Los Angeles Zeit", + "de", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hmv", "10.11.2007, 10:10 AM Los Angeles Zeit \\u2013 20.11.2007, 10:10 AM Los Angeles Zeit", "de", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "EEEEdMMMy", "Mittwoch, 10. Jan. 2007", @@ -962,33 +962,33 @@ void DateIntervalFormatTest::testFormat() { "de", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "EEEEdMMM", "Mittwoch, 10. Jan.", - "de", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "h", "10 vorm. \\u2013 2 nachm.", + "de", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "h", "10 AM \\u2013 2 PM", "de", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "H", "10\\u201314 Uhr", "de", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "EEEEdMMM", "Mittwoch, 10. Jan.", - "de", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hmv", "10:00\\u201310:20 vorm. Los Angeles Zeit", + "de", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hmv", "10:00\\u201310:20 AM Los Angeles Zeit", - "de", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hmz", "10:00\\u201310:20 vorm. GMT-8", + "de", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hmz", "10:00\\u201310:20 AM GMT-8", - "de", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "h", "10 vorm.", + "de", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "h", "10 AM", "de", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "H", "10 Uhr", - "de", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hz", "10 vorm. GMT-8", + "de", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "hz", "10 AM GMT-8", "de", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "EEEEdMMMy", "Mittwoch, 10. Jan. 2007", - "de", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hmv", "10:10 vorm. Los Angeles Zeit", + "de", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hmv", "10:10 AM Los Angeles Zeit", - "de", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hmz", "10:10 vorm. GMT-8", + "de", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hmz", "10:10 AM GMT-8", - "de", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hv", "10 vorm. Los Angeles Zeit", + "de", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hv", "10 AM Los Angeles Zeit", - "de", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hz", "10 vorm. GMT-8", + "de", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "hz", "10 AM GMT-8", // Thai (default calendar buddhist) @@ -1520,7 +1520,7 @@ void DateIntervalFormatTest::testTicket11583_2() { DateInterval interval((UDate) 1232364615000.0, (UDate) 1328787015000.0); UnicodeString appendTo; FieldPosition fpos(FieldPosition::DONT_CARE); - UnicodeString expected("ene de 2009 \\u2013 feb de 2012"); + UnicodeString expected("ene 2009 \\u2013 feb 2012"); assertEquals( "", expected.unescape(), diff --git a/icuSources/test/intltest/dtptngts.cpp b/icuSources/test/intltest/dtptngts.cpp index fdf75d12..38c6a7c5 100644 --- a/icuSources/test/intltest/dtptngts.cpp +++ b/icuSources/test/intltest/dtptngts.cpp @@ -125,13 +125,13 @@ void IntlTestDateTimePatternGeneratorAPI::testAPI(/*char *par*/) UnicodeString("13. Jan."), // 05: MMMd UnicodeString("13. Januar"), // 06: MMMMd UnicodeString("Q1 1999"), // 07: yQQQ - UnicodeString("11:58 nachm."), // 08: hhmm + UnicodeString("11:58 PM"), // 08: hhmm UnicodeString("23:58"), // 09: HHmm UnicodeString("23:58"), // 10: jjmm UnicodeString("58:59"), // 11: mmss UnicodeString("Januar 1999"), // 12: yyyyMMMM UnicodeString("Mi., 13. Jan."), // 13: MMMEd -> EEE, d. MMM - UnicodeString("Mi., 13."), // 14: Ed -> EEE d. + UnicodeString("Mi. 13."), // 14: Ed -> E d. UnicodeString("23:58:59,123"), // 15: jmmssSSS -> "HH:mm:ss,SSS" UnicodeString("23:58"), // 16: JJmm diff --git a/icuSources/test/testdata/format.txt b/icuSources/test/testdata/format.txt index e2d99622..9d905c02 100644 --- a/icuSources/test/testdata/format.txt +++ b/icuSources/test/testdata/format.txt @@ -170,14 +170,14 @@ format:table(nofallback) { "GMT", "DATE=RELATIVE_LONG,TIME=MEDIUM", "ERA=1,YEAR=2012,MONTH=OCTOBER,DATE=8,HOUR_OF_DAY=23,MINUTE=59,SECOND=0", - "8 Οκτωβρίου 2012 - 11:59:00 μ.μ." + "8 Οκτωβρίου 2012 - 11:59:00 μμ" }, { "el@calendar=gregorian", "GMT", "DATE=RELATIVE_LONG,TIME=MEDIUM", "RELATIVE_ADD:DATE=-1,HOUR_OF_DAY=17,MINUTE=0,SECOND=0", // one day before now at specified time - "χθες - 5:00:00 μ.μ." + "χθες - 5:00:00 μμ" }, // other tests { diff --git a/makefile b/makefile index e55ce237..81eec170 100644 --- a/makefile +++ b/makefile @@ -193,7 +193,7 @@ else endif endif ifneq "$(RC_ARCHS)" "" - ifneq "$(filter arm armv6 armv7 armv7s armv7k arm64,$(RC_ARCHS))" "" + ifneq "$(filter arm armv6 armv7 armv7s arm64,$(RC_ARCHS))" "" CROSS_BUILD=YES BUILD_TYPE=DEVICE else ifeq "$(RC_INDIGO)" "YES" -- 2.47.2