ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

installer: Use the latest ‘iso-codes’.

Browse source 
Fixes <https://issues.guix.gnu.org/73081>.

* gnu/installer.scm (compute-locale-step): Use Use iso-codes.

Change-Id: I9a69f7accee965cf5deb2c1b23ce3fda579d465a
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Reported-by: Ricardo Wurmus <rekado@elephly.net>
This commit is contained in:
Roman Scherer 2024-09-27 11:14:44 +02:00 committed by Ludovic Courtès
parent 2ae666c471
commit e076b8b884
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
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.scm
View file

@ -146,10 +146,14 @@ (define (compiled-file-loader file name)
(let* ((supported-locales #~(supported-locales->locales (let* ((supported-locales #~(supported-locales->locales
#+(glibc-supported-locales))) #+(glibc-supported-locales)))
(iso-codes #~(string-append #$iso-codes/pinned "/share/iso-codes/json/"))
(iso639-3 #~(string-append #$iso-codes/pinned "iso_639-3.json")) ;; Note: Use the latest version of 'iso-codes', including
(iso639-5 #~(string-append #$iso-codes/pinned "iso_639-5.json")) ;; Guix-specific changes, so that all languages known to glibc and
(iso3166 #~(string-append #$iso-codes/pinned "iso_3166-1.json")) ;; returned by 'glibc-supported-locales'.
(iso-codes #~(string-append #$iso-codes "/share/iso-codes/json/"))
(iso639-3 #~(string-append #$iso-codes "iso_639-3.json"))
(iso639-5 #~(string-append #$iso-codes "iso_639-5.json"))
(iso3166 #~(string-append #$iso-codes "iso_3166-1.json"))
(locales-file (build-compiled-file (locales-file (build-compiled-file
locales-name locales-name
#~`(quote ,#$supported-locales))) #~`(quote ,#$supported-locales)))
@ -437,9 +441,9 @@ (define installer-builder
;; (e.g., "French" is always displayed as "français", but ;; (e.g., "French" is always displayed as "français", but
;; "Belgium" could be translated to Dutch, French, or German.) ;; "Belgium" could be translated to Dutch, French, or German.)
(bindtextdomain "iso_639-3" ;languages (bindtextdomain "iso_639-3" ;languages
#+(file-append iso-codes/pinned "/share/locale")) #+(file-append iso-codes "/share/locale"))
(bindtextdomain "iso_3166-1" ;territories (bindtextdomain "iso_3166-1" ;territories
#+(file-append iso-codes/pinned "/share/locale")) #+(file-append iso-codes "/share/locale"))
;; Likewise for XKB keyboard layout names. ;; Likewise for XKB keyboard layout names.
(bindtextdomain "xkeyboard-config" (bindtextdomain "xkeyboard-config"