[PATCH v2] fetch-pack: parameterize message containing 'ready' keyword
flat view
STALE1786d
From: Bagas Sanjaya <hidden>
Date: 2021-11-18 10:35:34
Subsystem:
the rest · Maintainer:
Linus Torvalds
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 <redacted> --- Changes since v1 [1]: - Parameterize message (suggested by Ævar) [1]: https://lore.kernel.org/git/20211114073143.84004-1-bagasdotme@gmail.com/T/#u (local) fetch-pack.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/fetch-pack.c b/fetch-pack.c
index a9604f35a3..b8a20778bb 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c@@ -1410,9 +1410,13 @@ 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; }
base-commit: cd3e606211bb1cf8bc57f7d76bab98cc17a150bc -- An old man doll... just what I always wanted! - Clara