mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n: git-branch "git branch -v" messages

Browse Source 
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:
Ævar Arnfjörð Bjarmason
2011-02-22 23:41:37 +00:00
committed by Junio C Hamano
parent 8af42b0f77
commit a5760906e7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/branch.c
View File

@ -373,11 +373,11 @@ static void fill_tracking_info(struct strbuf *stat, const char *branch_name,
strbuf_addf(stat, "%s: ", strbuf_addf(stat, "%s: ",
shorten_unambiguous_ref(branch->merge[0]->dst, 0)); shorten_unambiguous_ref(branch->merge[0]->dst, 0));
if (!ours) if (!ours)
strbuf_addf(stat, "behind %d] ", theirs); strbuf_addf(stat, _("behind %d] "), theirs);
else if (!theirs) else if (!theirs)
strbuf_addf(stat, "ahead %d] ", ours); strbuf_addf(stat, _("ahead %d] "), ours);
else 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) static int matches_merge_filter(struct commit *commit)

2
t/t6040-tracking-info.sh
View File

@ -42,7 +42,7 @@ b3 behind 1
b4 ahead 2 b4 ahead 2
EOF EOF
test_expect_success 'branch -v' ' test_expect_success C_LOCALE_OUTPUT 'branch -v' '
( (
cd test && cd test &&
git branch -v git branch -v