AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-5597 Remove localized date time pattern characters from ICU locale data and update ICU4C DateFormatSymbols to use the base pattern

Browse Source 
X-SVN-Rev: 21087
This commit is contained in:
Yoshito Umaoka 2007-02-22 23:44:11 +00:00
parent 8a10a2e6a6
commit fe62e13597
42 changed files with 66 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
icu4c/source/data/icu-config.xml
View File

@ -1,7 +1,7 @@
<!--
/*
*******************************************************************************
* Copyright (C) 2005-2006, International Business Machines Corporation and *
* Copyright (C) 2005-2007, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -305,6 +305,7 @@
<include xpath="//ldml/dates/calendars/calendar\[@type='.*'\]/dateTimeFormats/availableFormats/.*" locales=".*" draft="provisional" />
<include xpath="//ldml/collations/collation\[@type='standard'\]/.*" locales="ml or" draft="confirmed" />
<!-- Exclude unusable data -->
<exclude xpath="//ldml/dates/localizedPatternChars.*"/>
<exclude xpath="//ldml/posix/messages/.*"/>
<exclude xpath="//ldml/numbers/currencies/.*" locales="bg_BG, nl_BE"/>
<exclude xpath="//ldml/localeDisplayNames/.*" locales=".*" alt=".*" />

3
icu4c/source/data/locales/ar.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/ar.xml
@ -2140,7 +2140,6 @@ ar{
characters{"right-to-left"}
lines{"top-to-bottom"}
}
localPatternChars{"GanjkHmsSEDFwWxhKzAeugXZvcL"}
zoneStrings{
"America:Indiana:Petersburg"{
ec{"بيترسبرج"}

3
icu4c/source/data/locales/be.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/be.xml
@ -227,5 +227,4 @@ be{
}
}
}
localPatternChars{"GanjkHmsSEDFwWxhKzAeugXZvcL"}
}

3
icu4c/source/data/locales/bg.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/bg.xml
@ -1578,7 +1578,6 @@ bg{
quotationEnd{"“"}
quotationStart{"„"}
}
localPatternChars{"GanjkHmsSEDFwWxhKzAeugXZvcL"}
measurementSystemNames{
US{"Американска"}
metric{"Метрична"}

3
icu4c/source/data/locales/ca.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/ca.xml
@ -511,5 +511,4 @@ ca{
}
}
}
localPatternChars{"GuMtkHmsSEDFwWahKzUeygAZvcL"}
}

3
icu4c/source/data/locales/cs.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/cs.xml
@ -1609,7 +1609,6 @@ cs{
*/
casing{"titlecase-firstword"}
}
localPatternChars{"GuMtkHmsSEDFwWahKzUeygAZvcL"}
zoneStrings{
"Africa:Casablanca"{
ec{"Casablanca"}

3
icu4c/source/data/locales/da.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/da.xml
@ -1876,7 +1876,6 @@ da{
}
}
}
localPatternChars{"GuMtkHmsSEDFwWahKzUeygAZvcL"}
zoneStrings{
"Africa:Casablanca"{
ec{"Casablanca"}

3
icu4c/source/data/locales/de.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/de.xml
@ -1962,7 +1962,6 @@ de{
quotationEnd{"‘"}
quotationStart{"‚"}
}
localPatternChars{"GjMtkHmsSEDFwWahKzJeugAZvcL"}
zoneStrings{
"America:Mexico_City"{
ec{"Mexiko-Stadt"}

3
icu4c/source/data/locales/el.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/el.xml
@ -1526,7 +1526,6 @@ el{
}
}
}
localPatternChars{"GanjkHmsSEDFwWxhKzAeugXZvcL"}
zoneStrings{
"Africa:Bamako"{
ec{"Μπαμάκο"}

3
icu4c/source/data/locales/eo.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/eo.xml
@ -491,5 +491,4 @@ eo{
}
}
}
localPatternChars{"GjMtkHmslTDUSnahKzJdugAZvcL"}
}

3
icu4c/source/data/locales/es.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/es.xml
@ -2098,7 +2098,6 @@ es{
quotationEnd{"’"}
quotationStart{"‘"}
}
localPatternChars{"GuMtkHmsSEDFwWahKzUeygAZvcL"}
measurementSystemNames{
US{"estadounidense"}
metric{"métrico"}

3
icu4c/source/data/locales/et.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/et.xml
@ -417,5 +417,4 @@ et{
}
}
}
localPatternChars{"GanjkHmsSEDFwWxhKzAeugXZvcL"}
}

