diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-04-17 15:11:21 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-04-17 15:11:21 +0200 |
| commit | feaa83a377966b6cec982f0bbaba1ea15c28d52e (patch) | |
| tree | b0725fe0de68d26f1e08586514ea194d1cbd6639 /gnu | |
| parent | 085e021e63f327f9d8aa4d65319325c87dd33d97 (diff) | |
| download | patches-feaa83a377966b6cec982f0bbaba1ea15c28d52e.tar patches-feaa83a377966b6cec982f0bbaba1ea15c28d52e.tar.gz | |
installer: Translate keyboard layout names.
* gnu/installer.scm (installer-program)[installer-builder]: Call
'bindtextdomain' for "xkeyboard-config".
* gnu/installer/newt/keymap.scm (run-keymap-page): Add calls to
'gettext'.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/installer.scm | 4 | ||||
| -rw-r--r-- | gnu/installer/newt/keymap.scm | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/gnu/installer.scm b/gnu/installer.scm index 5baead8137..881c40ee9b 100644 --- a/gnu/installer.scm +++ b/gnu/installer.scm @@ -353,6 +353,10 @@ selected keymap." (bindtextdomain "iso_3166-1" ;territories #+(file-append iso-codes "/share/locale")) + ;; Likewise for XKB keyboard layout names. + (bindtextdomain "xkeyboard-config" + #+(file-append xkeyboard-config "/share/locale")) + (let* ((current-installer newt-installer) (steps (#$steps current-installer))) ((installer-init current-installer)) diff --git a/gnu/installer/newt/keymap.scm b/gnu/installer/newt/keymap.scm index 948b54783c..623bfe079d 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." (run-layout-page (sort-layouts layouts) (lambda (layout) - (x11-keymap-layout-description layout)))))) + (gettext (x11-keymap-layout-description layout) + "xkeyboard-config")))))) ;; Propose the user to select a variant among those supported by the ;; previously selected layout. (installer-step @@ -111,15 +112,16 @@ names of the selected keyboard layout and variant." (run-variant-page (sort-variants variants) (lambda (variant) - (x11-keymap-variant-description - variant)))))))))) + (gettext (x11-keymap-variant-description variant) + "xkeyboard-config")))))))))) (define (format-result result) (let ((layout (x11-keymap-layout-name (result-step result 'layout))) (variant (and=> (result-step result 'variant) (lambda (variant) - (x11-keymap-variant-name variant))))) + (gettext (x11-keymap-variant-name variant) + "xkeyboard-config"))))) (list layout (or variant "")))) (format-result (run-installer-steps #:steps keymap-steps))) |