# [PATCH] diff and apply: fix singular/plural grammar nit. 4 messages from 2011-11-27 to 2011-11-27. Participants: David Ripton, Jakub Narebski, Carlos Martín Nieto, Frans Klaver. Thread: https://gitlist.dev/t/29027 ## David Ripton, 2011-11-27 13:44 Subject: [PATCH] diff and apply: fix singular/plural grammar nit. Message-ID: <4ED23EB5.1030208@ripton.net> URL: https://gitlist.dev/e/4ED23EB5.1030208%40ripton.net ``` Remove the trailing 's' from "files", "insertions", and "deletions" when there is only one of the item. Signed-off-by: David Ripton --- builtin/apply.c | 5 ++++- diff.c | 13 +++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 84a8a0b..47bbc23 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -3244,7 +3244,10 @@ static void stat_patch_list(struct patch *patch) show_stats(patch); } - printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files, adds, dels); + printf(" %d file%s changed, %d insertion%s(+), %d deletion%s(-)\n", + files, (files == 1 ? "" : "s"), + adds, (adds == 1 ? "" : "s"), + dels, (dels == 1 ? "" : "s")); } static void numstat_patch_list(struct patch *patch) diff --git a/diff.c b/diff.c index 374ecf3..531dcb1 100644 --- a/diff.c +++ b/diff.c @@ -1467,8 +1467,10 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options) } fprintf(options->file, "%s", line_prefix); fprintf(options->file, - " %d files changed, %d insertions(+), %d deletions(-)\n", - total_files, adds, dels); + " %d file%s changed, %d insertion%s(+), %d deletion%s(-)\n", + total_files, (total_files == 1 ? "" : "s"), + adds, (adds == 1 ? "" : "s"), + dels, (dels == 1 ? "" : "s")); } static void show_shortstats(struct diffstat_t *data, struct diff_options *options) @@ -1498,8 +1500,11 @@ static void show_shortstats(struct diffstat_t *data, struct diff_options *option options->output_prefix_data); fprintf(options->file, "%s", msg->buf); } - fprintf(options->file, " %d files changed, %d insertions(+), %d deletions(-)\n", - total_files, adds, dels); + fprintf(options->file, + " %d file%s changed, %d insertion%s(+), %d deletion%s(-)\n", + total_files, (total_files == 1 ? "" : "s"), + adds, (adds == 1 ? "" : "s"), + dels, (dels == 1 ? "" : "s")); } static void show_numstat(struct diffstat_t *data, struct diff_options *options) -- 1.7.8.rc3 -- David Ripton dripton@ripton.net ``` ## Jakub Narebski, 2011-11-27 14:47 Subject: Re: [PATCH] diff and apply: fix singular/plural grammar nit. Message-ID: URL: https://gitlist.dev/e/m37h2lmxk9.fsf%40localhost.localdomain In-Reply-To: <4ED23EB5.1030208@ripton.net> ``` David Ripton writes: > Remove the trailing 's' from "files", "insertions", and "deletions" > when there is only one of the item. > > Signed-off-by: David Ripton > --- [...] > - printf(" %d files changed, %d insertions(+), %d > deletions(-)\n", files, adds, dels); Whitespace damaged. Please turn off word wrapping (limiting line width) when sending patches. > + printf(" %d file%s changed, %d insertion%s(+), %d deletion%s(-)\n", > + files, (files == 1 ? "" : "s"), > + adds, (adds == 1 ? "" : "s"), > + dels, (dels == 1 ? "" : "s")); > } First, I think this is an API / plumbing and should not be changed. But I might be mistaken about that. Second, it is a perfect example ho to *not* handle plural form in the presence of internationalization (i18n) efforts. See e.g. http://www.gnu.org/s/hello/manual/gettext/Plural-forms.html -- Jakub Narębski ``` ## Carlos Martín Nieto, 2011-11-27 14:50 Subject: Re: [PATCH] diff and apply: fix singular/plural grammar nit. Message-ID: <20111127145033.GA1738@centaur.lab.cmartin.tk> URL: https://gitlist.dev/e/20111127145033.GA1738%40centaur.lab.cmartin.tk In-Reply-To: ``` On Sun, Nov 27, 2011 at 06:47:21AM -0800, Jakub Narebski wrote: > David Ripton writes: > > > Remove the trailing 's' from "files", "insertions", and "deletions" > > when there is only one of the item. > > > > Signed-off-by: David Ripton > > --- > [...] > > - printf(" %d files changed, %d insertions(+), %d > > deletions(-)\n", files, adds, dels); > > Whitespace damaged. Please turn off word wrapping (limiting line > width) when sending patches. > > > + printf(" %d file%s changed, %d insertion%s(+), %d deletion%s(-)\n", > > + files, (files == 1 ? "" : "s"), > > + adds, (adds == 1 ? "" : "s"), > > + dels, (dels == 1 ? "" : "s")); > > } > > First, I think this is an API / plumbing and should not be changed. > But I might be mistaken about that. I think somebody already tried to do this not too long ago (don't know if there as a patch) but the diffstat tool always uses the plural, and it might break scripts. cmn ``` ## Frans Klaver, 2011-11-27 15:41 Subject: Re: [PATCH] diff and apply: fix singular/plural grammar nit. Message-ID: URL: https://gitlist.dev/e/op.v5l263eh0aolir%40keputer In-Reply-To: <20111127145033.GA1738@centaur.lab.cmartin.tk> ``` On Sun, 27 Nov 2011 15:50:33 +0100, Carlos Martín Nieto wrote: > I think somebody already tried to do this not too long ago (don't know > if there as a patch) but the diffstat tool always uses the plural, and > it might break scripts. That would be http://thread.gmane.org/gmane.comp.version-control.git/178316 Frans ```