For PR libgcj/5031:

	* java/lang/natSystem.cc (init_properties): Use LC_MESSAGES to
	choose default locale.

From-SVN: r48664

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7fb1e54d508315c0edd4de414b6f4c31ea737d7e..aa91329b71248495f91538c24a30442062227a31 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,9 @@
 2002-01-08  Tom Tromey  <tromey@redhat.com>
 
+       For PR libgcj/5031:
+       * java/lang/natSystem.cc (init_properties): Use LC_MESSAGES to
+       choose default locale.
+
        * Makefile.in: Rebuilt.
        * Makefile.am (jv_convert_LDADD): Removed convert_source_files.
 

diff --git a/libjava/java/lang/natSystem.cc b/libjava/java/lang/natSystem.cc
index f970ee64de5ad71a5977ee275aba620a6bf9d0c7..8f06538d396158c9785631fc13fa270aa6393795 100644 (file)
--- a/libjava/java/lang/natSystem.cc
+++ b/libjava/java/lang/natSystem.cc
@@ -415,7 +415,12 @@ java::lang::System::init_properties (void)
 
   // Set user locale properties based on setlocale()
 #ifdef HAVE_SETLOCALE
-  char *locale = setlocale (LC_ALL, "");
+  // We let the user choose the locale.  However, since Java differs
+  // from POSIX, we arbitrarily pick LC_MESSAGES as determining the
+  // Java locale.  We can't use LC_ALL because it might return a full
+  // list of all the settings.
+  setlocale (LC_ALL, "");
+  char *locale = setlocale (LC_MESSAGES, "");
   if (locale && strlen (locale) >= 2)
     {
       char buf[3];