mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 07:26:13 -05:00
installer: Include empty variant in keyboard layout selection.
Previously for Azerbaijani, no Latin layout but only the Cyrillic variant could be selected. * gnu/installer/newt/keymap.scm (add-empty-variant): New procedure. (run-keymap-page): Use it to insert an empty variant.
This commit is contained in:
parent
91c231a222
commit
7bc71025cc
1 changed files with 16 additions and 5 deletions
|
@ -104,14 +104,21 @@ (define preferred
|
|||
(append (sort main layout<?)
|
||||
(sort others layout<?)))))
|
||||
|
||||
(define (add-empty-variant variants)
|
||||
"Prepend #f to VARIANTS so the user has the option to select no variant.
|
||||
The resulting layout may be different from all other variants (e.g. for
|
||||
Azerbaijani)."
|
||||
(cons #f variants))
|
||||
|
||||
(define (sort-variants variants)
|
||||
"Sort VARIANTS list by putting the international variant ahead and return it."
|
||||
(call-with-values
|
||||
(lambda ()
|
||||
(partition
|
||||
(lambda (variant)
|
||||
(let ((name (x11-keymap-variant-name variant)))
|
||||
(string=? name "altgr-intl")))
|
||||
(and variant
|
||||
(let ((name (x11-keymap-variant-name variant)))
|
||||
(string=? name "altgr-intl"))))
|
||||
variants))
|
||||
(cut append <> <>)))
|
||||
|
||||
|
@ -180,10 +187,14 @@ (define keymap-steps
|
|||
;; Return #f if the layout does not have any variant.
|
||||
(and (not (null? variants))
|
||||
(run-variant-page
|
||||
(sort-variants variants)
|
||||
(sort-variants (add-empty-variant variants))
|
||||
(lambda (variant)
|
||||
(gettext (x11-keymap-variant-description variant)
|
||||
"xkeyboard-config"))))))))))
|
||||
(if variant
|
||||
(gettext (x11-keymap-variant-description variant)
|
||||
"xkeyboard-config")
|
||||
;; Text to opt for no variant at all:
|
||||
(gettext (x11-keymap-layout-description layout)
|
||||
"xkeyboard-config")))))))))))
|
||||
|
||||
(define (format-result result)
|
||||
(let ((layout (x11-keymap-layout-name
|
||||
|
|
Loading…
Reference in a new issue