diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-05-21 18:43:52 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-05-21 11:57:14 -0700 |
| commit | dff1a98350c97c6ce207c582c8fd042bc6c04cd2 (patch) | |
| tree | 3ffed10778ec8745ba197c3e6fc84cb8abd72e66 /git-am.sh | |
| parent | i18n: git-am "Falling back" say message (diff) | |
| download | tgif-dff1a98350c97c6ce207c582c8fd042bc6c04cd2.tar.xz | |
i18n: git-am core say messages
Make the core git-am messages that use say() translatable. These are
visible on almost every git am invocation.
There are tests that depend on the "Applying" output that need to be
changed to use the test_i18* functions along with this translation.
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 | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -742,7 +742,7 @@ To restore the original branch and stop patching run \"\$cmdline --abort\"."; ec stop_here $this fi - say "Applying: $FIRSTLINE" + say "$(eval_gettext "Applying: \$FIRSTLINE")" case "$resolved" in '') @@ -787,7 +787,7 @@ did you forget to use 'git add'?"; echo # Applying the patch to an earlier tree and merging the # result may have produced the same tree as ours. git diff-index --quiet --cached HEAD -- && { - say No changes -- Patch already applied. + say "$(gettext "No changes -- Patch already applied.")" go_next continue } @@ -813,7 +813,7 @@ did you forget to use 'git add'?"; echo GIT_AUTHOR_DATE= fi parent=$(git rev-parse --verify -q HEAD) || - say >&2 "applying to an empty history" + say >&2 "$(gettext "applying to an empty history")" if test -n "$committer_date_is_author_date" then |