diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-02-22 23:42:18 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-10 07:52:57 (GMT) |
| commit | d2b044bee5c174647003056e4ba23207e9b26ca6 (patch) | |
| tree | 89747d15e859979bab76dfba0e6859d9a4d12c3e | |
| parent | b3b298afcbcb5cf5b497928fc9bcd17624112233 (diff) | |
| download | git-d2b044bee5c174647003056e4ba23207e9b26ca6.zip git-d2b044bee5c174647003056e4ba23207e9b26ca6.tar.gz git-d2b044bee5c174647003056e4ba23207e9b26ca6.tar.bz2 | |
i18n: git-status "renamed: " message
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t4001-diff-rename.sh | 4 | ||||
| -rw-r--r-- | 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 f0b8c68..9ff0590 100644 --- a/wt-status.c +++ b/wt-status.c @@ -275,7 +275,7 @@ static void wt_status_print_change_data(struct wt_status *s, status_printf_more(s, c, _("modified: %s"), one); break; case DIFF_STATUS_RENAMED: - status_printf_more(s, c, "renamed: %s -> %s", one, two); + status_printf_more(s, c, _("renamed: %s -> %s"), one, two); break; case DIFF_STATUS_TYPE_CHANGED: status_printf_more(s, c, _("typechange: %s"), one); |