Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
i18n: git-am one-line gettext $msg; echo
author
Ævar Arnfjörð Bjarmason
<avarab@gmail.com>
Sat, 21 May 2011 18:43:43 +0000
(18:43 +0000)
committer
Junio C Hamano
<gitster@pobox.com>
Sat, 21 May 2011 18:57:13 +0000
(11:57 -0700)
One-line `gettext $msg; echo' messages are the simplest use case for
gettext(1).
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-am.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
b9a9726
)
diff --git
a/git-am.sh
b/git-am.sh
index 79c5ea2a573fa5c70a1396b96af34fa221f5d6b8..f54f13d984858f107aea7f2fd4b3f714f3f1dc27 100755
(executable)
--- a/
git-am.sh
+++ b/
git-am.sh
@@
-115,7
+115,7
@@
go_next () {
cannot_fallback () {
echo "$1"
cannot_fallback () {
echo "$1"
- echo "Cannot fall back to three-way merge."
+ gettext "Cannot fall back to three-way merge."; echo
exit 1
}
exit 1
}
@@
-645,7
+645,7
@@
do
if test -z "$GIT_AUTHOR_EMAIL"
then
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
stop_here $this
fi
@@
-696,7
+696,7
@@
do
action=again
while test "$action" = again
do
action=again
while test "$action" = again
do
- echo "Commit Body is:"
+ gettext "Commit Body is:"; echo
echo "--------------------------"
cat "$dotest/final-commit"
echo "--------------------------"
echo "--------------------------"
cat "$dotest/final-commit"
echo "--------------------------"