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

* nlsfuncs.cc (__get_lcid_from_locale): Handle "@cyrillic" modifier

Browse Source 
for uz_UZ locale here.
	(__set_charset_from_locale): Accommodate above change.
This commit is contained in:
Corinna Vinschen
2010-02-07 17:35:59 +00:00
parent db2e119fe6
commit ab6ef08082
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@@ -1,3 +1,9 @@
2010-02-07 Corinna Vinschen <corinna@vinschen.de>
* nlsfuncs.cc (__get_lcid_from_locale): Handle "@cyrillic" modifier
for uz_UZ locale here.
(__set_charset_from_locale): Accommodate above change.
2010-02-07 Corinna Vinschen <corinna@vinschen.de> 2010-02-07 Corinna Vinschen <corinna@vinschen.de>
* nlsfuncs.cc (__set_locale_from_locale_alias): New function to read * nlsfuncs.cc (__set_locale_from_locale_alias): New function to read

19
winsup/cygwin/nlsfuncs.cc
View File

@@ -132,6 +132,12 @@ __get_lcid_from_locale (const char *name)
if (lcid != 0 && has_modifier ("@latin")) if (lcid != 0 && has_modifier ("@latin"))
lcid = MAKELANGID (lcid & 0x3ff, (lcid >> 10) - 1); lcid = MAKELANGID (lcid & 0x3ff, (lcid >> 10) - 1);
} }
else if (!strncmp (locale, "uz-", 3))
{
/* Equivalent for "@cyrillic" modifier in uz_UZ locale */
if (lcid != 0 && has_modifier ("@cyrillic"))
lcid = MAKELANGID (lcid & 0x3ff, (lcid >> 10) + 1);
}
break; break;
} }
} }
@@ -214,6 +220,12 @@ __get_lcid_from_locale (const char *name)
break; break;
} }
} }
else if (lcid == 0x0443) /* uz_UZ (Uzbek/Uzbekistan) */
{
/* Equivalent for "@cyrillic" modifier in uz_UZ locale */
if (lcid != 0 && has_modifier ("@cyrillic"))
lcid = MAKELANGID (lcid & 0x3ff, (lcid >> 10) + 1);
}
last_lcid = lcid ?: (LCID) -1; last_lcid = lcid ?: (LCID) -1;
debug_printf ("LCID=0x%04x", last_lcid); debug_printf ("LCID=0x%04x", last_lcid);
return last_lcid; return last_lcid;
@@ -844,10 +856,11 @@ __set_charset_from_locale (const char *locale, char *charset)
|| lcid == 0x281a /* sr_RS (Serbian Language/Serbia) */ || lcid == 0x281a /* sr_RS (Serbian Language/Serbia) */
|| lcid == 0x301a /* sr_ME (Serbian Language/Montenegro)*/ || lcid == 0x301a /* sr_ME (Serbian Language/Montenegro)*/
|| lcid == 0x0440 /* ky_KG (Kyrgyz/Kyrgyzstan) */ || lcid == 0x0440 /* ky_KG (Kyrgyz/Kyrgyzstan) */
|| lcid == 0x0450 /* mn_MN (Mongolian/Mongolia) */ || lcid == 0x0843 /* uz_UZ (Uzbek/Uzbekistan) */
/* tt_RU (Tatar/Russia), /* tt_RU (Tatar/Russia),
IQTElif alphabet */ IQTElif alphabet */
|| (lcid == 0x0444 && has_modifier ("@iqtelif"))) || (lcid == 0x0444 && has_modifier ("@iqtelif"))
|| lcid == 0x0450) /* mn_MN (Mongolian/Mongolia) */
cs = "UTF-8"; cs = "UTF-8";
else if (lcid == 0x0423) /* be_BY (Belarusian/Belarus) */ else if (lcid == 0x0423) /* be_BY (Belarusian/Belarus) */
cs = has_modifier ("@latin") ? "UTF-8" : "CP1251"; cs = has_modifier ("@latin") ? "UTF-8" : "CP1251";
@@ -888,7 +901,7 @@ __set_charset_from_locale (const char *locale, char *charset)
if (lcid == 0x042c) /* az_AZ (Azeri/Azerbaijan) */ if (lcid == 0x042c) /* az_AZ (Azeri/Azerbaijan) */
cs = "UTF-8"; cs = "UTF-8";
else if (lcid == 0x0443) /* uz_UZ (Uzbek/Uzbekistan) */ else if (lcid == 0x0443) /* uz_UZ (Uzbek/Uzbekistan) */
cs = has_modifier ("@cyrillic") ? "UTF-8" : "ISO-8859-1"; cs = "ISO-8859-1";
else else
cs = "ISO-8859-9"; cs = "ISO-8859-9";
break; break;