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>
Ævar Arnfjörð Bjarmason committed
May 21, 2011 at 18:43 UTC
a4372c373bc4f1a36137af315a8f8fe20385203b
1 file changed
+6
-6
git-am.sh
+6
-6
@@ -99,9 +99,9 @@ stop_here_user_resolve () {
99
printf '%s\n' "$resolvemsg"
100
stop_here $1
101
fi
102
- echo "When you have resolved this problem run \"$cmdline --resolved\"."
103
- echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"."
104
- echo "To restore the original branch and stop patching run \"$cmdline --abort\"."
102
+ eval_gettext "When you have resolved this problem run \"\$cmdline --resolved\".
103
+If you would prefer to skip this patch, instead run \"\$cmdline --skip\".
104
+To restore the original branch and stop patching run \"\$cmdline --abort\"."; echo
105
106
stop_here $1
107
}
@@ -608,9 +608,9 @@ do
608
go_next && continue
609
610
test -s "$dotest/patch" || {
611
- echo "Patch is empty. Was it split wrong?"
612
- echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"."
613
- echo "To restore the original branch and stop patching run \"$cmdline --abort\"."
611
+ eval_gettext "Patch is empty. Was it split wrong?
612
+If you would prefer to skip this patch, instead run \"\$cmdline --skip\".
613
+To restore the original branch and stop patching run \"\$cmdline --abort\"."; echo
614
stop_here $this
615
}
616
rm -f "$dotest/original-commit" "$dotest/author-script"