From: Ævar Arnfjörð Bjarmason Date: Sat, 19 Feb 2011 19:24:00 GMT Subject: [PATCH 17/72] gettextize: git-branch "git branch -v" messages Message-ID: <1298143495-3681-18-git-send-email-avarab@gmail.com> In-Reply-To: <1298143495-3681-1-git-send-email-avarab@gmail.com> 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 --- builtin/branch.c | 6 +++--- t/t6040-tracking-info.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index d276681..4c1a256 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -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) diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh index 1e0447f..d508a19 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 -- 1.7.2.3