Junio C Hamano <gitster@xxxxxxxxx> writes:
> Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> writes:
>
>> This reverts the i18n part of 7f81463 (Use correct grammar in diffstat
>> summary line - 2012-02-01) but still keeps the grammar correctness for
>> English. It also reverts b354f11 (Fix tests under GETTEXT_POISON on
>> diffstat - 2012-08-27). The result is diffstat always in English
>> for all commands.
>>
>> This helps stop users from accidentally sending localized
>> format-patch'd patches.
>>
>> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx>
Why am I getting this from t3300?
--- expected 2012-09-14 16:43:09.000000000 +0000
+++ current 2012-09-14 16:43:09.000000000 +0000
@@ -1,2 +1,2 @@
"tabs\t,\" (dq) and spaces"
- 1 file changed, 0 insertions(+), 0 deletions(-)
+ 1 files changed, 0 insertion(+), 0 deletion(-)
Ah, your rewrite of Q_() is wrong. Will squash the attached in
before queueing this for maint.
Thanks.
diff.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git c/diff.c w/diff.c
index 3ddf0e6..1d9783c 100644
--- c/diff.c
+++ w/diff.c
@@ -1401,7 +1401,7 @@ int print_stat_summary(FILE *fp, int files, int insertions, int deletions)
}
strbuf_addf(&sb,
- files ? " %d files changed" : " %d file changed",
+ (files == 1) ? " %d file changed" : " %d files changed",
files);
/*
@@ -1418,7 +1418,7 @@ int print_stat_summary(FILE *fp, int files, int insertions, int deletions)
* do not translate it.
*/
strbuf_addf(&sb,
- insertions ? ", %d insertions(+)" : ", %d insertion(+)",
+ (insertions == 1) ? ", %d insertion(+)" : ", %d insertions(+)",
insertions);
}
@@ -1428,7 +1428,7 @@ int print_stat_summary(FILE *fp, int files, int insertions, int deletions)
* do not translate it.
*/
strbuf_addf(&sb,
- deletions ? ", %d deletions(-)" : ", %d deletion(-)",
+ (deletions == 1) ? ", %d deletion(-)" : ", %d deletions(-)",
deletions);
}
strbuf_addch(&sb, '\n');
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html