@matheusbsbs / matheus-bagliano / commits / e4fe4ba57a
Fork 0

i18n: git-grep "--open-files-in-pager" message

Gettextize the "--open-files-in-pager only works on the worktree" message. A test in t7811-grep-open.sh explicitly checked for this message. Change it 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:41 UTC e4fe4ba57ae32a5a1334db4206412e12333754a3
2 files changed +2 -2
builtin/grep.c
+1 -1
@@ -1061,7 +1061,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
1061 }
1062
1063 if (show_in_pager && (cached || list.nr))
1064 - die("--open-files-in-pager only works on the worktree");
1064 + die(_("--open-files-in-pager only works on the worktree"));
1065
1066 if (show_in_pager && opt.pattern_list && !opt.pattern_list->next) {
1067 const char *pager = path_list.items[0].string;
t/t7811-grep-open.sh
+1 -1
@@ -61,7 +61,7 @@ test_expect_success SIMPLEPAGER 'git grep -O' '
61 test_cmp empty out
62 '
63
64 -test_expect_success 'git grep -O --cached' '
64 +test_expect_success C_LOCALE_OUTPUT 'git grep -O --cached' '
65 test_must_fail git grep --cached -O GREP_PATTERN >out 2>msg &&
66 grep open-files-in-pager msg
67 '