git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date
Dec 22, 2021, 08:06 UTC
Message-ID
<211222.86a6gtoyg2.gmgdl@evledraar.gmail.com>
In-Reply-To
<20211222075805.19027-1-bagasdotme@gmail.com>
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: 69a9c10c95e28df457e33b3c7400b16caf2e2962
This version (and earlier ones, really) looks good to me. Thanks!
Previous: Bagas SanjayaNext: Junio C Hamano
Message 2 of 3 in “fetch-pack: parameterize message containing 'ready' keyword”
  1. fetch-pack: parameterize message containing 'ready' keywordBagas Sanjaya, Dec 22, 2021
  2. Ævar Arnfjörð BjarmasonDec 22, 2021
  3. Junio C HamanoDec 23, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.