check for bind_textdomain_codeset, use standard HAVE_FOO semantic for

2001-08-30  Sven Neumann  <sven@gimp.org>

	* configure.in: check for bind_textdomain_codeset, use standard
	HAVE_FOO semantic for difftime.

	* libgimp/gimpintl.h
	* libgimp/libgimp-intl.h
	* libgimp/stdplugins-intl.h: set encoding of message translations
	to UTF-8 if bind_textdomain_codeset() is available. We still
	explicitely set LC_NUMERIC to "C" so we can write and parse floats
	in a defined way independent of the locale. We might want to find
	a cleaner solution for this.

	* plug-ins/script-fu/script-fu-server.c: inverted preprocessor logic
	from NO_DIFFTIME to HAVE_DIFFTIME.

	* plug-ins/script-fu/scripts/trochoid.scm:
	fixed parameter description (bug #59760).

ChangeLog

@@ -1,3 +1,22 @@
+2001-08-30  Sven Neumann  <sven@gimp.org>
+
+	* configure.in: check for bind_textdomain_codeset, use standard 
+	HAVE_FOO semantic for difftime.
+
+	* libgimp/gimpintl.h
+	* libgimp/libgimp-intl.h
+	* libgimp/stdplugins-intl.h: set encoding of message translations
+	to UTF-8 if bind_textdomain_codeset() is available. We still 
+	explicitely set LC_NUMERIC to "C" so we can write and parse floats 
+	in a defined way independent of the locale. We might want to find 
+	a cleaner solution for this.
+	
+	* plug-ins/script-fu/script-fu-server.c: inverted preprocessor logic
+	from NO_DIFFTIME to HAVE_DIFFTIME.
+	
+	* plug-ins/script-fu/scripts/trochoid.scm: 
+	fixed parameter description (bug #59760).
+
 2001-08-29  Sven Neumann  <sven@gimp.org>
 
 	* README.i18n: added a section that mentions the GNOME translation

configure.in

@@ -492,20 +492,14 @@ AC_CHECK_FUNC(random, [
       [AC_DEFINE(RAND_FUNC, lrand48) AC_DEFINE(SRAND_FUNC, srand48)],
       [AC_DEFINE(RAND_FUNC, rand) AC_DEFINE(SRAND_FUNC, srand)])])])
 
-dnl check for difftime
+dnl check some more funcs
-AC_CHECK_FUNC(difftime, , AC_DEFINE(NO_DIFFTIME))
+AC_CHECK_FUNCS(difftime putenv mmap bind_textdomain_codeset)
-
-dnl check for putenv (because %#@&% NeXTStep doesn't have it)
-AC_CHECK_FUNC(putenv, AC_DEFINE(HAVE_PUTENV))
 
 dnl check for rint
 AC_CHECK_FUNC(rint, AC_DEFINE(HAVE_RINT), [
   AC_CHECK_LIB(m, rint, [
     AC_DEFINE(HAVE_RINT)])])
 
-dnl check for mmap
-AC_CHECK_FUNCS(mmap)
-
 dnl check for inline
 AC_MSG_CHECKING([for inline definition in glibconfig.h])
 AC_EGREP_CPP(glib_defines_inline,

libgimp/gimpintl.h

@@ -56,10 +56,15 @@
 #    define N_(String) (String)
 #endif
 
+#ifndef HAVE_BIND_TEXTDOMAIN_CODESET
+#    define bind_textdomain_codeset(Domain, Codeset) (Domain)
+#endif
+
 #define INIT_LOCALE( domain )	G_STMT_START{	\
      gtk_set_locale ();			        \
      setlocale (LC_NUMERIC, "C");               \
      bindtextdomain (domain, LOCALEDIR);	\
+     bind_textdomain_codeset (domain, "UTF-8"); \
      textdomain (domain);			\
 }G_STMT_END
 

libgimp/stdplugins-intl.h

@@ -25,24 +25,17 @@
 #include "gimpintl.h"
 
 
-#ifdef HAVE_LC_MESSAGES
-#define INIT_I18N()	G_STMT_START{			\
-  setlocale(LC_MESSAGES, ""); 				\
-  bindtextdomain("gimp-libgimp", LOCALEDIR);            \
-  bindtextdomain("gimp-std-plugins", LOCALEDIR);	\
-  textdomain("gimp-std-plugins");			\
-  			}G_STMT_END
-#else
 #define INIT_I18N()	G_STMT_START{		         \
   bindtextdomain("gimp-libgimp", LOCALEDIR);             \
+  bind_textdomain_codeset ("gimp-libgimp", "UTF-8");     \
   bindtextdomain("gimp-std-plugins", LOCALEDIR);         \
+  bind_textdomain_codeset ("gimp-std-plugins", "UTF-8"); \
   textdomain("gimp-std-plugins");		         \
+  setlocale (LC_NUMERIC, "C");                           \
 }G_STMT_END
-#endif
 
 #define INIT_I18N_UI()	G_STMT_START{	\
   gtk_set_locale();			\
-  setlocale (LC_NUMERIC, "C");		\
   INIT_I18N();				\
 }G_STMT_END
 

plug-ins/script-fu/script-fu-server.c

@@ -50,7 +50,7 @@
 #define RESPONSE_HEADER 4
 #define MAGIC           'G'
 
-#ifdef NO_DIFFTIME
+#ifndef HAVE_DIFFTIME
 #define difftime(a,b) (((gdouble)(a)) - ((gdouble)(b)))
 #endif
 

plug-ins/script-fu/scripts/trochoid.scm

@@ -390,7 +390,7 @@
 		    "Shuji Narazaki"
 		    "1997"
 		    ""
-		    SF-ADJUSTMENT _"Base Radius (pixel)" '(40 0 512 1 1 0 0)
+		    SF-ADJUSTMENT _"Base Radius (pixels)" '(40 0 512 1 1 0 0)
 		    SF-ADJUSTMENT _"Wheel Radius (hypo < 0 < epi)" '(60 0 512 1 1 0 0)
 		    SF-ADJUSTMENT _"Pen Rad. / Wheel Rad. [0.0:1.0]" '(0.8 0 1 .01 .01 2 0)
 		    SF-ADJUSTMENT _"Hue Rate" '(1.0 0 1 .01 .01 2 0)