guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

07/10: installer: Change language as soon as it has been chosen.


From: guix-commits
Subject: 07/10: installer: Change language as soon as it has been chosen.
Date: Wed, 17 Apr 2019 05:54:09 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 2d5867a213c4d23882e463d599eb236032086250
Author: Ludovic Court├Ęs <address@hidden>
Date:   Wed Apr 17 10:34:02 2019 +0200

    installer: Change language as soon as it has been chosen.
    
    Previously we'd call 'setlocale' only after the complete 'locale' step
    had finished.
    
    * gnu/installer/newt/locale.scm (run-language-page): Set the 'LANGUAGE'
    environment variable before returning.
---
 gnu/installer/newt/locale.scm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gnu/installer/newt/locale.scm b/gnu/installer/newt/locale.scm
index b819d06..01bcf76 100644
--- a/gnu/installer/newt/locale.scm
+++ b/gnu/installer/newt/locale.scm
@@ -30,9 +30,9 @@
   #:export (run-locale-page))
 
 (define (run-language-page languages language->text)
-  (let ((title (G_ "Locale language")))
+  (define result
     (run-listbox-selection-page
-     #:title title
+     #:title (G_ "Locale language")
      #:info-text (G_ "Choose the language to use for the \
 installation process and for the installed system.")
      #:info-textbox-width 70
@@ -44,7 +44,13 @@ installation process and for the installed system.")
      (lambda _
        (raise
         (condition
-         (&installer-step-abort)))))))
+         (&installer-step-abort))))))
+
+  ;; Immediately install the chosen language so that the territory page that
+  ;; comes after (optionally) is displayed in the chosen language.
+  (setenv "LANGUAGE" result)
+
+  result)
 
 (define (run-territory-page territories territory->text)
   (let ((title (G_ "Locale location")))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]