Skip to content

Commit d2b044b

Browse files
avargitster
authored andcommitted
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>
1 parent b3b298a commit d2b044b

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

t/t4001-diff-rename.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ test_expect_success \
6464
'validate the output.' \
6565
'compare_diff_patch current expected'
6666

67-
test_expect_success 'favour same basenames over different ones' '
67+
test_expect_success C_LOCALE_OUTPUT 'favour same basenames over different ones' '
6868
cp path1 another-path &&
6969
git add another-path &&
7070
git commit -m 1 &&
@@ -73,7 +73,7 @@ test_expect_success 'favour same basenames over different ones' '
7373
git mv another-path subdir/path1 &&
7474
git status | grep "renamed: .*path1 -> subdir/path1"'
7575

76-
test_expect_success 'favour same basenames even with minor differences' '
76+
test_expect_success C_LOCALE_OUTPUT 'favour same basenames even with minor differences' '
7777
git show HEAD:path1 | sed "s/15/16/" > subdir/path1 &&
7878
git status | grep "renamed: .*path1 -> subdir/path1"'
7979

wt-status.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ static void wt_status_print_change_data(struct wt_status *s,
275275
status_printf_more(s, c, _("modified: %s"), one);
276276
break;
277277
case DIFF_STATUS_RENAMED:
278-
status_printf_more(s, c, "renamed: %s -> %s", one, two);
278+
status_printf_more(s, c, _("renamed: %s -> %s"), one, two);
279279
break;
280280
case DIFF_STATUS_TYPE_CHANGED:
281281
status_printf_more(s, c, _("typechange: %s"), one);

0 commit comments

Comments
 (0)