From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Tue, 7 Sep 2010 14:20:05 +0000 (+0000)
Subject: gettextize: git-am one-line gettext $msg; echo
X-Git-Tag: ko-pu~10^2~62
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e99631f018aa3633e6f36eb48be152cc9f84a1a1;p=git.git

gettextize: git-am one-line gettext $msg; echo

One-line `gettext $msg; echo' messages are the simplest use case for
gettext(1).

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---

diff --git a/git-am.sh b/git-am.sh
index cfad206d6..33a1c8713 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -93,7 +93,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
 }
 
@@ -629,7 +629,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
 
@@ -680,7 +680,7 @@ do
 	    action=again
 	    while test "$action" = again
 	    do
-		echo "Commit Body is:"
+		gettext "Commit Body is:"; echo
 		echo "--------------------------"
 		cat "$dotest/final-commit"
 		echo "--------------------------"