From 81dd2fe542f68d1f4c286806ce1560b269c79275 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Sat, 21 May 2011 18:43:43 +0000 Subject: [PATCH] i18n: git-am one-line gettext $msg; echo MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit One-line `gettext $msg; echo' messages are the simplest use case for gettext(1). Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- git-am.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/git-am.sh b/git-am.sh index 79c5ea2a57..f54f13d984 100755 --- a/git-am.sh +++ b/git-am.sh @@ -115,7 +115,7 @@ go_next () { cannot_fallback () { echo "$1" - echo "Cannot fall back to three-way merge." + gettext "Cannot fall back to three-way merge."; echo exit 1 } @@ -645,7 +645,7 @@ do if test -z "$GIT_AUTHOR_EMAIL" then - echo "Patch does not have a valid e-mail address." + gettext "Patch does not have a valid e-mail address."; echo stop_here $this fi @@ -696,7 +696,7 @@ do action=again while test "$action" = again do - echo "Commit Body is:" + gettext "Commit Body is:"; echo echo "--------------------------" cat "$dotest/final-commit" echo "--------------------------" -- 2.11.4.GIT