From: Bruno Haible <bruno@clisp.org>
Date: Fri, 21 Jan 2005 11:31:22 +0000 (+0000)
Subject: Last fixes for guile.
X-Git-Tag: v0.14.2~113
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8610e03ee7c51851289a65b305c6ba50b100cf76;p=thirdparty%2Fgettext.git

Last fixes for guile.
---

diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog
index 1535dbdf5..0d964025b 100644
--- 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 33ed892ac..41183e663 100644
--- 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 d03656e68..fd13c7bc9 100644
--- 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 9e8a4c3e7..5f6628f81 100644
--- 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 8a556ad23..e405398e5 100644
--- 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 171d9caaa..a73beab84 100755
--- 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."))