Re: [PATCH] Revert diffstat back to English

From

Junio C Hamano <junio@pobox.com>

Date

Sep 14, 2012, 16:54 UTC

Message-ID

<7vvcfg5yvo.fsf@alter.siamese.dyndns.org>

In-Reply-To

<1347545786-936-1-git-send-email-pclouds@gmail.com>

Junio C Hamano <gitster@pobox.com> writes:

> Nguyễn Thái Ngọc Duy  <pclouds@gmail.com> 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@gmail.com>

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(-)

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');