[PATCH v4] fetch-pack: parameterize message containing 'ready' keyword

Subsystems: the rest

STALE1702d

2 messages, 2 authors, 2021-12-22 · open the first message on its own page

[PATCH v4] fetch-pack: parameterize message containing 'ready' keyword

From: Bagas Sanjaya <hidden>
Date: 2021-12-22 07:58:28

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 v3 [1]:
   - Comment style fix (suggested by Junio)

 [1]: https://lore.kernel.org/git/xmqqwnl0gkks.fsf@gitster.g/T/#u

 fetch-pack.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/fetch-pack.c b/fetch-pack.c
index 34987a2c30..51385cb3c9 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 '%s'"), "ready");
 
 	return 0;
 }
base-commit: 69a9c10c95e28df457e33b3c7400b16caf2e2962
-- 
An old man doll... just what I always wanted! - Clara

Re: [PATCH v4] fetch-pack: parameterize message containing 'ready' keyword

From: Ævar Arnfjörð Bjarmason <hidden>
Date: 2021-12-22 08:06:58

On Wed, Dec 22 2021, Bagas Sanjaya wrote:
quoted hunk
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 v3 [1]:
   - Comment style fix (suggested by Junio)

 [1]: https://lore.kernel.org/git/xmqqwnl0gkks.fsf@gitster.g/T/#u

 fetch-pack.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/fetch-pack.c b/fetch-pack.c
index 34987a2c30..51385cb3c9 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 '%s'"), "ready");
 
 	return 0;
 }
base-commit: 69a9c10c95e28df457e33b3c7400b16caf2e2962
This version (and earlier ones, really) looks good to me. Thanks!
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help