Re: [PATCH 2/3] sequencer: actually translate report in do_exec()

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 23, 2023, 20:43 UTC
Message-ID: <xmqqpm8z6vxk.fsf@gitster.g>
In-Reply-To: <20230323162234.995485-2-oswald.buddenhagen@gmx.de>

Oswald Buddenhagen <oswald.buddenhagen@gmx.de> writes:

> N_() is meant to be used on strings that are subsequently _()'d, which
> isn't the case here.

Correct. But the original does not look particularly a good way to allow people to translate the messages (namely, it splits a sentence in the middle and makes a sentence lego).

I wonder if it should prepare two full sentence messages, one for dirty case and the other for non-dirty case? In any case, I think the latter half of this big warning() should be done as an advice message that the user can squelch, so I wouldn't worry too much about it before that happens.

Thanks.

Show 18 quoted lines

> Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
> ---
>  sequencer.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sequencer.c b/sequencer.c
> index fda68cd33d..21748bbfb0 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -3628,7 +3628,7 @@ static int do_exec(struct repository *r, const char *command_line)
>  			  "  git rebase --continue\n"
>  			  "\n"),
>  			command_line,
> -			dirty ? N_("and made changes to the index and/or the "
> +			dirty ? _("and made changes to the index and/or the "
>  				"working tree.\n") : "");
>  		if (status == 127)
>  			/* command not found */