diff options
author | Corinna Vinschen <corinna@vinschen.de> | 2010-02-10 13:44:21 +0300 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2010-02-10 13:44:21 +0300 |
commit | ae40237a0a3fd8b4c001065c5f7ae5b749d9a3fa (patch) | |
tree | 60992c485fa0b6c921a96f2d13b849688404067a /winsup/cygwin/nlsfuncs.cc | |
parent | 3700578ee8a4d7f56184a8a742067a2bdcb71360 (diff) |
* nlsfuncs.cc (__get_lcid_from_locale): Convert iu_CA to iu-Latn-CA
rather than iu-Cans-CA on Vista and later.
(__set_charset_from_locale): Set default charset for iu_CA to UTF-8.
Diffstat (limited to 'winsup/cygwin/nlsfuncs.cc')
-rw-r--r-- | winsup/cygwin/nlsfuncs.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/winsup/cygwin/nlsfuncs.cc b/winsup/cygwin/nlsfuncs.cc index d7bf0eaf0..c351c9de1 100644 --- a/winsup/cygwin/nlsfuncs.cc +++ b/winsup/cygwin/nlsfuncs.cc @@ -101,7 +101,7 @@ __get_lcid_from_locale (const char *name) { "az-AZ" , L"az-Latn-AZ" }, { "bs-BA" , L"bs-Latn-BA" }, { "ha-NG" , L"ha-Latn-NG" }, - { "iu-CA" , L"iu-Cans-CA" }, + { "iu-CA" , L"iu-Latn-CA" }, { "mn-CN" , L"mn-Mong-CN" }, { "no-NO" , L"nb-NO" }, { "sr-BA" , L"sr-Cyrl-BA" }, @@ -961,7 +961,8 @@ __set_charset_from_locale (const char *locale, char *charset) || lcid == 0x043b /* se_NO (Northern Saami/Norway) */ || lcid == 0x0432 /* tn_ZA (Tswana/South Africa) */ || lcid == 0x0488 /* wo_SN (Wolof/Senegal) */ - || lcid == 0x046a) /* yo_NG (Yoruba/Nigeria) */ + || lcid == 0x046a /* yo_NG (Yoruba/Nigeria) */ + || lcid == 0x085d) /* iu_CA (Inuktitut/Canada) */ cs = "UTF-8"; else if (lcid == 0x042e) /* hsb_DE (Upper Sorbian/Germany) */ cs = "ISO-8859-2"; |