2 files changed, 4 insertions(+), 2 deletions(-)

M guix/ui.scm
M scripts/guix.in

@@ 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.

@@ 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!)