From ba1046d61eecd9d88483e5730bec4c0e23e96bc9 Mon Sep 17 00:00:00 2001 Message-ID: In-Reply-To: <7fefef83a062a97d7c41e3e0d145abd9d5b1101b.1727437710.git.roman@burningswell.com> References: <7fefef83a062a97d7c41e3e0d145abd9d5b1101b.1727437710.git.roman@burningswell.com> From: Roman Scherer Date: Fri, 27 Sep 2024 11:14:44 +0200 Subject: [PATCH 3/3] gnu: installer: Use iso-codes. * gnu/installer.scm (compute-locale-step): Use Use iso-codes. Change-Id: I9a69f7accee965cf5deb2c1b23ce3fda579d465a --- gnu/installer.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/installer.scm b/gnu/installer.scm index 53af01261e..3792fc7e35 100644 --- a/gnu/installer.scm +++ b/gnu/installer.scm @@ -146,10 +146,10 @@ (define* (compute-locale-step #:key (let* ((supported-locales #~(supported-locales->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")) - (iso639-5 #~(string-append #$iso-codes/pinned "iso_639-5.json")) - (iso3166 #~(string-append #$iso-codes/pinned "iso_3166-1.json")) + (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-name #~`(quote ,#$supported-locales))) @@ -437,9 +437,9 @@ (define (installer-program) ;; (e.g., "French" is always displayed as "français", but ;; "Belgium" could be translated to Dutch, French, or German.) (bindtextdomain "iso_639-3" ;languages - #+(file-append iso-codes/pinned "/share/locale")) + #+(file-append iso-codes "/share/locale")) (bindtextdomain "iso_3166-1" ;territories - #+(file-append iso-codes/pinned "/share/locale")) + #+(file-append iso-codes "/share/locale")) ;; Likewise for XKB keyboard layout names. (bindtextdomain "xkeyboard-config" -- 2.46.0