summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/installer.scm4
-rw-r--r--gnu/installer/newt/keymap.scm10
2 files changed, 10 insertions, 4 deletions
diff --git a/gnu/installer.scm b/gnu/installer.scm
index 5baead81375..881c40ee9b6 100644
--- a/gnu/installer.scm
+++ b/gnu/installer.scm
@@ -353,6 +353,10 @@ selected keymap."
353 (bindtextdomain "iso_3166-1" ;territories 353 (bindtextdomain "iso_3166-1" ;territories
354 #+(file-append iso-codes "/share/locale")) 354 #+(file-append iso-codes "/share/locale"))
355 355
356 ;; Likewise for XKB keyboard layout names.
357 (bindtextdomain "xkeyboard-config"
358 #+(file-append xkeyboard-config "/share/locale"))
359
356 (let* ((current-installer newt-installer) 360 (let* ((current-installer newt-installer)
357 (steps (#$steps current-installer))) 361 (steps (#$steps current-installer)))
358 ((installer-init current-installer)) 362 ((installer-init current-installer))
diff --git a/gnu/installer/newt/keymap.scm b/gnu/installer/newt/keymap.scm
index 948b54783c0..623bfe079df 100644
--- a/gnu/installer/newt/keymap.scm
+++ b/gnu/installer/newt/keymap.scm
@@ -97,7 +97,8 @@ names of the selected keyboard layout and variant."
97 (run-layout-page 97 (run-layout-page
98 (sort-layouts layouts) 98 (sort-layouts layouts)
99 (lambda (layout) 99 (lambda (layout)
100 (x11-keymap-layout-description layout)))))) 100 (gettext (x11-keymap-layout-description layout)
101 "xkeyboard-config"))))))
101 ;; Propose the user to select a variant among those supported by the 102 ;; Propose the user to select a variant among those supported by the
102 ;; previously selected layout. 103 ;; previously selected layout.
103 (installer-step 104 (installer-step
@@ -111,15 +112,16 @@ names of the selected keyboard layout and variant."
111 (run-variant-page 112 (run-variant-page
112 (sort-variants variants) 113 (sort-variants variants)
113 (lambda (variant) 114 (lambda (variant)
114 (x11-keymap-variant-description 115 (gettext (x11-keymap-variant-description variant)
115 variant)))))))))) 116 "xkeyboard-config"))))))))))
116 117
117 (define (format-result result) 118 (define (format-result result)
118 (let ((layout (x11-keymap-layout-name 119 (let ((layout (x11-keymap-layout-name
119 (result-step result 'layout))) 120 (result-step result 'layout)))
120 (variant (and=> (result-step result 'variant) 121 (variant (and=> (result-step result 'variant)
121 (lambda (variant) 122 (lambda (variant)
122 (x11-keymap-variant-name variant))))) 123 (gettext (x11-keymap-variant-name variant)
124 "xkeyboard-config")))))
123 (list layout (or variant "")))) 125 (list layout (or variant ""))))
124 (format-result 126 (format-result
125 (run-installer-steps #:steps keymap-steps))) 127 (run-installer-steps #:steps keymap-steps)))