From 965b3b9d0ad3faa337ecdc8db1565e1a5819b13a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Thu, 16 Nov 2023 03:02:07 +0100 Subject: Empty env vars equals unset when resolving language. --- module/hnh/util/language.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/module/hnh/util/language.scm b/module/hnh/util/language.scm index 9b61483c..f393f179 100644 --- a/module/hnh/util/language.scm +++ b/module/hnh/util/language.scm @@ -1,6 +1,12 @@ (define-module (hnh util language) :export (resolve-language)) +;;; Given a #f or a string, return #f if #f or an empty string is given, +;;; and the given string otherwise +(define (falsify-string s) + (cond ((and (boolean? s) (not s)) s) + ((string-null? s) #f) + (else s))) ;; Locale objects, such as %global-locale, doesn't provide a way to access the language name, ;; This is for procedures which want to handle their translations manually. @@ -8,7 +14,7 @@ "Returns a two character symbol representing the \"current\" language. e.g. en" (string->symbol (string-take - (or (getenv "LC_MESSAGES") - (getenv "LC_ALL") + (or (falsify-string (getenv "LC_MESSAGES")) + (falsify-string (getenv "LC_ALL")) "en") 2))) -- cgit v1.2.3