development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-02 14:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'nd/maint-diffstat-summary' into maint

Browse source 
* nd/maint-diffstat-summary:
  Revert diffstat back to English
This commit is contained in:
Junio C Hamano 2012-09-20 15:55:31 -07:00
parent 467ad25471 218adaaaa0
commit 8ef2794ba8
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
diff.c
View file

@ -1398,11 +1398,11 @@ int print_stat_summary(FILE *fp, int files, int insertions, int deletions)
if (!files) {
assert(insertions == 0 && deletions == 0);
return fprintf(fp, "%s\n", _(" 0 files changed"));
return fprintf(fp, "%s\n", " 0 files changed");
}
strbuf_addf(&sb,
Q_(" %d file changed", " %d files changed", files),
(files == 1) ? " %d file changed" : " %d files changed",
files);
/*
@ -1419,8 +1419,7 @@ int print_stat_summary(FILE *fp, int files, int insertions, int deletions)
* do not translate it.
*/
strbuf_addf(&sb,
Q_(", %d insertion(+)", ", %d insertions(+)",
insertions),
(insertions == 1) ? ", %d insertion(+)" : ", %d insertions(+)",
insertions);
}
@ -1430,8 +1429,7 @@ int print_stat_summary(FILE *fp, int files, int insertions, int deletions)
* do not translate it.
*/
strbuf_addf(&sb,
Q_(", %d deletion(-)", ", %d deletions(-)",
deletions),
(deletions == 1) ? ", %d deletion(-)" : ", %d deletions(-)",
deletions);
}
strbuf_addch(&sb, '\n');