natSystem.cc (init_properties): Set user.language and user.region.
2000-11-29 Bryce McKinlay <bryce@albatross.co.nz> * java/lang/natSystem.cc (init_properties): Set user.language and user.region. * configure.in: Check for setlocale. * configure: Rebuilt. * include/config.h.in: Rebuilt. From-SVN: r37842
This commit is contained in:
parent
56f8f4fb75
commit
5662d5333a
|
@ -1,3 +1,11 @@
|
||||||
|
2000-11-29 Bryce McKinlay <bryce@albatross.co.nz>
|
||||||
|
|
||||||
|
* java/lang/natSystem.cc (init_properties): Set user.language and
|
||||||
|
user.region.
|
||||||
|
* configure.in: Check for setlocale.
|
||||||
|
* configure: Rebuilt.
|
||||||
|
* include/config.h.in: Rebuilt.
|
||||||
|
|
||||||
2000-11-28 Warren Levy <warrenl@cygnus.com>
|
2000-11-28 Warren Levy <warrenl@cygnus.com>
|
||||||
|
|
||||||
* java/text/DateFormatSymbols.java (zoneStringsDefault): Added
|
* java/text/DateFormatSymbols.java (zoneStringsDefault): Added
|
||||||
|
@ -5,7 +13,7 @@
|
||||||
* java/text/SimpleDateFormat.java (format): Added case for
|
* java/text/SimpleDateFormat.java (format): Added case for
|
||||||
TIMEZONE_FIELD.
|
TIMEZONE_FIELD.
|
||||||
|
|
||||||
2000-11-28 Bryce McKinlay <bryce@abatross.co.nz>
|
2000-11-28 Bryce McKinlay <bryce@albatross.co.nz>
|
||||||
|
|
||||||
* java/io/DataInputStream.java: Merge classpath docs. Call in.read()
|
* java/io/DataInputStream.java: Merge classpath docs. Call in.read()
|
||||||
directly rather than read() in all cases. Make primitive read
|
directly rather than read() in all cases. Make primitive read
|
||||||
|
|
|
@ -3398,7 +3398,7 @@ else
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
for ac_func in iconv nl_langinfo
|
for ac_func in iconv nl_langinfo setlocale
|
||||||
do
|
do
|
||||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||||
echo "configure:3405: checking for $ac_func" >&5
|
echo "configure:3405: checking for $ac_func" >&5
|
||||||
|
|
|
@ -405,7 +405,7 @@ else
|
||||||
AC_CHECK_FUNCS(strerror ioctl select fstat open fsync sleep)
|
AC_CHECK_FUNCS(strerror ioctl select fstat open fsync sleep)
|
||||||
AC_CHECK_FUNCS(gmtime_r localtime_r readdir_r getpwuid_r getcwd)
|
AC_CHECK_FUNCS(gmtime_r localtime_r readdir_r getpwuid_r getcwd)
|
||||||
AC_CHECK_FUNCS(access stat mkdir rename rmdir unlink realpath)
|
AC_CHECK_FUNCS(access stat mkdir rename rmdir unlink realpath)
|
||||||
AC_CHECK_FUNCS(iconv nl_langinfo)
|
AC_CHECK_FUNCS(iconv nl_langinfo setlocale)
|
||||||
AC_CHECK_FUNCS(inet_aton inet_addr, break)
|
AC_CHECK_FUNCS(inet_aton inet_addr, break)
|
||||||
AC_CHECK_FUNCS(inet_pton uname inet_ntoa)
|
AC_CHECK_FUNCS(inet_pton uname inet_ntoa)
|
||||||
AC_CHECK_FUNCS(backtrace fork execvp pipe)
|
AC_CHECK_FUNCS(backtrace fork execvp pipe)
|
||||||
|
|
|
@ -25,6 +25,9 @@
|
||||||
/* Define if you have the ANSI C header files. */
|
/* Define if you have the ANSI C header files. */
|
||||||
#undef STDC_HEADERS
|
#undef STDC_HEADERS
|
||||||
|
|
||||||
|
/* Define if the X Window System is missing or not being used. */
|
||||||
|
#undef X_DISPLAY_MISSING
|
||||||
|
|
||||||
/* Define this if you want runtime debugging enabled. */
|
/* Define this if you want runtime debugging enabled. */
|
||||||
#undef DEBUG
|
#undef DEBUG
|
||||||
|
|
||||||
|
@ -263,6 +266,9 @@
|
||||||
/* Define if you have the select function. */
|
/* Define if you have the select function. */
|
||||||
#undef HAVE_SELECT
|
#undef HAVE_SELECT
|
||||||
|
|
||||||
|
/* Define if you have the setlocale function. */
|
||||||
|
#undef HAVE_SETLOCALE
|
||||||
|
|
||||||
/* Define if you have the sleep function. */
|
/* Define if you have the sleep function. */
|
||||||
#undef HAVE_SLEEP
|
#undef HAVE_SLEEP
|
||||||
|
|
||||||
|
|
|
@ -339,6 +339,31 @@ java::lang::System::init_properties (void)
|
||||||
#endif /* HAVE_UNISTD_H */
|
#endif /* HAVE_UNISTD_H */
|
||||||
#endif /* HAVE_GETCWD */
|
#endif /* HAVE_GETCWD */
|
||||||
|
|
||||||
|
// Set user locale properties based on setlocale()
|
||||||
|
#ifdef HAVE_SETLOCALE
|
||||||
|
char *locale = setlocale (LC_ALL, "");
|
||||||
|
if (locale && strlen (locale) >= 2)
|
||||||
|
{
|
||||||
|
char buf[3];
|
||||||
|
buf[2] = '\0';
|
||||||
|
// copy the first two chars to user.language
|
||||||
|
strncpy (buf, locale, 2);
|
||||||
|
SET ("user.language", buf);
|
||||||
|
// if the next char is a '_', copy the two after that to user.region
|
||||||
|
locale += 2;
|
||||||
|
if (locale[0] == '_')
|
||||||
|
{
|
||||||
|
locale++;
|
||||||
|
strncpy (buf, locale, 2);
|
||||||
|
SET ("user.region", buf);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
#endif /* HAVE_SETLOCALE */
|
||||||
|
{
|
||||||
|
SET ("user.language", "en");
|
||||||
|
}
|
||||||
|
|
||||||
// Set some properties according to whatever was compiled in with
|
// Set some properties according to whatever was compiled in with
|
||||||
// `-D'.
|
// `-D'.
|
||||||
for (int i = 0; _Jv_Compiler_Properties[i]; ++i)
|
for (int i = 0; _Jv_Compiler_Properties[i]; ++i)
|
||||||
|
@ -382,7 +407,7 @@ java::lang::System::init_properties (void)
|
||||||
sb->append ((jchar) ';');
|
sb->append ((jchar) ';');
|
||||||
#else
|
#else
|
||||||
sb->append ((jchar) ':');
|
sb->append ((jchar) ':');
|
||||||
#endif;
|
#endif
|
||||||
}
|
}
|
||||||
if (cp != NULL)
|
if (cp != NULL)
|
||||||
sb->append (cp);
|
sb->append (cp);
|
||||||
|
|
Loading…
Reference in New Issue