diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-20 22:55:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-20 22:55:31 (GMT) |
| commit | 8ef2794ba8ada6b64afb22ff7b235dce583b9712 (patch) | |
| tree | d74d129b48f609f70e7411dedf14ef4aa55d0294 /diff.c | |
| parent | 467ad254717a52c657394ce6c662cb78a2bd7c16 (diff) | |
| parent | 218adaaaa064c436115dbcd5705a0e2c42e90a25 (diff) | |
| download | git-8ef2794ba8ada6b64afb22ff7b235dce583b9712.zip git-8ef2794ba8ada6b64afb22ff7b235dce583b9712.tar.gz git-8ef2794ba8ada6b64afb22ff7b235dce583b9712.tar.bz2 | |
Merge branch 'nd/maint-diffstat-summary' into maint
* nd/maint-diffstat-summary:
Revert diffstat back to English
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -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'); |