# [PATCH v2] fetch-pack: parameterize message containing 'ready' keyword 3 messages from 2021-11-18 to 2021-11-18. Participants: Bagas Sanjaya, Eric Sunshine, Ævar Arnfjörð Bjarmason. Thread: https://gitlist.dev/t/56933 ## Bagas Sanjaya, 2021-11-18 10:34 Subject: [PATCH v2] fetch-pack: parameterize message containing 'ready' keyword Message-ID: <20211118103424.6464-1-bagasdotme@gmail.com> URL: https://gitlist.dev/e/20211118103424.6464-1-bagasdotme%40gmail.com ``` 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 --- Changes since v1 [1]: - Parameterize message (suggested by Ævar) [1]: https://lore.kernel.org/git/20211114073143.84004-1-bagasdotme@gmail.com/T/#u fetch-pack.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fetch-pack.c b/fetch-pack.c index a9604f35a3..b8a20778bb 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -1410,9 +1410,13 @@ 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 no '%s"), "ready"); return 0; } base-commit: cd3e606211bb1cf8bc57f7d76bab98cc17a150bc -- An old man doll... just what I always wanted! - Clara ``` ## Eric Sunshine, 2021-11-18 11:42 Subject: Re: [PATCH v2] fetch-pack: parameterize message containing 'ready' keyword Message-ID: URL: https://gitlist.dev/e/CAPig%2BcTKNYCoiRiDyi-KxxvheiYJ4rAxFY7vHx-r%2BqNyXYHNjA%40mail.gmail.com In-Reply-To: <20211118103424.6464-1-bagasdotme@gmail.com> ``` On Thu, Nov 18, 2021 at 5:35 AM Bagas Sanjaya 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 > --- > 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. > return 0; > } ``` ## Ævar Arnfjörð Bjarmason, 2021-11-18 13:21 Subject: Re: [PATCH v2] fetch-pack: parameterize message containing 'ready' keyword Message-ID: <211118.864k8961hw.gmgdl@evledraar.gmail.com> URL: https://gitlist.dev/e/211118.864k8961hw.gmgdl%40evledraar.gmail.com In-Reply-To: ``` On Thu, Nov 18 2021, Eric Sunshine wrote: > On Thu, Nov 18, 2021 at 5:35 AM Bagas Sanjaya 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 >> --- >> 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". ```