mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
i18n: git-branch "git branch -v" messages
Make the "git branch -v" messages translatable, e.g.: 5054b57 [ahead 8] branch error fixup This is possibly a plumbing message. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
8af42b0f77
commit
a5760906e7
|
@ -373,11 +373,11 @@ static void fill_tracking_info(struct strbuf *stat, const char *branch_name,
|
|||
strbuf_addf(stat, "%s: ",
|
||||
shorten_unambiguous_ref(branch->merge[0]->dst, 0));
|
||||
if (!ours)
|
||||
strbuf_addf(stat, "behind %d] ", theirs);
|
||||
strbuf_addf(stat, _("behind %d] "), theirs);
|
||||
else if (!theirs)
|
||||
strbuf_addf(stat, "ahead %d] ", ours);
|
||||
strbuf_addf(stat, _("ahead %d] "), ours);
|
||||
else
|
||||
strbuf_addf(stat, "ahead %d, behind %d] ", ours, theirs);
|
||||
strbuf_addf(stat, _("ahead %d, behind %d] "), ours, theirs);
|
||||
}
|
||||
|
||||
static int matches_merge_filter(struct commit *commit)
|
||||
|
|
|
@ -42,7 +42,7 @@ b3 behind 1
|
|||
b4 ahead 2
|
||||
EOF
|
||||
|
||||
test_expect_success 'branch -v' '
|
||||
test_expect_success C_LOCALE_OUTPUT 'branch -v' '
|
||||
(
|
||||
cd test &&
|
||||
git branch -v
|
||||
|
|
Loading…
Reference in a new issue