From d80decbb9e922845486e983c2433347354bc4cd7 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 28 Dec 2022 19:03:26 +0000
Subject: tainted-objects: Prepare the error message for translation

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 Debian/Dgit.pm | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'Debian')

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 25a149f..7a4d76e 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -962,29 +962,35 @@ sub tainted_objects_message ($$) {
     my $msg = '';
 
     my $timeshow = defined $ti->{time}
-      ? " at time ".strftime("%Y-%m-%d %H:%M:%S Z", gmtime $ti->{time})
+      ? strftime("%Y-%m-%d %H:%M:%S Z", gmtime $ti->{time})
       : "";
 
-    my $pkgshow = length $ti->{package}
-      ? "package $ti->{package}"
-      : "any package";
+    my $infoshow = length $timeshow && length $ti->{package} ?
+      f_ "Taint recorded at time %s for package %s", $timeshow, $ti->{package},
+	         : length $timeshow && !length $ti->{package} ?
+      f_ "Taint recorded at time %s for any package", $timeshow,
+	         : !length $timeshow && length $ti->{package} ?
+      f_ "Taint recorded for package %s", $ti->{package},
+	         : !length $timeshow && !length $ti->{package} ?
+      __ "Taint recorded for any package"
+                 : confess;
 
     $msg .= <<END;
 
 History contains tainted $ti->{gitobjtype} $ti->{gitobjid}
-Taint recorded$timeshow for $pkgshow
+$infoshow
 Reason: $ti->{comment}
 END
 
     $msg .=
-        !defined $override_status ? <<END
+        !defined $override_status ? __ <<END
 Uncorrectable error.  If confused, consult administrator.
 END
-      : !length $override_status ? <<END
+      : !length $override_status ? __ <<END
 Could be forced using --deliberately.  Consult documentation.
 END
-      : <<END;
-Forcing due to $override_status
+      : f_ <<END, $override_status;
+Forcing due to %s
 END
 
     return $msg;
-- 
cgit v1.2.3