aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-10-12 16:37:28 +0200
committerLudovic Courtès <ludo@gnu.org>2013-10-12 22:29:31 +0200
commit39e9f95d059e61a735a52f866d4c175906826744 (patch)
treee5cdaafd729f9be9fabca2e71c70a7ae034b1f51
parentf854a8c13341f0f5079380c3f8fa570cbb0d2636 (diff)
downloadguix-39e9f95d059e61a735a52f866d4c175906826744.tar.gz
guix-39e9f95d059e61a735a52f866d4c175906826744.zip
guix: Add missing call to 'bindtextdomain'.
* scripts/guix.in (config-lookup): Add "localedir" entry. (run-guix-main): Add call to 'bindtextdomain'. * guix/ui.scm (initialize-guix): Use %GETTEXT-DOMAIN instead of a literal.
-rw-r--r--guix/ui.scm2
-rw-r--r--scripts/guix.in4
2 files changed, 4 insertions, 2 deletions
diff --git a/guix/ui.scm b/guix/ui.scm
index 4415997252..7f8ed970d4 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -123,7 +123,7 @@ messages."
(define (initialize-guix)
"Perform the usual initialization for stand-alone Guix commands."
(install-locale)
- (textdomain "guix")
+ (textdomain %gettext-domain)
;; Ignore SIGPIPE. If the daemon closes the connection, we prefer to be
;; notified via an EPIPE later.
diff --git a/scripts/guix.in b/scripts/guix.in
index c99e866361..673036f6cb 100644
--- a/scripts/guix.in
+++ b/scripts/guix.in
@@ -31,7 +31,8 @@
(define config-lookup
(let ((config '(("prefix" . "@prefix@")
("datarootdir" . "@datarootdir@")
- ("guilemoduledir" . "@guilemoduledir@")))
+ ("guilemoduledir" . "@guilemoduledir@")
+ ("localedir" . "@localedir@")))
(var-ref-regexp (make-regexp "\\$\\{([a-z]+)\\}")))
(define (expand-var-ref match)
(lookup (match:substring match 1)))
@@ -58,6 +59,7 @@
(define (run-guix-main)
(let ((guix-main (module-ref (resolve-interface '(guix ui))
'guix-main)))
+ (bindtextdomain "guix" (config-lookup "localedir"))
(apply guix-main (command-line))))
(maybe-augment-load-paths!)