From 32813e8440ff15c9389b84b1d7450fe1d3d25bb2 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Tue, 9 Apr 2019 23:06:38 +0200
Subject: ui: Fix i18n for diagnostic messages.

Until now, we'd pass 'gettext' the "augmented" format string, which
'gettext' would not find in message catalogs.  Now we pass it FMT as is,
which is what catalogs contain.

* guix/ui.scm (define-diagnostic)[augmented-format-string]: Remove.
Emit one 'format' call to print the prefix, and a second one to print
the actual message.
---
 guix/ui.scm | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

(limited to 'guix/ui.scm')

diff --git a/guix/ui.scm b/guix/ui.scm
index c2807b711f..c57d206184 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -129,28 +129,24 @@
 messages."
   (define-syntax name
     (lambda (x)
-      (define (augmented-format-string fmt)
-        (string-append "~:[~*~;guix ~a: ~]~a" (syntax->datum fmt)))
-
       (syntax-case x ()
         ((name (underscore fmt) args (... ...))
          (and (string? (syntax->datum #'fmt))
               (free-identifier=? #'underscore #'G_))
-         (with-syntax ((fmt*   (augmented-format-string #'fmt))
-                       (prefix (datum->syntax x prefix)))
-           #'(format (guix-warning-port) (gettext fmt*)
-                     (program-name) (program-name) prefix
+         #'(begin
+             (format (guix-warning-port) "~:[~*~;guix ~a: ~]~a"
+                     (program-name) (program-name) prefix)
+             (format (guix-warning-port) (gettext fmt)
                      args (... ...))))
         ((name (N-underscore singular plural n) args (... ...))
          (and (string? (syntax->datum #'singular))
               (string? (syntax->datum #'plural))
               (free-identifier=? #'N-underscore #'N_))
-         (with-syntax ((s      (augmented-format-string #'singular))
-                       (p      (augmented-format-string #'plural))
-                       (prefix (datum->syntax x prefix)))
-           #'(format (guix-warning-port)
-                     (ngettext s p n %gettext-domain)
-                     (program-name) (program-name) prefix
+         #'(begin
+             (format (guix-warning-port) "~:[~*~;guix ~a: ~]~a"
+                     (program-name) (program-name) prefix)
+             (format (guix-warning-port)
+                     (ngettext singular plural n %gettext-domain)
                      args (... ...))))))))
 
 (define-diagnostic warning "warning: ") ; emit a warning
-- 
cgit v1.2.3