mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-19 08:14:00 +01:00
Code

i18n: git-am clean_abort messages

Browse Source 
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>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2011-05-21 18:43:49 +00:00 committed by Junio C Hamano
parent a424ca157f
commit d62a1461c3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-am.sh
View File

@ -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