[PATCH v4 59/73] gettextize: git-status "renamed: " message
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Feb 22, 2011, 23:42 UTC
- Message-ID
- <1298418152-27789-60-git-send-email-avarab@gmail.com>
- In-Reply-To
- <7vhbbwdjnm.fsf@alter.siamese.dyndns.org>
Gettextize the "renamed: %s -> %s" message which appears as part of git-status(1) output. Two tests in t4001-diff-rename.sh explicitly checked for this message. Change them to skip under GETTEXT_POISON=YesPlease.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- t/t4001-diff-rename.sh | 4 ++-- wt-status.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh index 71bac83..cad8545 100755 --- a/t/t4001-diff-rename.sh +++ b/t/t4001-diff-rename.sh @@ -64,7 +64,7 @@ test_expect_success \ 'validate the output.' \ 'compare_diff_patch current expected' -test_expect_success 'favour same basenames over different ones' ' +test_expect_success C_LOCALE_OUTPUT 'favour same basenames over different ones' ' cp path1 another-path && git add another-path && git commit -m 1 && @@ -73,7 +73,7 @@ test_expect_success 'favour same basenames over different ones' ' git mv another-path subdir/path1 && git status | grep "renamed: .*path1 -> subdir/path1"' -test_expect_success 'favour same basenames even with minor differences' ' +test_expect_success C_LOCALE_OUTPUT 'favour same basenames even with minor differences' ' git show HEAD:path1 | sed "s/15/16/" > subdir/path1 && git status | grep "renamed: .*path1 -> subdir/path1"' diff --git a/wt-status.c b/wt-status.c index ad6ef7a..ed6bedd 100644 --- a/wt-status.c +++ b/wt-status.c @@ -201,7 +201,7 @@ static void wt_status_print_change_data(struct wt_status *s, color_fprintf(s->fp, c, _("modified: %s"), one); break; case DIFF_STATUS_RENAMED: - color_fprintf(s->fp, c, "renamed: %s -> %s", one, two); + color_fprintf(s->fp, c, _("renamed: %s -> %s"), one, two); break; case DIFF_STATUS_TYPE_CHANGED: color_fprintf(s->fp, c, _("typechange: %s"), one);
-- 1.7.2.3