JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* nlsfuncs.cc (__get_lcid_from_locale): Handle no_NO as nb_NO, rather

Browse Source 
than nn_NO.
This commit is contained in:
Corinna Vinschen 2010-02-06 21:57:33 +00:00
parent 573df59cd4
commit 689109a76f
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2010-02-06 Corinna Vinschen <corinna@vinschen.de>
* nlsfuncs.cc (__get_lcid_from_locale): Handle no_NO as nb_NO, rather
than nn_NO.
2010-02-06 Corinna Vinschen <corinna@vinschen.de> 2010-02-06 Corinna Vinschen <corinna@vinschen.de>
* nlsfuncs.cc (has_modifier): MOve up in file to use in * nlsfuncs.cc (has_modifier): MOve up in file to use in

10
winsup/cygwin/nlsfuncs.cc
View File

@ -94,8 +94,7 @@ __get_lcid_from_locale (const char *name)
{ {
/* Unfortunately there are a couple of locales for which no form /* Unfortunately there are a couple of locales for which no form
without a Script part per RFC 4646 exists. without a Script part per RFC 4646 exists.
Linux also supports the no_NO locale which is equivalent to Linux also supports no_NO which is equivalent to nb_NO. */
nn_NO. */
struct { struct {
const char *loc; const char *loc;
const wchar_t *wloc; const wchar_t *wloc;
@ -105,7 +104,7 @@ __get_lcid_from_locale (const char *name)
{ "ha-NG" , L"ha-Latn-NG" }, { "ha-NG" , L"ha-Latn-NG" },
{ "iu-CA" , L"iu-Cans-CA" }, { "iu-CA" , L"iu-Cans-CA" },
{ "mn-CN" , L"mn-Mong-CN" }, { "mn-CN" , L"mn-Mong-CN" },
{ "no-NO" , L"nn-NO" }, { "no-NO" , L"nb-NO" },
{ "sr-BA" , L"sr-Cyrl-BA" }, { "sr-BA" , L"sr-Cyrl-BA" },
{ "sr-CS" , L"sr-Cyrl-CS" }, { "sr-CS" , L"sr-Cyrl-CS" },
{ "sr-ME" , L"sr-Cyrl-ME" }, { "sr-ME" , L"sr-Cyrl-ME" },
@ -181,14 +180,15 @@ __get_lcid_from_locale (const char *name)
This also enables the serbian ISO 3166 territory codes which have This also enables the serbian ISO 3166 territory codes which have
been changed post 2003, and maps them to the old wrong (SP was never been changed post 2003, and maps them to the old wrong (SP was never
a valid ISO 3166 code) territory code sr_SP which fortunately has the a valid ISO 3166 code) territory code sr_SP which fortunately has the
same LCID as the newer sr_CS. */ same LCID as the newer sr_CS.
Linux also supports no_NO which is equivalent to nb_NO. */
struct { struct {
const char *loc; const char *loc;
LCID lcid; LCID lcid;
} ambiguous_locale[] = { } ambiguous_locale[] = {
{ "bs_BA", MAKELANGID (LANG_BOSNIAN, 0x05) }, { "bs_BA", MAKELANGID (LANG_BOSNIAN, 0x05) },
{ "nn_NO", MAKELANGID (LANG_NORWEGIAN, SUBLANG_NORWEGIAN_NYNORSK) }, { "nn_NO", MAKELANGID (LANG_NORWEGIAN, SUBLANG_NORWEGIAN_NYNORSK) },
{ "no_NO", MAKELANGID (LANG_NORWEGIAN, SUBLANG_NORWEGIAN_NYNORSK) }, { "no_NO", MAKELANGID (LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL) },
{ "sr_BA", MAKELANGID (LANG_BOSNIAN, { "sr_BA", MAKELANGID (LANG_BOSNIAN,
SUBLANG_SERBIAN_BOSNIA_HERZEGOVINA_CYRILLIC) }, SUBLANG_SERBIAN_BOSNIA_HERZEGOVINA_CYRILLIC) },
{ "sr_CS", MAKELANGID (LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC) }, { "sr_CS", MAKELANGID (LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC) },