diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-05-21 18:43:45 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-21 11:57:13 -0700 |
| commit | a4372c373bc4f1a36137af315a8f8fe20385203b (patch) | |
| tree | df0eec8b3a652f15ca0c8e20c5128c9eaa181d74 /git-am.sh | |
| parent | bd8643ae51622abadd47535ea2f7763282f7d8ec (diff) | |
| download | git-a4372c373bc4f1a36137af315a8f8fe20385203b.tar.gz | |
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>
Diffstat (limited to 'git-am.sh')
| -rwxr-xr-x | git-am.sh | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -99,9 +99,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 } @@ -608,9 +608,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" |