diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-12-20 09:36:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-20 09:36:23 -0800 |
| commit | acefe2be287b099886f1240bd1f5adfa66dbadee (patch) | |
| tree | 5de1e456fac773cd31c74ac2efc9b2d06ad332d4 | |
| parent | 415c7dd026e4649bea48c35ccbe29d2fa8b69be5 (diff) | |
| download | git-acefe2be287b099886f1240bd1f5adfa66dbadee.tar.gz | |
i18n: fix misconversion in shell scriptsva/i18n-even-more
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>
| -rw-r--r-- | git-rebase--interactive.sh | 3 | ||||
| -rw-r--r-- | git-sh-setup.sh | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index a545d92c26..c5806859f0 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -467,7 +467,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.")" diff --git a/git-sh-setup.sh b/git-sh-setup.sh index 2eda134800..c7b2a95463 100644 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -194,14 +194,14 @@ require_work_tree_exists () { if test "z$(git rev-parse --is-bare-repository)" != zfalse then program_name=$0 - die "$(gettext "fatal: \$program_name cannot be used without a working tree.")" + die "$(eval_gettext "fatal: \$program_name cannot be used without a working tree.")" fi } require_work_tree () { test "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = true || { program_name=$0 - die "$(gettext "fatal: \$program_name cannot be used without a working tree.")" + die "$(eval_gettext "fatal: \$program_name cannot be used without a working tree.")" } } |