mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-18 21:46:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

install: Change the territory when we have learned it.

Browse source 
Typically, the LANGUAGE has already been set in the run-language-page
step.  But for languages like pt, we must know the territory.

* gnu/installer/newt/locale.scm (run-territory-page): Call ‘setenv’ for
the ‘LANGUAGE’ variable.

Change-Id: Ie6308c359e0bdb2d37fac0c844cfd879e96e231a
This commit is contained in:
Florian Pelz 2024-11-02 21:49:45 +01:00
parent 84d5948ee0
commit d2475833e4
No known key found for this signature in database
GPG key ID: 300888CB39C63817
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gnu/installer/newt/locale.scm
View file

@ -2,6 +2,7 @@
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2024 Florian Pelz <pelzflorian@pelzflorian.de>
;;;
;;; This file is part of GNU Guix.
;;;
@ -24,9 +25,6 @@ (define-module (gnu installer newt locale)
#:use-module (gnu installer newt page)
#:use-module (guix i18n)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
#:use-module (srfi srfi-34)
#:use-module (srfi srfi-35)
#:use-module (ice-9 match)
#:export (run-locale-page))
@ -52,16 +50,22 @@ (define result
result)
(define (run-territory-page territories territory->text)
(let ((title (G_ "Locale location")))
(define result
(run-listbox-selection-page
#:title title
#:title (G_ "Locale location")
#:info-text (G_ "Choose a territory for this language.")
#:listbox-items territories
#:listbox-item->text territory->text
#:button-text (G_ "Back")
#:button-callback-procedure
(lambda _
(abort-to-prompt 'installer-step 'abort)))))
(abort-to-prompt 'installer-step 'abort))))
;; Some languages, such as pt, cannot be installed early in the
;; run-language-page step. Install them now, when we know the territory.
(setenv "LANGUAGE" (string-append (getenv "LANGUAGE") "_" result))
result)
(define (run-codeset-page codesets)
(let ((title (G_ "Locale codeset")))