nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2013-10-12 16:37:28 +02:00
parent f854a8c133
commit 39e9f95d05
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
guix/ui.scm
View File

@ -123,7 +123,7 @@ messages."
(define (initialize-guix) (define (initialize-guix)
"Perform the usual initialization for stand-alone Guix commands." "Perform the usual initialization for stand-alone Guix commands."
(install-locale) (install-locale)
(textdomain "guix") (textdomain %gettext-domain)
;; Ignore SIGPIPE. If the daemon closes the connection, we prefer to be ;; Ignore SIGPIPE. If the daemon closes the connection, we prefer to be
;; notified via an EPIPE later. ;; notified via an EPIPE later.

4
scripts/guix.in
View File

@ -31,7 +31,8 @@
(define config-lookup (define config-lookup
(let ((config '(("prefix" . "@prefix@") (let ((config '(("prefix" . "@prefix@")
("datarootdir" . "@datarootdir@") ("datarootdir" . "@datarootdir@")
("guilemoduledir" . "@guilemoduledir@"))) ("guilemoduledir" . "@guilemoduledir@")
("localedir" . "@localedir@")))
(var-ref-regexp (make-regexp "\\$\\{([a-z]+)\\}"))) (var-ref-regexp (make-regexp "\\$\\{([a-z]+)\\}")))
(define (expand-var-ref match) (define (expand-var-ref match)
(lookup (match:substring match 1))) (lookup (match:substring match 1)))
@ -58,6 +59,7 @@
(define (run-guix-main) (define (run-guix-main)
(let ((guix-main (module-ref (resolve-interface '(guix ui)) (let ((guix-main (module-ref (resolve-interface '(guix ui))
'guix-main))) 'guix-main)))
(bindtextdomain "guix" (config-lookup "localedir"))
(apply guix-main (command-line)))) (apply guix-main (command-line))))
(maybe-augment-load-paths!) (maybe-augment-load-paths!)