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>
Ævar Arnfjörð Bjarmason committed
Feb 22, 2011 at 23:42 UTC
d2b044bee5c174647003056e4ba23207e9b26ca6
2 files changed
+3
-3
t/t4001-diff-rename.sh
+2
-2
@@ -64,7 +64,7 @@ test_expect_success \
64
'validate the output.' \
65
'compare_diff_patch current expected'
66
67
-test_expect_success 'favour same basenames over different ones' '
67
+test_expect_success C_LOCALE_OUTPUT 'favour same basenames over different ones' '
68
cp path1 another-path &&
69
git add another-path &&
70
git commit -m 1 &&
@@ -73,7 +73,7 @@ test_expect_success 'favour same basenames over different ones' '
73
git mv another-path subdir/path1 &&
74
git status | grep "renamed: .*path1 -> subdir/path1"'
75
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' '
77
git show HEAD:path1 | sed "s/15/16/" > subdir/path1 &&
78
git status | grep "renamed: .*path1 -> subdir/path1"'
79
wt-status.c
+1
-1
@@ -275,7 +275,7 @@ static void wt_status_print_change_data(struct wt_status *s,
275
status_printf_more(s, c, _("modified: %s"), one);
276
break;
277
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);
279
break;
280
case DIFF_STATUS_TYPE_CHANGED:
281
status_printf_more(s, c, _("typechange: %s"), one);