Re: [PATCH v4] fetch-pack: parameterize message containing 'ready' keyword
On Wed, Dec 22 2021, Bagas Sanjaya wrote:
Show 40 quoted lines
> 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: 69a9c10c95e28df457e33b3c7400b16caf2e2962This version (and earlier ones, really) looks good to me. Thanks!