From 38f50f49f395fcda6ab3395ebaa312f8ee24d80d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 20 Apr 2016 23:16:47 +0200
Subject: [PATCH] substitute: Install the client's locale.
* guix/store.scm (set-build-options): Add #:locale parameter and honor
it.
* guix/scripts/substitute.scm (guix-substitute): Install the client's
locale.
---
guix/scripts/substitute.scm | 7 +++++++
guix/store.scm | 8 +++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm
index e0a694ad0f6..fa1dd09df8a 100755
--- a/guix/scripts/substitute.scm
+++ b/guix/scripts/substitute.scm
@@ -1000,6 +1000,13 @@ (define (guix-substitute . args)
(newline)
(force-output (current-output-port))
+ ;; Attempt to install the client's locale, mostly so that messages are
+ ;; suitably translated.
+ (match (or (find-daemon-option "untrusted-locale")
+ (find-daemon-option "locale"))
+ (#f #f)
+ (locale (false-if-exception (setlocale LC_ALL locale))))
+
(with-networking
(with-error-handling ; for signature errors
(match args
diff --git a/guix/store.scm b/guix/store.scm
index af311a0ebdf..8d1099dab20 100644
--- a/guix/store.scm
+++ b/guix/store.scm
@@ -534,7 +534,10 @@ (define* (set-build-options server
(substitute-urls #f)
;; Number of columns in the client's terminal.
- (terminal-columns (terminal-columns)))
+ (terminal-columns (terminal-columns))
+
+ ;; Locale of the client.
+ (locale (false-if-exception (setlocale LC_ALL))))
;; Must be called after `open-connection'.
(define socket
@@ -573,6 +576,9 @@ (define socket
,@(if terminal-columns
`(("terminal-columns"
. ,(number->string terminal-columns)))
+ '())
+ ,@(if locale
+ `(("locale" . ,locale))
'()))))
(send (string-pairs pairs))))
(let loop ((done? (process-stderr server)))
--
GitLab