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>
Ævar Arnfjörð Bjarmason committed
Feb 22, 2011 at 23:41 UTC
a5760906e78adeab2ae8f404528c4ce10d046f5c
2 files changed
+4
-4
builtin/branch.c
+3
-3
@@ -373,11 +373,11 @@ static void fill_tracking_info(struct strbuf *stat, const char *branch_name,
373
strbuf_addf(stat, "%s: ",
374
shorten_unambiguous_ref(branch->merge[0]->dst, 0));
375
if (!ours)
376
- strbuf_addf(stat, "behind %d] ", theirs);
376
+ strbuf_addf(stat, _("behind %d] "), theirs);
377
else if (!theirs)
378
- strbuf_addf(stat, "ahead %d] ", ours);
378
+ strbuf_addf(stat, _("ahead %d] "), ours);
379
else
380
- strbuf_addf(stat, "ahead %d, behind %d] ", ours, theirs);
380
+ strbuf_addf(stat, _("ahead %d, behind %d] "), ours, theirs);
381
}
382
383
static int matches_merge_filter(struct commit *commit)
t/t6040-tracking-info.sh
+1
-1
@@ -42,7 +42,7 @@ b3 behind 1
42
b4 ahead 2
43
EOF
44
45
-test_expect_success 'branch -v' '
45
+test_expect_success C_LOCALE_OUTPUT 'branch -v' '
46
(
47
cd test &&
48
git branch -v