# [PATCH v4] fetch-pack: parameterize message containing 'ready' keyword 3 messages from 2021-12-22 to 2021-12-23. Participants: Bagas Sanjaya, Ævar Arnfjörð Bjarmason, Junio C Hamano. Thread: https://gitlist.dev/t/57136 ## Bagas Sanjaya, 2021-12-22 07:58 Subject: [PATCH v4] fetch-pack: parameterize message containing 'ready' keyword Message-ID: <20211222075805.19027-1-bagasdotme@gmail.com> URL: https://gitlist.dev/e/20211222075805.19027-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 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 ``` ## Ævar Arnfjörð Bjarmason, 2021-12-22 08:06 Subject: Re: [PATCH v4] fetch-pack: parameterize message containing 'ready' keyword Message-ID: <211222.86a6gtoyg2.gmgdl@evledraar.gmail.com> URL: https://gitlist.dev/e/211222.86a6gtoyg2.gmgdl%40evledraar.gmail.com In-Reply-To: <20211222075805.19027-1-bagasdotme@gmail.com> ``` On Wed, Dec 22 2021, 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 > --- > 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! ``` ## Junio C Hamano, 2021-12-23 01:24 Subject: Re: [PATCH v4] fetch-pack: parameterize message containing 'ready' keyword Message-ID: URL: https://gitlist.dev/e/xmqqtuf0cdvw.fsf%40gitster.g In-Reply-To: <211222.86a6gtoyg2.gmgdl@evledraar.gmail.com> ``` Ævar Arnfjörð Bjarmason writes: >> 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! Trusting your ack wasted me one integration cycle by not looking at it myself X-<. There is "no" missing from the latter message. Back to finishing today's (belated) integration cycle. Hopefully I can finish before dinner. Thanks. ```