diff --git a/ChangeLog b/ChangeLog index c36e06cf7f..dca9bbc59a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +2001-08-30 Sven Neumann + + * 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 * README.i18n: added a section that mentions the GNOME translation diff --git a/configure.in b/configure.in index 88994b36a8..1ea7a5c989 100644 --- a/configure.in +++ b/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 -AC_CHECK_FUNC(difftime, , AC_DEFINE(NO_DIFFTIME)) - -dnl check for putenv (because %#@&% NeXTStep doesn't have it) -AC_CHECK_FUNC(putenv, AC_DEFINE(HAVE_PUTENV)) +dnl check some more funcs +AC_CHECK_FUNCS(difftime putenv mmap bind_textdomain_codeset) 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, diff --git a/libgimp/gimpintl.h b/libgimp/gimpintl.h index 7258ccd82f..b641286f92 100644 --- a/libgimp/gimpintl.h +++ b/libgimp/gimpintl.h @@ -1,16 +1,16 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * gimpintl.h * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public @@ -56,11 +56,16 @@ # 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); \ - textdomain (domain); \ - }G_STMT_END + gtk_set_locale (); \ + setlocale (LC_NUMERIC, "C"); \ + bindtextdomain (domain, LOCALEDIR); \ + bind_textdomain_codeset (domain, "UTF-8"); \ + textdomain (domain); \ +}G_STMT_END #endif /* __GIMPINTL_H__ */ diff --git a/libgimp/libgimp-intl.h b/libgimp/libgimp-intl.h index ffc40c5b77..85e63460aa 100644 --- a/libgimp/libgimp-intl.h +++ b/libgimp/libgimp-intl.h @@ -1,4 +1,4 @@ -/* LIBGIMP - The GIMP Library +/* LIBGIMP - The GIMP Library * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball * * libgimp-intl.h @@ -6,11 +6,11 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public diff --git a/libgimp/stdplugins-intl.h b/libgimp/stdplugins-intl.h index 023feab5df..b1d83aa279 100644 --- a/libgimp/stdplugins-intl.h +++ b/libgimp/stdplugins-intl.h @@ -25,26 +25,19 @@ #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); \ - bindtextdomain("gimp-std-plugins", LOCALEDIR); \ - textdomain("gimp-std-plugins"); \ - }G_STMT_END -#endif +#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 #define INIT_I18N_UI() G_STMT_START{ \ gtk_set_locale(); \ - setlocale (LC_NUMERIC, "C"); \ INIT_I18N(); \ - }G_STMT_END +}G_STMT_END #endif /* __STDPLUGINS_INTL_H__ */ diff --git a/plug-ins/script-fu/script-fu-server.c b/plug-ins/script-fu/script-fu-server.c index 502db1bf64..c49e74bfcc 100644 --- a/plug-ins/script-fu/script-fu-server.c +++ b/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 diff --git a/plug-ins/script-fu/scripts/trochoid.scm b/plug-ins/script-fu/scripts/trochoid.scm index 71cc7806a4..e49d77aa57 100644 --- a/plug-ins/script-fu/scripts/trochoid.scm +++ b/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)