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>

diff --git a/git-am.sh b/git-am.sh
index 5a152b0878f206539a64c90cc4f8dce969845e43..7c0273c9add34f823739d5f87d6fb9c5f2255120 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -99,9 +99,9 @@ stop_here_user_resolve () {
            printf '%s\n' "$resolvemsg"
            stop_here $1
     fi
            printf '%s\n' "$resolvemsg"
            stop_here $1
     fi

-    echo "When you have resolved this problem run \"$cmdline --resolved\"."
-    echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"."
-    echo "To restore the original branch and stop patching run \"$cmdline --abort\"."
+    eval_gettext "When you have resolved this problem run \"\$cmdline --resolved\".
+If you would prefer to skip this patch, instead run \"\$cmdline --skip\".
+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
 
                test -s "$dotest/patch" || {
                        go_next && continue
 
                test -s "$dotest/patch" || {

-                       echo "Patch is empty.  Was it split wrong?"
-                       echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"."
-                       echo "To restore the original branch and stop patching run \"$cmdline --abort\"."
+                       eval_gettext "Patch is empty.  Was it split wrong?
+If you would prefer to skip this patch, instead run \"\$cmdline --skip\".
+To restore the original branch and stop patching run \"\$cmdline --abort\"."; echo

                        stop_here $this
                }
                rm -f "$dotest/original-commit" "$dotest/author-script"
                        stop_here $this
                }
                rm -f "$dotest/original-commit" "$dotest/author-script"