3
icu4c/source/data/locales/fi.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/fi.xml
@ -2226,7 +2226,6 @@ fi{
alternateQuotationStart{"’"}
quotationStart{"”"}
}
localPatternChars{"GanjkHmsSEDFwWxhKzAeugXZvcL"}
measurementSystemNames{
metric{"metrinen"}
}

3
icu4c/source/data/locales/fr.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/fr.xml
@ -2066,7 +2066,6 @@ fr{
quotationEnd{"»"}
quotationStart{"«"}
}
localPatternChars{"GaMjkHmsSEDFwWxhKzAeugXZvcL"}
measurementSystemNames{
US{"américain"}
metric{"métrique"}

3
icu4c/source/data/locales/ga.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/ga.xml
@ -1465,7 +1465,6 @@ ga{
}
}
}
localPatternChars{"RbMLkUnsSElFtTauKcBeyrACvdz"}
zoneStrings{
"Europe:Belfast"{
ec{"Béal Feirste"}

3
icu4c/source/data/locales/he.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/he.xml
@ -1097,7 +1097,6 @@ he{
characters{"right-to-left"}
lines{"top-to-bottom"}
}
localPatternChars{"GanjkHmsSEDFwWxhKzAeugXZvcL"}
zoneStrings{
"Africa:Timbuktu"{
ec{"אפריקה/טימבקטו"}

3
icu4c/source/data/locales/hr.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/hr.xml
@ -1282,7 +1282,6 @@ hr{
}
}
}
localPatternChars{"GanjkHmsSEDFwWxhKzAeugXZvcL"}
zoneStrings{
"Africa:Kinshasa"{
ec{"Kinšasa"}

3
icu4c/source/data/locales/hu.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/hu.xml
@ -1697,7 +1697,6 @@ hu{
}
}
}
localPatternChars{"GanjkHmsSEDFwWxhKzAeugXZvcL"}
zoneStrings{
"America:Araguaina"{
ec{"Araguaína"}

3
icu4c/source/data/locales/ja.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/ja.xml
@ -2314,7 +2314,6 @@ ja{
}
}
}
localPatternChars{"GanjkHmsSEDFwWxhKzAeugXZvcL"}
zoneStrings{
"Africa:Bamako"{
ec{"アフリカ/バマコ"}

3
icu4c/source/data/locales/ko.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/ko.xml
@ -1915,7 +1915,6 @@ ko{
}
}
}
localPatternChars{"GanjkHmsSEDFwWxhKzAeugXZvcL"}
zoneStrings{
"Africa:Casablanca"{
ec{"카사블랑카"}

3
icu4c/source/data/locales/lt.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/lt.xml
@ -562,7 +562,6 @@ lt{
quotationEnd{"“"}
quotationStart{"„"}
}
localPatternChars{"GanjkHmsSEDFwWxhKzAeugXZvcL"}
zoneStrings{
"America:Chicago"{
ec{"Čikaga"}

3
icu4c/source/data/locales/lv.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/lv.xml
@ -403,5 +403,4 @@ lv{
}
}
}
localPatternChars{"GanjkHmsSEDFwWxhKzAeugXZvcL"}
}

3
icu4c/source/data/locales/mk.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/mk.xml
@ -1135,5 +1135,4 @@ mk{
}
}
}
localPatternChars{"GuMtkHmsSEDFwWahKzUeygAZvcL"}
}

