From: Junio C Hamano <gitster@pobox.com>
To: Okhuomon Ajayi <okhuomonajayi54@gmail.com>
Cc: git@vger.kernel.org, christian.couder@gmail.com,
usmanakinyemi202@gmail.com, siddharthasthana31@gmail.com,
kaartic.sivaraam@gmail.com
Subject: Re: [Outreachy PATCH] delta-islands: use Q_() for island count
Date: Tue, 13 Oct 2026 11:00:10 -0700 [thread overview]
Message-ID: <xmqqv775xyz9.fsf@gitster.g> (raw)
In-Reply-To: <20261013164922.93099-1-okhuomonajayi54@gmail.com> (Okhuomon Ajayi's message of "Tue, 13 Oct 2026 17:49:22 +0100")
Okhuomon Ajayi <okhuomonajayi54@gmail.com> writes:
> The progress message "Marked %d islands, done." is marked for
> translation with _(), which gives translators a single form for
> every count. It reads wrongly when only one island is marked, and
> languages with more than two plural forms cannot translate it
> correctly.
>
> Use Q_() with a singular and a plural form so the right one is
> picked from island_counter.
Nicely written.
>
> Found with:
>
> git grep '[^Q]_("[^"]*%[id]' -- '*.c'
I am not sure of the value in this, though. You certainly do not
mean to say that you updated all of the ones that you found with the
above. You are not inviting others to do the same grep and "fix"
any of the hits, as the pattern gives too many false positives
(i.e., not all %d are about number of things, like the line number a
parser has found the error it is reporting at), and without warning
that, it would not be helpful to these others.
> Signed-off-by: Okhuomon Ajayi <okhuomonajayi54@gmail.com>
> ---
> delta-islands.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/delta-islands.c b/delta-islands.c
> index e71a7e1c05..c1c0f992f5 100644
> --- a/delta-islands.c
> +++ b/delta-islands.c
> @@ -496,7 +496,9 @@ void load_delta_islands(struct repository *r, int progress)
> free_remote_islands(ild.remote_islands);
>
> if (progress)
> - fprintf(stderr, _("Marked %d islands, done.\n"), island_counter);
> + fprintf(stderr, Q_("Marked %d island, done.\n",
> + "Marked %d islands, done.\n", island_counter),
> + island_counter);
The change itself looks sensible to me.
Thanks.
next prev parent reply other threads:[~2026-10-13 18:00 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-13 14:25 [Outreachy] Introduction: Okhuomon Ajayi, microproject in delta-islands.c Okhuomon Ajayi
2026-10-13 16:49 ` [Outreachy PATCH] delta-islands: use Q_() for island count Okhuomon Ajayi
2026-10-13 18:00 ` Junio C Hamano [this message]
2026-10-13 19:44 ` Okhuomon Ajayi
2026-10-13 20:33 ` Junio C Hamano
2026-10-13 20:30 ` [Outreachy PATCH v2] " Okhuomon Ajayi
2026-10-13 20:13 ` [Outreachy] Introduction: Okhuomon Ajayi, microproject in delta-islands.c Usman Akinyemi
2026-10-13 20:32 ` Okhuomon Ajayi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqv775xyz9.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=kaartic.sivaraam@gmail.com \
--cc=okhuomonajayi54@gmail.com \
--cc=siddharthasthana31@gmail.com \
--cc=usmanakinyemi202@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.