gnu: Fix some typos in the installer.

* gnu/installer/connman.scm (connman-connect-with-auth): Fix typo in
documentation.
* gnu/installer/newt/keymap.scm (sort-variants): Likewise.
* gnu/installer/newt/page.scm (run-listbox-selection-page): Likewise.
* gnu/installer/parted.scm (mkpart): Likewise.
* gnu/installer/newt/utils.scm (destroy-form-and-pop): Likewise.
* gnu/installer/newt/wifi.scm (run-unknown-error-page): Fix typo.
(wifi-listbox-heigth): Rename to…
(wifi-listbox-height): …this, and adjust caller.
* gnu/installer/timezone.scm (locate-childrens): Rename to…
(locate-children): …this.  Adjust all callers.
This commit is contained in:
Tobias Geerinckx-Rice 2019-02-10 15:54:53 +01:00
parent a9e9c738dc
commit b83e4a93a2
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
8 changed files with 18 additions and 18 deletions

View file

@ -299,7 +299,7 @@ (define (connman-connect-with-auth service password-proc)
extracted from connmanctl output using a regexp. This makes the whole extracted from connmanctl output using a regexp. This makes the whole
procedure even more unreliable. procedure even more unreliable.
Raise &connman-connection-error if an error occured during connection. Raise Raise &connman-connection-error if an error occurred during connection. Raise
&connman-password-error if the given password is incorrect." &connman-password-error if the given password is incorrect."
(define connman-error-regexp (make-regexp "Error[ ]*([^\n]+)\n")) (define connman-error-regexp (make-regexp "Error[ ]*([^\n]+)\n"))

View file

@ -71,7 +71,7 @@ (define (sort-layouts layouts)
(cut append <> <>))) (cut append <> <>)))
(define (sort-variants variants) (define (sort-variants variants)
"Sort VARIANTS list by putting the internation variant ahead and return it." "Sort VARIANTS list by putting the international variant ahead and return it."
(call-with-values (call-with-values
(lambda () (lambda ()
(partition (partition

View file

@ -188,7 +188,7 @@ (define* (run-listbox-selection-page #:key
'string<=' procedure (after being converted to text). 'string<=' procedure (after being converted to text).
If ALLOW-DELETE? is #t, the form will return if the <DELETE> key is pressed, If ALLOW-DELETE? is #t, the form will return if the <DELETE> key is pressed,
otherwise nothing will happend. otherwise nothing will happen.
Each time the listbox current item changes, call SKIP-ITEM-PROCEDURE? with the Each time the listbox current item changes, call SKIP-ITEM-PROCEDURE? with the
current listbox item as argument. If it returns #t, skip the element and jump current listbox item as argument. If it returns #t, skip the element and jump

View file

@ -30,7 +30,7 @@ (define-module (gnu installer newt timezone)
#:use-module (newt) #:use-module (newt)
#:export (run-timezone-page)) #:export (run-timezone-page))
;; Heigth of the listbox displaying timezones. ;; Height of the listbox displaying timezones.
(define timezone-listbox-heigth (make-parameter 20)) (define timezone-listbox-heigth (make-parameter 20))
;; Information textbox width. ;; Information textbox width.
@ -53,7 +53,7 @@ (define (all-but-last list)
(define (run-page timezone-tree) (define (run-page timezone-tree)
(define (loop path) (define (loop path)
(let ((timezones (locate-childrens timezone-tree path))) (let ((timezones (locate-children timezone-tree path)))
(run-listbox-selection-page (run-listbox-selection-page
#:title (G_ "Timezone") #:title (G_ "Timezone")
#:info-text (G_ "Please select a timezone.") #:info-text (G_ "Please select a timezone.")

View file

@ -30,7 +30,7 @@ (define screen-columns (make-parameter 0))
(define screen-rows (make-parameter 0)) (define screen-rows (make-parameter 0))
(define (destroy-form-and-pop form) (define (destroy-form-and-pop form)
"Destory the given FORM and pop the current window." "Destroy the given FORM and pop the current window."
(destroy-form form) (destroy-form form)
(pop-window)) (pop-window))

View file

@ -100,7 +100,7 @@ (define (run-unknown-error-page service-name)
"Run a page to inform user that a connection error happened." "Run a page to inform user that a connection error happened."
(run-error-page (run-error-page
(format #f (format #f
(G_ "An error occured while trying to connect to ~a, please retry.") (G_ "An error occurred while trying to connect to ~a, please retry.")
service-name) service-name)
(G_ "Connection error"))) (G_ "Connection error")))
@ -160,8 +160,8 @@ (define* (fill-wifi-services listbox wifi-services)
;; Maximum length of a wifi service name. ;; Maximum length of a wifi service name.
(define service-name-max-length (make-parameter 20)) (define service-name-max-length (make-parameter 20))
;; Heigth of the listbox displaying wifi services. ;; Height of the listbox displaying wifi services.
(define wifi-listbox-heigth (make-parameter 20)) (define wifi-listbox-height (make-parameter 20))
;; Information textbox width. ;; Information textbox width.
(define info-textbox-width (make-parameter 40)) (define info-textbox-width (make-parameter 40))
@ -188,7 +188,7 @@ (define (run-wifi-page)
force a wifi scan." force a wifi scan."
(let* ((listbox (make-listbox (let* ((listbox (make-listbox
-1 -1 -1 -1
(wifi-listbox-heigth) (wifi-listbox-height)
(logior FLAG-SCROLL FLAG-BORDER FLAG-RETURNEXIT))) (logior FLAG-SCROLL FLAG-BORDER FLAG-RETURNEXIT)))
(form (make-form)) (form (make-form))
(buttons-grid (make-grid 1 1)) (buttons-grid (make-grid 1 1))

View file

@ -677,7 +677,7 @@ (define (can-create-partition? user-part)
(define* (mkpart disk user-partition (define* (mkpart disk user-partition
#:key (previous-partition #f)) #:key (previous-partition #f))
"Create the given USER-PARTITION on DISK. The PREVIOUS-PARTITION argument as "Create the given USER-PARTITION on DISK. The PREVIOUS-PARTITION argument as
to be set to the partition preceeding USER-PARTITION if any." to be set to the partition preceding USER-PARTITION if any."
(define (parse-start-end start end) (define (parse-start-end start end)
"Parse start and end strings as positions on DEVICE expressed with a unit, "Parse start and end strings as positions on DEVICE expressed with a unit,
@ -734,8 +734,8 @@ (define* (extend-ranges! start-range end-range
(< start-distance 3)) (< start-distance 3))
(+ start-sector start-offset) (+ start-sector start-offset)
start-sector))) start-sector)))
;; This is a hackery but parted almost always fails to create optimally ;; This is a hack. Parted almost always fails to create optimally
;; aligned partitions (unless specifiying percentages) because, the ;; aligned partitions (unless specifying percentages) because the
;; default range of 1MB centered on the start sector is not enough when ;; default range of 1MB centered on the start sector is not enough when
;; the optimal alignment is 2048 sectors of 512KB. ;; the optimal alignment is 2048 sectors of 512KB.
(extend-ranges! start-range end-range #:offset start-offset) (extend-ranges! start-range end-range #:offset start-offset)

View file

@ -25,7 +25,7 @@ (define-module (gnu installer timezone)
#:use-module (srfi srfi-35) #:use-module (srfi srfi-35)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (ice-9 receive) #:use-module (ice-9 receive)
#:export (locate-childrens #:export (locate-children
timezone->posix-tz timezone->posix-tz
timezone-has-child? timezone-has-child?
zonetab->timezone-tree zonetab->timezone-tree
@ -94,15 +94,15 @@ (define (remove-first lists)
(loop (remove-first same-region)) (loop (remove-first same-region))
(loop other-region)))))))) (loop other-region))))))))
(define (locate-childrens tree path) (define (locate-children tree path)
"Return the childrens of the timezone indicated by PATH in the given "Return the children of the timezone indicated by PATH in the given
TREE. Raise a condition if the PATH could not be found." TREE. Raise a condition if the PATH could not be found."
(let ((extract-proc (cut map car <>))) (let ((extract-proc (cut map car <>)))
(match path (match path
(() (sort (extract-proc tree) string<?)) (() (sort (extract-proc tree) string<?))
((region . rest) ((region . rest)
(or (and=> (assoc-ref tree region) (or (and=> (assoc-ref tree region)
(cut locate-childrens <> rest)) (cut locate-children <> rest))
(raise (raise
(condition (condition
(&message (&message
@ -111,7 +111,7 @@ (define (locate-childrens tree path)
(define (timezone-has-child? tree timezone) (define (timezone-has-child? tree timezone)
"Return #t if the given TIMEZONE any child in TREE and #f otherwise." "Return #t if the given TIMEZONE any child in TREE and #f otherwise."
(not (null? (locate-childrens tree timezone)))) (not (null? (locate-children tree timezone))))
(define* (zonetab->timezone-tree zonetab) (define* (zonetab->timezone-tree zonetab)
"Return the timezone tree corresponding to the given ZONETAB file." "Return the timezone tree corresponding to the given ZONETAB file."