Look at env vars LC_ALL, LC_CTYPE and LANG first. Some refinements to the

1999-11-08  Tor Lillqvist  <tml@iki.fi>

* gwin32.c (g_win32_getlocale): Look at env vars LC_ALL, LC_CTYPE
and LANG first. Some refinements to the sublanguage logic.

diff --git a/ChangeLog b/ChangeLog
index 57e8c92..167e969 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-11-08  Tor Lillqvist  <tml@iki.fi>
+
+       * gwin32.c (g_win32_getlocale): Look at env vars LC_ALL, LC_CTYPE
+       and LANG first. Some refinements to the sublanguage logic.
+
 1999-11-04  Tor Lillqvist  <tml@iki.fi>
 
        * makefile.{cygwin,msc}.in: Add gwin32 object. Add rule to make .i

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 57e8c92..167e969 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+1999-11-08  Tor Lillqvist  <tml@iki.fi>
+
+       * gwin32.c (g_win32_getlocale): Look at env vars LC_ALL, LC_CTYPE
+       and LANG first. Some refinements to the sublanguage logic.
+
 1999-11-04  Tor Lillqvist  <tml@iki.fi>
 
        * makefile.{cygwin,msc}.in: Add gwin32 object. Add rule to make .i

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 57e8c92..167e969 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+1999-11-08  Tor Lillqvist  <tml@iki.fi>
+
+       * gwin32.c (g_win32_getlocale): Look at env vars LC_ALL, LC_CTYPE
+       and LANG first. Some refinements to the sublanguage logic.
+
 1999-11-04  Tor Lillqvist  <tml@iki.fi>
 
        * makefile.{cygwin,msc}.in: Add gwin32 object. Add rule to make .i

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 57e8c92..167e969 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+1999-11-08  Tor Lillqvist  <tml@iki.fi>
+
+       * gwin32.c (g_win32_getlocale): Look at env vars LC_ALL, LC_CTYPE
+       and LANG first. Some refinements to the sublanguage logic.
+
 1999-11-04  Tor Lillqvist  <tml@iki.fi>
 
        * makefile.{cygwin,msc}.in: Add gwin32 object. Add rule to make .i

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 57e8c92..167e969 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+1999-11-08  Tor Lillqvist  <tml@iki.fi>
+
+       * gwin32.c (g_win32_getlocale): Look at env vars LC_ALL, LC_CTYPE
+       and LANG first. Some refinements to the sublanguage logic.
+
 1999-11-04  Tor Lillqvist  <tml@iki.fi>
 
        * makefile.{cygwin,msc}.in: Add gwin32 object. Add rule to make .i

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 57e8c92..167e969 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+1999-11-08  Tor Lillqvist  <tml@iki.fi>
+
+       * gwin32.c (g_win32_getlocale): Look at env vars LC_ALL, LC_CTYPE
+       and LANG first. Some refinements to the sublanguage logic.
+
 1999-11-04  Tor Lillqvist  <tml@iki.fi>
 
        * makefile.{cygwin,msc}.in: Add gwin32 object. Add rule to make .i

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 57e8c92..167e969 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+1999-11-08  Tor Lillqvist  <tml@iki.fi>
+
+       * gwin32.c (g_win32_getlocale): Look at env vars LC_ALL, LC_CTYPE
+       and LANG first. Some refinements to the sublanguage logic.
+
 1999-11-04  Tor Lillqvist  <tml@iki.fi>
 
        * makefile.{cygwin,msc}.in: Add gwin32 object. Add rule to make .i

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 57e8c92..167e969 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+1999-11-08  Tor Lillqvist  <tml@iki.fi>
+
+       * gwin32.c (g_win32_getlocale): Look at env vars LC_ALL, LC_CTYPE
+       and LANG first. Some refinements to the sublanguage logic.
+
 1999-11-04  Tor Lillqvist  <tml@iki.fi>
 
        * makefile.{cygwin,msc}.in: Add gwin32 object. Add rule to make .i

