summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2022-02-23 16:58:03 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-02-23 16:58:03 -0800
commitc69e455bbced1ae89ff386af889b65ad0b3b0927 (patch)
treef2809925dc9735b7d574aca18975a2b38e8a71dc
parentThe sixth batch (diff)
parentfetch-pack: parameterize message containing 'ready' keyword (diff)
downloadtgif-c69e455bbced1ae89ff386af889b65ad0b3b0927.tar.xz
Merge branch 'bs/forbid-i18n-of-protocol-token-in-fetch-pack'
L10n support for a few error messages. * bs/forbid-i18n-of-protocol-token-in-fetch-pack: fetch-pack: parameterize message containing 'ready' keyword
-rw-r--r--fetch-pack.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/fetch-pack.c b/fetch-pack.c
index dd6ec449f2..dbcaaf4dbb 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;
}