From: Ævar Arnfjörð Bjarmason Date: Wed, 1 Sep 2010 19:04:02 +0000 (+0000) Subject: gettextize: git-branch "git branch -v" messages X-Git-Tag: ko-pu~10^2~124 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0cea7c333a968d3396870dea4aa61d6563c45189;p=git.git gettextize: 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 --- diff --git a/builtin/branch.c b/builtin/branch.c index 880203398..59e71fc40 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -378,11 +378,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) diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh index 1785e178a..c9a86f615 100755 --- a/t/t6040-tracking-info.sh +++ b/t/t6040-tracking-info.sh @@ -42,7 +42,7 @@ b3 behind 1 b4 ahead 2 EOF -test_expect_success 'branch -v' ' +test_expect_success NO_GETTEXT_POISON 'branch -v' ' ( cd test && git branch -v