diff --git a/glib/gwin32.c b/glib/gwin32.c
index eb13759..82f10d4 100644 (file)
--- a/glib/gwin32.c
+++ b/glib/gwin32.c
@@ -525,11 +525,18 @@ g_win32_closedir (DIR *dir)
 gchar *
 g_win32_getlocale (void)
 {
-  LCID lcid = GetThreadLocale ();
+  LCID lcid;
+  gchar *ev;
   gint primary, sub;
   gchar *l = NULL, *sl = NULL;
   gchar bfr[20];
 
+  if ((ev = getenv ("LC_ALL")) != NULL
+      || (ev = getenv ("LC_CTYPE")) != NULL
+      || (ev = getenv ("LANG")) != NULL)
+    return g_strdup (ev);
+
+  lcid = GetThreadLocale ();
   primary = PRIMARYLANGID (LANGIDFROMLCID (lcid));
   sub = SUBLANGID (LANGIDFROMLCID (lcid));
   switch (primary)
@@ -605,7 +612,10 @@ g_win32_getlocale (void)
       l = "en";
       switch (sub)
        {
-       case SUBLANG_ENGLISH_US: sl = "US"; break;
+       /* SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. Heh. I thought
+        * English was the language spoken in England.
+        * Oh well.
+        */
        case SUBLANG_ENGLISH_UK: sl = "GB"; break;
        case SUBLANG_ENGLISH_AUS: sl = "AU"; break;
        case SUBLANG_ENGLISH_CAN: sl = "CA"; break;
@@ -679,7 +689,6 @@ g_win32_getlocale (void)
       l = "ms";
       switch (sub)
        {
-       case SUBLANG_MALAY_MALAYSIA: sl = "MY"; break;
        case SUBLANG_MALAY_BRUNEI_DARUSSALAM: sl = "BN"; break;
        }
       break;
@@ -697,7 +706,7 @@ g_win32_getlocale (void)
       l = "no";
       switch (sub)
        {
-       case SUBLANG_NORWEGIAN_BOKMAL: sl = "@bokmal"; break;
+       /* SUBLANG_NORWEGIAN_BOKMAL == SUBLANG_DEFAULT */
        case SUBLANG_NORWEGIAN_NYNORSK: sl = "@nynorsk"; break;
        }
       break;
@@ -707,6 +716,7 @@ g_win32_getlocale (void)
       l = "pt";
       switch (sub)
        {
+       /* Hmm. SUBLANG_PORTUGUESE_BRAZILIAN == SUBLANG_DEFAULT */
        case SUBLANG_PORTUGUESE_BRAZILIAN: sl = "BR"; break;
        }
       break;
@@ -768,7 +778,6 @@ g_win32_getlocale (void)
       l = "uz";
       switch (sub)
        {
-       case SUBLANG_UZBEK_LATIN: sl = "2latin"; break;
        case SUBLANG_UZBEK_CYRILLIC: sl = "@cyrillic"; break;
        }
       break;

diff --git a/gwin32.c b/gwin32.c
index eb13759..82f10d4 100644 (file)
--- a/gwin32.c
+++ b/gwin32.c
@@ -525,11 +525,18 @@ g_win32_closedir (DIR *dir)
 gchar *
 g_win32_getlocale (void)
 {
-  LCID lcid = GetThreadLocale ();
+  LCID lcid;
+  gchar *ev;
   gint primary, sub;
   gchar *l = NULL, *sl = NULL;
   gchar bfr[20];
 
+  if ((ev = getenv ("LC_ALL")) != NULL
+      || (ev = getenv ("LC_CTYPE")) != NULL
+      || (ev = getenv ("LANG")) != NULL)
+    return g_strdup (ev);
+
+  lcid = GetThreadLocale ();
   primary = PRIMARYLANGID (LANGIDFROMLCID (lcid));
   sub = SUBLANGID (LANGIDFROMLCID (lcid));
   switch (primary)
@@ -605,7 +612,10 @@ g_win32_getlocale (void)
       l = "en";
       switch (sub)
        {
-       case SUBLANG_ENGLISH_US: sl = "US"; break;
+       /* SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. Heh. I thought
+        * English was the language spoken in England.
+        * Oh well.
+        */
        case SUBLANG_ENGLISH_UK: sl = "GB"; break;
        case SUBLANG_ENGLISH_AUS: sl = "AU"; break;
        case SUBLANG_ENGLISH_CAN: sl = "CA"; break;
@@ -679,7 +689,6 @@ g_win32_getlocale (void)
       l = "ms";
       switch (sub)
        {
-       case SUBLANG_MALAY_MALAYSIA: sl = "MY"; break;
        case SUBLANG_MALAY_BRUNEI_DARUSSALAM: sl = "BN"; break;
        }
       break;
@@ -697,7 +706,7 @@ g_win32_getlocale (void)
       l = "no";
       switch (sub)
        {
-       case SUBLANG_NORWEGIAN_BOKMAL: sl = "@bokmal"; break;
+       /* SUBLANG_NORWEGIAN_BOKMAL == SUBLANG_DEFAULT */
        case SUBLANG_NORWEGIAN_NYNORSK: sl = "@nynorsk"; break;
        }
       break;
@@ -707,6 +716,7 @@ g_win32_getlocale (void)
       l = "pt";
       switch (sub)
        {
+       /* Hmm. SUBLANG_PORTUGUESE_BRAZILIAN == SUBLANG_DEFAULT */
        case SUBLANG_PORTUGUESE_BRAZILIAN: sl = "BR"; break;
        }
       break;
@@ -768,7 +778,6 @@ g_win32_getlocale (void)
       l = "uz";
       switch (sub)
        {
-       case SUBLANG_UZBEK_LATIN: sl = "2latin"; break;
        case SUBLANG_UZBEK_CYRILLIC: sl = "@cyrillic"; break;
        }
       break;