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

ICU-5247 fix incorrect escaping, timebomb localPatternChars test 'till CLDR data is corrected.

Browse Source 
X-SVN-Rev: 19776
This commit is contained in:
Eric Mader 2006-06-28 00:38:53 +00:00
parent 2c56554cbb
commit 02657fcc8b
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,12 @@
#include "locmap.h" #include "locmap.h"
#include "uresimp.h" #include "uresimp.h"
/*--------------------------------------------------------------------
Time bomb - allows temporary behavior that expires at a given
release
---------------------------------------------------------------------*/
static const UVersionInfo ICU_36 = {3,6,0,0};
/* /*
returns a new UnicodeSet that is a flattened form of the original returns a new UnicodeSet that is a flattened form of the original
UnicodeSet. UnicodeSet.
@ -303,7 +309,8 @@ TestKeyInRootRecursive(UResourceBundle *root, const char *rootName,
subBundleKey, subBundleKey,
ures_getKey(currentBundle), ures_getKey(currentBundle),
locale); locale);
} else if (strcmp(subBundleKey, "localPatternChars") == 0) { } else if (strcmp(subBundleKey, "localPatternChars") == 0 &&
isICUVersionAtLeast(ICU_36)) {
/* Check well-formedness of localPatternChars. First, the /* Check well-formedness of localPatternChars. First, the
* length must match the number of fields defined by * length must match the number of fields defined by
* DateFormat. Second, each character in the string must * DateFormat. Second, each character in the string must

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

@ -84,14 +84,14 @@ static const char* rawData2[LOCALE_INFO_SIZE][LOCALE_SIZE] = {
/* display language (French) */ /* display language (French) */
{ "anglais", "fran\\u00E7ais", "catalan", "grec", "norv\\u00E9gien", "chinois", "allemand", "espagnol", "japonais" }, { "anglais", "fran\\u00E7ais", "catalan", "grec", "norv\\u00E9gien", "chinois", "allemand", "espagnol", "japonais" },
/* display script code (French) */ /* display script code (French) */
{ "", "", "", "", "", "id\u00e9ogrammes han (variante simplifi\u00e9e)", "", "", "" }, { "", "", "", "", "", "id\\u00e9ogrammes han (variante simplifi\\u00e9e)", "", "", "" },
/* display country (French) */ /* display country (French) */
{ "\\u00C9tats-Unis", "France", "Espagne", "Gr\\u00E8ce", "Norv\\u00E8ge", "Chine", "Allemagne", "", "Japon" }, { "\\u00C9tats-Unis", "France", "Espagne", "Gr\\u00E8ce", "Norv\\u00E8ge", "Chine", "Allemagne", "", "Japon" },
/* display variant (French) */ /* display variant (French) */
{ "", "", "", "", "NY", "", "", "", "" }, { "", "", "", "", "NY", "", "", "", "" },
/* display name (French) */ /* display name (French) */
{ "anglais (\\u00C9tats-Unis)", "fran\\u00E7ais (France)", "catalan (Espagne)", { "anglais (\\u00C9tats-Unis)", "fran\\u00E7ais (France)", "catalan (Espagne)",
"grec (Gr\\u00E8ce)", "norv\\u00E9gien (Norv\\u00E8ge, NY)", "chinois (id\u00e9ogrammes han (variante simplifi\u00e9e), Chine)", "grec (Gr\\u00E8ce)", "norv\\u00E9gien (Norv\\u00E8ge, NY)", "chinois (id\\u00e9ogrammes han (variante simplifi\\u00e9e), Chine)",
"allemand (Allemagne, Ordonnancement=Ordre de l\\u2019annuaire)", "espagnol (Ordonnancement=Ordre traditionnel)", "japonais (Japon, Calendrier=Calendrier japonais)" }, "allemand (Allemagne, Ordonnancement=Ordre de l\\u2019annuaire)", "espagnol (Ordonnancement=Ordre traditionnel)", "japonais (Japon, Calendrier=Calendrier japonais)" },
/* display language (Catalan) */ /* display language (Catalan) */