undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/i18n-branch-lego'

Browse Source 
Fix yet another message construction by concatenating pieces of sentenes,
which is unfriendly to i18n.

By Nguyễn Thái Ngọc Duy
* nd/i18n-branch-lego:
  branch: remove lego in i18n tracking info strings
This commit is contained in:
Junio C Hamano 2012-05-11 11:29:45 -07:00
commit 65029d8224
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
builtin/branch.c
View File

@ -391,6 +391,7 @@ static void fill_tracking_info(struct strbuf *stat, const char *branch_name,
int show_upstream_ref)
{
int ours, theirs;
char *ref = NULL;
struct branch *branch = branch_get(branch_name);
if (!stat_tracking_info(branch, &ours, &theirs)) {
@ -401,16 +402,29 @@ static void fill_tracking_info(struct strbuf *stat, const char *branch_name,
return;
}
strbuf_addch(stat, '[');
if (show_upstream_ref)
strbuf_addf(stat, "%s: ",
shorten_unambiguous_ref(branch->merge[0]->dst, 0));
if (!ours)
strbuf_addf(stat, _("behind %d] "), theirs);
else if (!theirs)
strbuf_addf(stat, _("ahead %d] "), ours);
else
strbuf_addf(stat, _("ahead %d, behind %d] "), ours, theirs);
ref = shorten_unambiguous_ref(branch->merge[0]->dst, 0);
if (!ours) {
if (ref)
strbuf_addf(stat, _("[%s: behind %d]"), ref, theirs);
else
strbuf_addf(stat, _("[behind %d]"), theirs);
} else if (!theirs) {
if (ref)
strbuf_addf(stat, _("[%s: ahead %d]"), ref, ours);
else
strbuf_addf(stat, _("[ahead %d]"), ours);
} else {
if (ref)
strbuf_addf(stat, _("[%s: ahead %d, behind %d]"),
ref, ours, theirs);
else
strbuf_addf(stat, _("[ahead %d, behind %d]"),
ours, theirs);
}
strbuf_addch(stat, ' ');
free(ref);
}
static int matches_merge_filter(struct commit *commit)