diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-02-20 17:19:00 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-02-20 17:19:00 +0100 |
commit | 901236474a9523595c0bdefd5ac22366e78b9e61 (patch) | |
tree | 667efe648d584b0c960b0da0d577b8a71b6b941c /gnu/installer/newt | |
parent | 63d4ef52ebad4157817d56ccbe974da8fff81929 (diff) | |
parent | 64766d5cafd5cf19189ed274eb7e29ef784f90de (diff) | |
download | guix-patches-901236474a9523595c0bdefd5ac22366e78b9e61.tar guix-patches-901236474a9523595c0bdefd5ac22366e78b9e61.tar.gz |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/installer/newt')
-rw-r--r-- | gnu/installer/newt/keymap.scm | 2 | ||||
-rw-r--r-- | gnu/installer/newt/page.scm | 2 | ||||
-rw-r--r-- | gnu/installer/newt/timezone.scm | 5 | ||||
-rw-r--r-- | gnu/installer/newt/utils.scm | 2 | ||||
-rw-r--r-- | gnu/installer/newt/wifi.scm | 8 |
5 files changed, 8 insertions, 11 deletions
diff --git a/gnu/installer/newt/keymap.scm b/gnu/installer/newt/keymap.scm index 6211af2bc5..3e765bfdd4 100644 --- a/gnu/installer/newt/keymap.scm +++ b/gnu/installer/newt/keymap.scm @@ -71,7 +71,7 @@ (cut append <> <>))) (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 (lambda () (partition diff --git a/gnu/installer/newt/page.scm b/gnu/installer/newt/page.scm index edf0b8c999..23fbfcce76 100644 --- a/gnu/installer/newt/page.scm +++ b/gnu/installer/newt/page.scm @@ -188,7 +188,7 @@ If SORT-LISTBOX-ITEMS? is set to #t, the listbox items are sorted using 'string<=' procedure (after being converted to text). 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 current listbox item as argument. If it returns #t, skip the element and jump diff --git a/gnu/installer/newt/timezone.scm b/gnu/installer/newt/timezone.scm index 6c96ee55b1..63b44af729 100644 --- a/gnu/installer/newt/timezone.scm +++ b/gnu/installer/newt/timezone.scm @@ -30,9 +30,6 @@ #:use-module (newt) #:export (run-timezone-page)) -;; Heigth of the listbox displaying timezones. -(define timezone-listbox-heigth (make-parameter 20)) - ;; Information textbox width. (define info-textbox-width (make-parameter 40)) @@ -53,7 +50,7 @@ returned." (define (run-page timezone-tree) (define (loop path) - (let ((timezones (locate-childrens timezone-tree path))) + (let ((timezones (locate-children timezone-tree path))) (run-listbox-selection-page #:title (G_ "Timezone") #:info-text (G_ "Please select a timezone.") diff --git a/gnu/installer/newt/utils.scm b/gnu/installer/newt/utils.scm index 1c2ce4e628..dfb113e0c6 100644 --- a/gnu/installer/newt/utils.scm +++ b/gnu/installer/newt/utils.scm @@ -30,7 +30,7 @@ (define screen-rows (make-parameter 0)) (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) (pop-window)) diff --git a/gnu/installer/newt/wifi.scm b/gnu/installer/newt/wifi.scm index 59e40e327e..4cf5c128e7 100644 --- a/gnu/installer/newt/wifi.scm +++ b/gnu/installer/newt/wifi.scm @@ -100,7 +100,7 @@ nmc_wifi_strength_bars." "Run a page to inform user that a connection error happened." (run-error-page (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) (G_ "Connection error"))) @@ -160,8 +160,8 @@ of <service-item> records present in LISTBOX." ;; Maximum length of a wifi service name. (define service-name-max-length (make-parameter 20)) -;; Heigth of the listbox displaying wifi services. -(define wifi-listbox-heigth (make-parameter 20)) +;; Height of the listbox displaying wifi services. +(define wifi-listbox-height (make-parameter 20)) ;; Information textbox width. (define info-textbox-width (make-parameter 40)) @@ -188,7 +188,7 @@ network when the corresponding listbox entry is selected. A button allow to force a wifi scan." (let* ((listbox (make-listbox -1 -1 - (wifi-listbox-heigth) + (wifi-listbox-height) (logior FLAG-SCROLL FLAG-BORDER FLAG-RETURNEXIT))) (form (make-form)) (buttons-grid (make-grid 1 1)) |