Re: Bug report: $program_name in error message
From: Vasco Almeida <hidden>
Date: 2016-12-20 14:17:25
Possibly related (same subject, not in this thread)
- 2016-12-20 · Re: Bug report: $program_name in error message · Junio C Hamano <hidden>
- 2016-12-19 · Re: Bug report: $program_name in error message · Junio C Hamano <hidden>
- 2016-12-19 · Re: Bug report: $program_name in error message · Stefan Beller <hidden>
- 2016-12-18 · Re: Bug report: $program_name in error message · Josh Bleecher Snyder <hidden>
- 2016-12-18 · Re: Bug report: $program_name in error message · Stefan Beller <hidden>
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:
quoted hunk ↗ jump to hunk
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 <redacted> --- 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")"