PlaneteCasio
/
libc
1
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

* nlsfuncs.cc (__set_charset_from_locale): Set default locale for 

"uz_UZ" locale to ISO-8859-1, with the "@cyrillic" modifier to UTF-8.
This commit is contained in:
Corinna Vinschen 2010-02-05 21:35:34 +00:00
parent 837dda8652
commit 207889c9a7
2 changed files with 8 additions and 2 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-05 Corinna Vinschen <corinna@vinschen.de>
* nlsfuncs.cc (__set_charset_from_locale): Set default locale for
"uz_UZ" locale to ISO-8859-1, with the "@cyrillic" modifier to UTF-8.
2010-02-05 Christopher Faylor <me+cygwin@cgf.cx>
* dll_init.cc (per_module::run_dtors): Use consistent method for

5
winsup/cygwin/nlsfuncs.cc
View File

@ -861,9 +861,10 @@ __set_charset_from_locale (const char *locale, char *charset)
cs = has_modifier ("@euro") ? "ISO-8859-15" : "ISO-8859-7";
break;
case 1254:
if (lcid == 0x042c /* az_AZ (Azeri/Azerbaijan) */
|| lcid == 0x0443) /* uz_UZ (Uzbek/Uzbekistan) */
if (lcid == 0x042c) /* az_AZ (Azeri/Azerbaijan) */
cs = "UTF-8";
else if (lcid == 0x0443) /* uz_UZ (Uzbek/Uzbekistan) */
cs = has_modifier ("@cyrillic") ? "UTF-8" : "ISO-8859-1";
else
cs = has_modifier ("@euro") ? "ISO-8859-15" : "ISO-8859-9";
break;