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

ICU-2948 Don't use deprecated Nynorsk data

Browse Source 
X-SVN-Rev: 14064
This commit is contained in:
George Rhoten 2003-12-09 23:02:16 +00:00
parent 9fbbf50223
commit bc0bd1a4b1
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
icu4c/source/data/locales/en.txt
View File

@ -1474,14 +1474,14 @@ en {
Types{ Types{
// variants for collation (traditional may also be used for traditional chinese) // variants for collation (traditional may also be used for traditional chinese)
collation{ collation{
phonebook { "Phonebook Order" } phonebook { "Phonebook Order" }
pinyin { "Pinyin Order" } pinyin { "Pinyin Order" }
traditional { "Traditional" } traditional { "Traditional" }
stroke { "Stroke Order" } stroke { "Stroke Order" }
direct { "Direct Order" } direct { "Direct Order" }
} }
calendar{ calendar{
traditional{ "Traditional Calendar" } traditional{ "Traditional Calendar" }
} }
} }
@ -1489,7 +1489,7 @@ en {
Variants{ Variants{
//PREEURO { "Pre-Euro" } // PREEURO variant display name //PREEURO { "Pre-Euro" } // PREEURO variant display name
EURO { "Euro" } // EURO variant display name EURO { "Euro" } // EURO variant display name
NY { "Nynorsk" } // Norwegian variant display name //NY { "Nynorsk" } // Norwegian variant display name
POSIX { "Posix" } POSIX { "Posix" }
} }

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

@ -68,10 +68,10 @@ static const char* rawData2[LOCALE_INFO_SIZE][LOCALE_SIZE] = {
/* display country (English) */ /* display country (English) */
{ "United States", "France", "Spain", "Greece", "Norway", "China", "Germany", "", "Japan" }, { "United States", "France", "Spain", "Greece", "Norway", "China", "Germany", "", "Japan" },
/* display variant (English) */ /* display variant (English) */
{ "", "", "", "", "Nynorsk", "", "", "", "" }, { "", "", "", "", "NY", "", "", "", "" },
/* display name (English) */ /* display name (English) */
{ "English (United States)", "French (France)", "Catalan (Spain)", { "English (United States)", "French (France)", "Catalan (Spain)",
"Greek (Greece)", "Norwegian (Norway, Nynorsk)", "Chinese (Simplified Han, China)", "Greek (Greece)", "Norwegian (Norway, NY)", "Chinese (Simplified Han, China)",
"German (Germany, Collation=Phonebook Order)", "Spanish (Collation=Traditional)", "Japanese (Japan, Calendar=JAPANESE)" }, "German (Germany, Collation=Phonebook Order)", "Spanish (Collation=Traditional)", "Japanese (Japan, Calendar=JAPANESE)" },
/* display language (French) */ /* display language (French) */