From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Thu, 18 Nov 2021 13:21:33 GMT
Subject: Re: [PATCH v2] fetch-pack: parameterize message containing 'ready' keyword
Message-ID: <211118.864k8961hw.gmgdl@evledraar.gmail.com>
In-Reply-To: <CAPig+cTKNYCoiRiDyi-KxxvheiYJ4rAxFY7vHx-r+qNyXYHNjA@mail.gmail.com>


On Thu, Nov 18 2021, Eric Sunshine wrote:

> On Thu, Nov 18, 2021 at 5:35 AM Bagas Sanjaya <bagasdotme@gmail.com> wrote:
>> 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>
>> ---
>> diff --git a/fetch-pack.c b/fetch-pack.c
>> @@ -1410,9 +1410,13 @@ static int process_ack(struct fetch_negotiator *negotiator,
>>         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");
>
> Missing closing single-quote after %s.
>
>>         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");
>
> Missing closing single-quote after %s.

Also s/be sent after no/be sent after/, i.e. there's a stray "no".