kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

i18n: git-am eval_gettext messages 

Messages that use variables to be interpolated need to use
eval_gettext(), this wrapper will eval the message and expand the
variable for us.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Ævar Arnfjörð Bjarmason 2011-05-21 18:43:45 +00:00 committed by Junio C Hamano
parent bd8643ae51
commit a4372c373b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
git-am.sh
View File

@ -99,9 +99,9 @@ stop_here_user_resolve () {
printf '%s\n' "$resolvemsg" printf '%s\n' "$resolvemsg"
stop_here $1 stop_here $1
fi fi
echo "When you have resolved this problem run \"$cmdline --resolved\"." eval_gettext "When you have resolved this problem run \"\$cmdline --resolved\".
echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"." If you would prefer to skip this patch, instead run \"\$cmdline --skip\".
echo "To restore the original branch and stop patching run \"$cmdline --abort\"." To restore the original branch and stop patching run \"\$cmdline --abort\"."; echo


stop_here $1 stop_here $1
} }
@ -608,9 +608,9 @@ do
go_next && continue go_next && continue


test -s "$dotest/patch" || { test -s "$dotest/patch" || {
echo "Patch is empty. Was it split wrong?" eval_gettext "Patch is empty. Was it split wrong?
echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"." If you would prefer to skip this patch, instead run \"\$cmdline --skip\".
echo "To restore the original branch and stop patching run \"$cmdline --abort\"." To restore the original branch and stop patching run \"\$cmdline --abort\"."; echo
stop_here $this stop_here $this
} }
rm -f "$dotest/original-commit" "$dotest/author-script" rm -f "$dotest/original-commit" "$dotest/author-script"