From a5c0d8bc557affbcb58a4d2cb0059604e0cb89fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 6 Sep 2015 15:47:06 +0200 Subject: [PATCH] ui: Change 'P_' to return the empty string when passed the empty string. Reported by Mathieu Lirzin at . * guix/ui.scm (P_): Check whether MSGID is empty, and return it if it is. --- guix/ui.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/guix/ui.scm b/guix/ui.scm index 8de8e3c863..2f757547cf 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -99,7 +99,15 @@ (define _ (cut gettext <> %gettext-domain)) (define N_ (cut ngettext <> <> <> %gettext-domain)) -(define P_ (cut gettext <> %package-text-domain)) + +(define (P_ msgid) + "Return the translation of the package description or synopsis MSGID." + ;; Descriptions/synopses might occasionally be empty strings, even if that + ;; is something we try to avoid. Since (gettext "") can return a non-empty + ;; string, explicitly check for that case. + (if (string-null? msgid) + msgid + (gettext msgid %package-text-domain))) (define-syntax-rule (define-diagnostic name prefix) "Create a diagnostic macro (i.e., NAME), which will prepend PREFIX to all