i18n: fix misconversion in shell scripts
An earlier series that was merged at 2703572b3a ("Merge branch 'va/i18n-even-more'", 2016-07-13) failed to use $(eval_gettext "string with \$variable interpolation") and instead used gettext in a few places, and ended up showing the variable names in the message, e.g. $ git submodule fatal: $program_name cannot be used without a working tree. Catch these mistakes with $ git grep -n '[^_]gettext .*\\\$' and fix them all to use eval_gettext instead. Reported-by: Josh Bleecher Snyder Acked-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Dec 20, 2016 at 09:36 UTC
acefe2be287b099886f1240bd1f5adfa66dbadee
2 files changed
+4
-3
git-rebase--interactive.sh
+2
-1
@@ -467,7 +467,8 @@ update_squash_messages () {
467
}' <"$squash_msg".bak
468
} >"$squash_msg"
469
else
470
- commit_message HEAD > "$fixup_msg" || die "$(gettext "Cannot write \$fixup_msg")"
470
+ commit_message HEAD >"$fixup_msg" ||
471
+ die "$(eval_gettext "Cannot write \$fixup_msg")"
472
count=2
473
{
474
printf '%s\n' "$comment_char $(gettext "This is a combination of 2 commits.")"
git-sh-setup.sh
+2
-2
@@ -194,14 +194,14 @@ require_work_tree_exists () {
194
if test "z$(git rev-parse --is-bare-repository)" != zfalse
195
then
196
program_name=$0
197
- die "$(gettext "fatal: \$program_name cannot be used without a working tree.")"
197
+ die "$(eval_gettext "fatal: \$program_name cannot be used without a working tree.")"
198
fi
199
}
200
201
require_work_tree () {
202
test "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = true || {
203
program_name=$0
204
- die "$(gettext "fatal: \$program_name cannot be used without a working tree.")"
204
+ die "$(eval_gettext "fatal: \$program_name cannot be used without a working tree.")"
205
}
206
}
207