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

	"ka_GE" locale to GEORGIAN-PS, for "kk_KZ" to PT154.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 95cf5451267f30f37ed0e88762c4c8cb5dd756ed..ddcfd6313a7e0496a51bb980c90132c01fee56e5 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-06  Corinna Vinschen  <corinna@vinschen.de>
+
+       * nlsfuncs.cc (__set_charset_from_locale): Set default charset for
+       "ka_GE" locale to GEORGIAN-PS, for "kk_KZ" to PT154.
+
 2010-02-06  Corinna Vinschen  <corinna@vinschen.de>
 
        * path.cc (symlink_info::check_nfs_symlink): Reopen file with
@@ -18,7 +23,7 @@
 
 2010-02-05  Corinna Vinschen  <corinna@vinschen.de>
 
-       * nlsfuncs.cc (__set_charset_from_locale): Set default locale for
+       * nlsfuncs.cc (__set_charset_from_locale): Set default charset for
        "uz_UZ" locale to ISO-8859-1, with the "@cyrillic" modifier to UTF-8.
 
 2010-02-05  Christopher Faylor  <me+cygwin@cgf.cx>

diff --git a/winsup/cygwin/nlsfuncs.cc b/winsup/cygwin/nlsfuncs.cc
index 245839cb9383e7d85f7da4614103536738b75eb4..500f9b70f746b5dda1830fdfb3f16e0cad2d07c6 100644 (file)
--- a/winsup/cygwin/nlsfuncs.cc
+++ b/winsup/cygwin/nlsfuncs.cc
@@ -891,6 +891,10 @@ __set_charset_from_locale (const char *locale, char *charset)
        cs = "ISO-8859-13";
       else if (lcid == 0x043a)         /* mt_MT (Maltese/Malta) */
        cs = "ISO-8859-3";
+      else if (lcid == 0x0437)         /* ka_GE (Georgian/Georgia) */
+       cs = "GEORGIAN-PS";
+      else if (lcid == 0x043f)         /* kk_KZ (Kazakh/Kazakhstan) */
+       cs = "PT154";
       else
        cs = "UTF-8";
       break;