Re: Bug report: $program_name in error message

From: Vasco Almeida <vascomalmeida@sapo.pt>
Date: Dec 20, 2016, 14:16 UTC
Message-ID: <1482243418.2029.10.camel@sapo.pt>
In-Reply-To: <xmqqfuljod70.fsf@gitster.mtv.corp.google.com>

Thanks for the report and letting me know. Yes, these were mistakes and lack of attention mine. It was supposed to call 'eval_gettext' rather than 'gettext' when \$variable interpolation is needed. Junio Hamano has the right answer for these errors.

A Seg, 19-12-2016 às 12:50 -0800, Junio C Hamano escreveu:

Show 25 quoted lines

> Subject: rebase -i: fix mistaken i18n
> 
> f2d17068fd ("i18n: rebase-interactive: mark comments of squash for
> translation", 2016-06-17) attempted to apply sh-i18n and failed to
> use $(eval_gettext "string with \$variable interpolation").
> 
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
>  git-rebase--interactive.sh | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> index 41fd374c72..96865b2375 100644
> --- a/git-rebase--interactive.sh
> +++ b/git-rebase--interactive.sh
> @@ -437,7 +437,8 @@ update_squash_messages () {
>                         }' <"$squash_msg".bak
>                 } >"$squash_msg"
>         else
> -               commit_message HEAD > "$fixup_msg" || die "$(gettext "Cannot write \$fixup_msg")"
> +               commit_message HEAD >"$fixup_msg" ||
> +               die "$(eval_gettext "Cannot write \$fixup_msg")"
>                 count=2
>                 {
>                         printf '%s\n' "$comment_char $(gettext "This is a combination of 2 commits.")"

I agree with this fix. Perhaps indent the second line to be easier on the eyes?:

> +               commit_message HEAD >"$fixup_msg" ||
> +               	die "$(eval_gettext "Cannot write \$fixup_msg")"