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>

diff --git a/git-am.sh b/git-am.sh
index aef2a1bd14f043b789b0b6654234bf9d2d1f99bf..efce63a4ee399eb38d4fa66442a9af4f50ae58ed 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -258,7 +258,7 @@ split_patches () {
        stgit-series)
                if test $# -ne 1
                then
        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"
                fi
                series_dir=`dirname "$1"`
                series_file="$1"


@@ -310,9 +310,9 @@ split_patches () {
                ;;
        *)
                if test -n "$parse_patch" ; then
                ;;
        *)
                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
                else

-                       clean_abort "Patch format detection failed."
+                       clean_abort "$(gettext "Patch format detection failed.")"

                fi
                ;;
        esac
                fi
                ;;
        esac