diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-12-27 00:11:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-27 00:11:45 -0800 |
| commit | eef32a0653f9b4e90ace46c9f041ff41dbf4e632 (patch) | |
| tree | 6ffa066e35d25d17d3f657a5e7e793bdfa3dc53f | |
| parent | ad1b4e2c0e5521da39e13088f197b256303a2fc8 (diff) | |
| parent | acefe2be287b099886f1240bd1f5adfa66dbadee (diff) | |
| download | git-eef32a0653f9b4e90ace46c9f041ff41dbf4e632.tar.gz | |
Merge branch 'va/i18n-even-more'
* va/i18n-even-more:
i18n: fix misconversion in shell scripts
| -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 41fd374c72..b0a6f2b7ba 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.")" diff --git a/git-sh-setup.sh b/git-sh-setup.sh index 240c7ebcd1..378928518b 100644 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -196,14 +196,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.")" } } |