From: Bagas Sanjaya <bagasdotme@gmail.com>
To: git@vger.kernel.org
Cc: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Junio C Hamano" <gitster@pobox.com>,
"Bagas Sanjaya" <bagasdotme@gmail.com>
Subject: [PATCH v4] fetch-pack: parameterize message containing 'ready' keyword
Date: Wed, 22 Dec 2021 14:58:06 +0700 [thread overview]
Message-ID: <20211222075805.19027-1-bagasdotme@gmail.com> (raw)
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>
---
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
next reply other threads:[~2021-12-22 7:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-22 7:58 Bagas Sanjaya [this message]
2021-12-22 8:06 ` [PATCH v4] fetch-pack: parameterize message containing 'ready' keyword Ævar Arnfjörð Bjarmason
2021-12-23 1:24 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211222075805.19027-1-bagasdotme@gmail.com \
--to=bagasdotme@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).