diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-05-21 18:43:49 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-21 11:57:14 -0700 |
| commit | d62a1461c31e341bea9a25d54d09dcc1cd1a28a0 (patch) | |
| tree | dd12f5ebda0b9fd220f147d7f0af0683779075c2 | |
| parent | a424ca157fec59d0fd7f1fbd8c9b48059fa0b375 (diff) | |
| download | git-d62a1461c31e341bea9a25d54d09dcc1cd1a28a0.tar.gz | |
i18n: git-am clean_abort messages
Messages that used the clean_abort function needed both gettext(1) and
eval_gettext(). These need to be interpolated in a string like the die
and cannot_fallback messages.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | git-am.sh | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -258,7 +258,7 @@ split_patches () { stgit-series) if test $# -ne 1 then - clean_abort "Only one StGIT patch series can be applied at once" + clean_abort "$(gettext "Only one StGIT patch series can be applied at once")" fi series_dir=`dirname "$1"` series_file="$1" @@ -310,9 +310,9 @@ split_patches () { ;; *) if test -n "$parse_patch" ; then - clean_abort "Patch format $patch_format is not supported." + clean_abort "$(eval_gettext "Patch format \$patch_format is not supported.")" else - clean_abort "Patch format detection failed." + clean_abort "$(gettext "Patch format detection failed.")" fi ;; esac |