[PATCH 14/20] gettextize: git-am eval_gettext messages
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Sep 7, 2010, 16:48 UTC
- Message-ID
- <1283878113-19533-5-git-send-email-avarab@gmail.com>
- In-Reply-To
- <1283877955-19105-1-git-send-email-avarab@gmail.com>
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> --- git-am.sh | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/git-am.sh b/git-am.sh index 73a4046..98819e6 100755 --- a/git-am.sh +++ b/git-am.sh @@ -77,9 +77,9 @@ stop_here_user_resolve () { 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 } @@ -592,9 +592,9 @@ do 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"
-- 1.7.2.3.313.gcd15