From: Bagas Sanjaya <bagasdotme@gmail.com>
Date: Wed, 22 Dec 2021 07:58:06 +0000 (+0700)
Subject: fetch-pack: parameterize message containing 'ready' keyword
X-Git-Tag: v2.36.0-rc0~123^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d3c23b3a754cf5060a93d9f777e58662cdd5ffe;p=thirdparty%2Fgit.git

fetch-pack: parameterize message containing 'ready' keyword

The protocol keyword 'ready' isn't meant for translation. Pass it as
parameter instead of spell it in die() message (and potentially confuse
translators).

Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/fetch-pack.c b/fetch-pack.c
index 34987a2c30..3a98d66e81 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -1415,9 +1415,17 @@ static int process_ack(struct fetch_negotiator *negotiator,
 	 * otherwise.
 	 */
 	if (*received_ready && reader->status != PACKET_READ_DELIM)
-		die(_("expected packfile to be sent after 'ready'"));
+		/*
+		 * TRANSLATORS: The parameter will be 'ready', a protocol
+		 * keyword.
+		 */
+		die(_("expected packfile to be sent after '%s'"), "ready");
 	if (!*received_ready && reader->status != PACKET_READ_FLUSH)
-		die(_("expected no other sections to be sent after no 'ready'"));
+		/*
+		 * TRANSLATORS: The parameter will be 'ready', a protocol
+		 * keyword.
+		 */
+		die(_("expected no other sections to be sent after no '%s'"), "ready");
 
 	return 0;
 }