Last fixes for guile.

diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog
index 1535dbdf5cc759abad845fb093bdcba7ef3e6889..0d964025bf8fe8329e0dabf82b1254e333788edb 100644 (file)
--- a/gettext-tools/doc/ChangeLog
+++ b/gettext-tools/doc/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-20  Bruno Haible  <bruno@clisp.org>
+
+       * gettext.texi (Scheme): Correct information about setlocale.
+
 2005-01-16  Bruno Haible  <bruno@clisp.org>
 
        Support for Scheme.

diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi
index 33ed892ac2e943c73719d402ea7de16e473b676d..41183e66354ad2f4e669b6b4a4266b9787d818c0 100644 (file)
--- a/gettext-tools/doc/gettext.texi
+++ b/gettext-tools/doc/gettext.texi
@@ -8370,7 +8370,7 @@ guile
 @code{bindtextdomain}
 
 @item setlocale
-automatic
+@code{(catch #t (lambda () (setlocale LC_ALL "")) (lambda args #f))}
 
 @item Prerequisite
 @code{(use-modules (ice-9 format))}

diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index d03656e68ed8d896ed8a7acb798e547d15b95d06..fd13c7bc950c35aa5201bd42cda6b2b37b7abba0 100644 (file)
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-20  Bruno Haible  <bruno@clisp.org>
+
+       * hello-guile/hello.scm: Invoke setlocale. Fix bindtextdomain call.
+
 2005-01-16  Bruno Haible  <bruno@clisp.org>
 
        Support for Scheme.

diff --git a/gettext-tools/examples/hello-guile/hello.scm b/gettext-tools/examples/hello-guile/hello.scm
index 9e8a4c3e775ee6736d44b2f4c11b30b9ad318f4a..5f6628f81782e7dc89625fdfb888e159d66471d9 100644 (file)
--- a/gettext-tools/examples/hello-guile/hello.scm
+++ b/gettext-tools/examples/hello-guile/hello.scm
@@ -8,8 +8,9 @@
 
 (use-modules (ice-9 format))
 
+(catch #t (lambda () (setlocale LC_ALL "")) (lambda args #f))
 (textdomain "hello-guile")
-(bindtextdomaindir "hello-guile" "@localedir@")
+(bindtextdomain "hello-guile" "@localedir@")
 (define _ gettext)
 
 (display (_ "Hello, world!"))

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 8a556ad2366f1eb2ef63407590369d37f721d1e0..e405398e5516258992e8b394d104d9615019fb50 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-20  Bruno Haible  <bruno@clisp.org>
+
+       * lang-guile: Make it work.
+
 2005-01-16  Bruno Haible  <bruno@clisp.org>
 
        Support for Scheme.

diff --git a/gettext-tools/tests/lang-guile b/gettext-tools/tests/lang-guile
index 171d9caaaced721c4fad772700b7cb5392748fca..a73beab8407295264297e30659bf2ccd4a2c3f15 100755 (executable)
--- a/gettext-tools/tests/lang-guile
+++ b/gettext-tools/tests/lang-guile
@@ -11,10 +11,11 @@ tmpfiles="$tmpfiles prog.scm"
 cat <<\EOF > prog.scm
 (use-modules (ice-9 format))
 
+(setlocale LC_ALL "")
 (textdomain "prog")
 (bindtextdomain "prog" ".")
 
-(define n (list-ref (command-line) 1))
+(define n (string->number (list-ref (command-line) 1)))
 
 (format #t "~A~%" (gettext "'Your command, please?', asked the waiter."))