From: Junio C Hamano Date: Fri, 16 Oct 2026 15:51:14 GMT Subject: Re: [PATCH] describe: use Q_() for pluralization of commit and tag counts Message-ID: In-Reply-To: "Raj Ojha via GitGitGadget" writes: > From: Raj Ojha > > In `describe_commit()`, debug messages print the number of commits > traversed and the number of candidate tags found using basic `_()` > localization format strings: > > _("traversed %lu commits\n") > _("found %i tags; gave up search at %s\n") > > Because these messages display an integer count of items, using `_()` > fails to account for languages whose pluralization rules differ from > English (such as languages with multiple plural forms). > > Replace these calls with `Q_()` to allow gettext (`ngettext()`) to choose > the grammatically appropriate singular or plural string depending on the > integer count. > > Signed-off-by: Raj Ojha > --- Is this convergent evolution or something? The similarity to https://lore.kernel.org/git/20261013204351.428800-1-antekborowski11@gmail.com/ is striking. It's not like anybody who sent a change on a piece of code automatically owns the area to be improved, but we would love to see more collaboration and a better use of the lore archive to find similar effort being made before people send patches. https://lore.kernel.org/git/?q=describe+Q_ > describe: use Q_() for pluralization of commit and tag counts > > In describe_commit(), debug messages print the number of commits > traversed and the number of candidate tags found using basic _() > localization format strings: > > _("traversed %lu commits\n") > _("found %i tags; gave up search at %s\n") > > > Because these messages display an integer count of items, using _() > fails to account for languages whose pluralization rules differ from > English (such as languages with multiple plural forms). > > Replace these calls with Q_() to allow gettext (ngettext()) to choose > the grammatically appropriate singular or plural string depending on the > integer count. You do not want to repeat your log message below the three-dash line. It wastes everybody's time. > diff --git a/builtin/describe.c b/builtin/describe.c > index c0abc931a5..1a7317c811 100644 > --- a/builtin/describe.c > +++ b/builtin/describe.c > @@ -481,10 +481,16 @@ static void describe_commit(struct commit *cmit, struct strbuf *dst) > label_width, _(prio_names[t->name->prio]), > t->depth, t->name->path); > } > - fprintf(stderr, _("traversed %lu commits\n"), seen_commits); > + fprintf(stderr, > + Q_("traversed %lu commit\n", > + "traversed %lu commits\n", > + seen_commits), > + seen_commits); > if (gave_up_on) { > fprintf(stderr, > - _("found %i tags; gave up search at %s\n"), > + Q_("found %i tag; gave up search at %s\n", > + "found %i tags; gave up search at %s\n", > + max_candidates), > max_candidates, > oid_to_hex(&gave_up_on->object.oid)); > } Both the log message and patch text look cleanly done. Thanks.