3
icu4c/source/data/locales/ro.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/ro.xml
@ -453,7 +453,6 @@ ro{
}
}
}
localPatternChars{"GanjkHmsSEDFwWxhKzAeugXZvcL"}
zoneStrings{
"Antarctica:South_Pole"{
ec{"Polul Sud"}

3
icu4c/source/data/locales/root.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/root.xml
@ -712,7 +712,6 @@ root{
quotationEnd{"”"}
quotationStart{"“"}
}
localPatternChars{"GyMdkHmsSEDFwWahKzYeugAZvcL"}
measurementSystemNames{
US{"US"}
metric{"Metric"}

3
icu4c/source/data/locales/ru.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/ru.xml
@ -1942,7 +1942,6 @@ ru{
*/
casing{"titlecase-firstword"}
}
localPatternChars{"GanjkHmsSEDFwWxhKzAeugXZvcL"}
zoneStrings{
"Africa:Bamako"{
ec{"Бамако"}

3
icu4c/source/data/locales/sk.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/sk.xml
@ -1432,7 +1432,6 @@ sk{
}
}
}
localPatternChars{"GanjkHmsSEDFwWxhKzAeugXZvcL"}
zoneStrings{
"Antarctica:South_Pole"{
ec{"Južný pól"}

3
icu4c/source/data/locales/sl.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/sl.xml
@ -527,7 +527,6 @@ sl{
}
}
}
localPatternChars{"GanjkHmsSEDFwWxhKzAeugXZvcL"}
zoneStrings{
"Africa:Kinshasa"{
ec{"Kinšasa"}

3
icu4c/source/data/locales/sq.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/sq.xml
@ -356,5 +356,4 @@ sq{
}
}
}
localPatternChars{"GanjkHmsSEDFwWxhKzAeugXZvcL"}
}

3
icu4c/source/data/locales/sr.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/sr.xml
@ -667,7 +667,6 @@ sr{
}
}
}
localPatternChars{"GanjkHmsSEDFwWxhKzAeugXZvcL"}
zoneStrings{
"Africa:Lubumbashi"{
ec{"Лумумбаши"}

3
icu4c/source/data/locales/th.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/th.xml
@ -2099,7 +2099,6 @@ th{
}
}
}
localPatternChars{"GanjkHmsSEDFwWxhKzAeugXZvcL"}
zoneStrings{
"Africa:Ceuta"{
ec{"เซวตา"}

3
icu4c/source/data/locales/tr.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/tr.xml
@ -1874,7 +1874,6 @@ tr{
}
}
}
localPatternChars{"GanjkHmsSEDFwWxhKzAeugXZvcL"}
zoneStrings{
"Africa:Ceuta"{
ec{"Septe"}

3
icu4c/source/data/locales/uk.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/uk.xml
@ -1788,7 +1788,6 @@ uk{
}
}
}
localPatternChars{"GanjkHmsSEDFwWxhKzAeugXZvcL"}
zoneStrings{
"Africa:Bamako"{
ec{"Бамако"}

3
icu4c/source/data/locales/zh.txt
View File

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2006 International Business Machines
// * Copyright (C) 2007 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
// * Source File:<path>/common/main/zh.xml
@ -1944,7 +1944,6 @@ zh{
}
}
}
localPatternChars{"GanjkHmsSEDFwWxhKzAeugXZvcL"}
zoneStrings{
"Africa:Bamako"{
ec{"巴马科"}

7
icu4c/source/i18n/dtfmtsym.cpp
View File

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 1997-2006, International Business Machines Corporation and *
* Copyright (C) 1997-2007, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*
@ -1253,7 +1253,8 @@ DateFormatSymbols::initializeData(const Locale& locale, const char *type, UError
status = U_ZERO_ERROR;
initField(&fStandaloneShortQuarters, fStandaloneShortQuartersCount, calData.getByKey2(gQuartersTag, gNamesAbbrTag, status), status);
}
// ICU 3.8 or later version no longer uses localized date-time pattern characters by default (ticket#5597)
/*
// fastCopyFrom()/setTo() - see assignArray comments
resStr = ures_getStringByKey(fResourceBundle, gLocalPatternCharsTag, &len, &status);
fLocalPatternChars.setTo(TRUE, resStr, len);
@ -1262,6 +1263,8 @@ DateFormatSymbols::initializeData(const Locale& locale, const char *type, UError
if (len < PATTERN_CHARS_LEN) {
fLocalPatternChars.append(UnicodeString(TRUE, &gPatternChars[len], PATTERN_CHARS_LEN-len));
}
*/
fLocalPatternChars = gPatternChars;
// {sfb} fixed to handle 1-based weekdays
weekdaysData = calData.getByKey2(gDayNamesTag, gNamesWideTag, status);

6
icu4c/source/i18n/unicode/dtfmtsym.h
View File

@ -1,6 +1,6 @@
/*
********************************************************************************
* Copyright (C) 1997-2006, International Business Machines
* Copyright (C) 1997-2007, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************************
*
@ -405,6 +405,10 @@ public:
/**
* Gets localized date-time pattern characters. For example: 'u', 't', etc.
* <p>
* Note: ICU no longer provides localized date-time pattern characters for a locale
* starting ICU 3.8. This method returns the non-localized date-time pattern
* characters unless user defined localized data is set by setLocalPatternChars.
* @param result Output param which will receive the localized date-time pattern characters.
* @return A reference to 'result'.
* @stable ICU 2.0

4
icu4c/source/test/cintltst/cdattst.c
View File

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2006, International Business Machines Corporation and
* Copyright (c) 1997-2007, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/********************************************************************************
@ -450,7 +450,7 @@ static void TestSymbols()
VerifygetSymbols(def, UDAT_QUARTERS, 3, "4th quarter");
VerifygetSymbols(fr, UDAT_SHORT_QUARTERS, 1, "T2");
VerifygetSymbols(def, UDAT_SHORT_QUARTERS, 2, "Q3");
VerifygetSymbols(def,UDAT_LOCALIZED_CHARS, 0, "GyMdkHmsSEDFwWahKzYeugAZvcL");
VerifygetSymbols(def,UDAT_LOCALIZED_CHARS, 0, "GyMdkHmsSEDFwWahKzYeugAZvcLQq");
if(result != NULL) {

9
icu4c/source/test/cintltst/cldrtest.c
View File

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2006, International Business Machines Corporation and
* Copyright (c) 1997-2007, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@ -309,8 +309,11 @@ TestKeyInRootRecursive(UResourceBundle *root, const char *rootName,
subBundleKey,
ures_getKey(currentBundle),
locale);
} else if (strcmp(subBundleKey, "localPatternChars") == 0 &&
isICUVersionAtLeast(ICU_37)) {
} else if (strcmp(subBundleKey, "localPatternChars") == 0) {
/* Note: We no longer import localPatternChars data starting
* ICU 3.8. So it never comes into this else if block. (ticket#5597)
*/
/* Check well-formedness of localPatternChars. First, the
* length must match the number of fields defined by
* DateFormat. Second, each character in the string must

4
icu4c/source/test/cintltst/crestst.c
View File

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2006, International Business Machines Corporation and
* Copyright (c) 1997-2007, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/*******************************************************************************
@ -119,7 +119,7 @@ void TestAliasConflict(void) {
log_err("Failed to get resource with %s\n", myErrorName(status));
}
ures_close(iw);
result = ures_getStringByKey(he, "localPatternChars", &resultLen, &status);
result = ures_getStringByKey(he, "ExemplarCharacters", &resultLen, &status);
if(U_FAILURE(status) || result == NULL) {
log_err("Failed to get resource with %s\n", myErrorName(status));
}

6
icu4c/source/test/cintltst/creststn.c
View File

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2006, International Business Machines Corporation and
* Copyright (c) 1997-2007, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/*******************************************************************************
@ -341,9 +341,9 @@ static void TestAliasConflict(void) {
log_err("Failed to get resource with %s\n", myErrorName(status));
}
ures_close(iw);
result = ures_getStringByKey(he, "localPatternChars", &resultLen, &status);
result = ures_getStringByKey(he, "ExemplarCharacters", &resultLen, &status);
if(U_FAILURE(status) || result == NULL) {
log_err("Failed to get resource localPatternChars with %s\n", myErrorName(status));
log_err("Failed to get resource ExemplarCharacters with %s\n", myErrorName(status));
}
ures_close(he);

5
icu4c/source/test/intltest/caltest.cpp
View File

@ -1,6 +1,6 @@
/************************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2006, International Business Machines Corporation
* Copyright (c) 1997-2007, International Business Machines Corporation
* and others. All Rights Reserved.
************************************************************************/
@ -1288,8 +1288,11 @@ CalendarTest::TestDOW_LOCALandYEAR_WOY()
if (U_FAILURE(status)) { errln("Couldn't create GregorianCalendar"); return; }
SimpleDateFormat *sdf=new SimpleDateFormat(UnicodeString("YYYY'-W'ww-ee"), Locale::getGermany(), status);
if (U_FAILURE(status)) { errln("Couldn't create SimpleDateFormat"); return; }
// ICU no longer use localized date-time pattern characters by default (ticket#5597)
/*
sdf->applyLocalizedPattern(UnicodeString("JJJJ'-W'ww-ee"), status);
if (U_FAILURE(status)) { errln("Couldn't apply localized pattern"); return; }
*/
cal->clear();
cal->set(1997, UCAL_DECEMBER, 25);
doYEAR_WOYLoop(cal, sdf, times, status);

11
icu4c/source/test/intltest/dtfmttst.cpp
View File

@ -1,6 +1,6 @@
/********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2006, International Business Machines Corporation and
* Copyright (c) 1997-2007, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
@ -329,12 +329,9 @@ void DateFormatTest::TestFieldPosition() {
DateFormatSymbols rootSyms(Locale(""), ec);
assertSuccess("DateFormatSymbols", ec);
// local pattern chars not accurate when CLDR 1.4 data
// first introduced...
if(isICUVersionAtLeast(ICU_37)) {
assertEquals("patternChars", PATTERN_CHARS, rootSyms.getLocalPatternChars(buf));
}
// local pattern chars data is not longer loaded
// from icu locale bundle
assertEquals("patternChars", PATTERN_CHARS, rootSyms.getLocalPatternChars(buf));
assertEquals("patternChars", PATTERN_CHARS, DateFormatSymbols::getPatternUChars());
assertTrue("DATEFORMAT_FIELD_NAMES", DATEFORMAT_FIELD_NAMES_LENGTH == UDAT_FIELD_COUNT);
assertTrue("Data", UDAT_FIELD_COUNT == uprv_strlen(PATTERN_CHARS));