summary refs log tree commit diff
path: root/gnu/installer/timezone.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-02-20 17:01:39 +0100
committerMarius Bakke <mbakke@fastmail.com>2019-02-20 17:01:39 +0100
commit2c76e19df4b0b4aa0171f1edd9f240f7b6ba5b84 (patch)
treec2e7a7f27dd9c7e704f2e78655328c903a6934d1 /gnu/installer/timezone.scm
parente6a668ec7303a71f87e4c9354b1458e555058c63 (diff)
parent78b2eb1ad3dcf05c25e0ee4980c97aa52de03a2d (diff)
downloadguix-2c76e19df4b0b4aa0171f1edd9f240f7b6ba5b84.tar.gz
Merge branch 'master' into staging
Diffstat (limited to 'gnu/installer/timezone.scm')
-rw-r--r--gnu/installer/timezone.scm10
1 files changed, 5 insertions, 5 deletions
diff --git a/gnu/installer/timezone.scm b/gnu/installer/timezone.scm
index 32bc2ed6bb..c336b5f3ba 100644
--- a/gnu/installer/timezone.scm
+++ b/gnu/installer/timezone.scm
@@ -25,7 +25,7 @@
   #:use-module (srfi srfi-35)
   #:use-module (ice-9 match)
   #:use-module (ice-9 receive)
-  #:export (locate-childrens
+  #:export (locate-children
             timezone->posix-tz
             timezone-has-child?
             zonetab->timezone-tree
@@ -94,15 +94,15 @@ timezones."
                     (loop (remove-first same-region))
                     (loop other-region))))))))
 
-(define (locate-childrens tree path)
-  "Return the childrens of the timezone indicated by PATH in the given
+(define (locate-children tree path)
+  "Return the children of the timezone indicated by PATH in the given
 TREE. Raise a condition if the PATH could not be found."
   (let ((extract-proc (cut map car <>)))
     (match path
       (() (sort (extract-proc tree) string<?))
       ((region . rest)
        (or (and=> (assoc-ref tree region)
-                  (cut locate-childrens <> rest))
+                  (cut locate-children <> rest))
            (raise
             (condition
              (&message
@@ -111,7 +111,7 @@ TREE. Raise a condition if the PATH could not be found."
 
 (define (timezone-has-child? tree timezone)
   "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)
   "Return the timezone tree corresponding to the given ZONETAB file."