From: Jeff King <peff@peff.net>
To: Duy Nguyen <pclouds@gmail.com>
Cc: Stefan Beller <sbeller@google.com>,
"git@vger.kernel.org" <git@vger.kernel.org>,
ernesto.alfonsogonzalez@ge.com
Subject: Re: [PATCH] remote.c: specify correct plural form in "commit diverge" message
Date: Tue, 3 May 2016 00:20:08 -0400 [thread overview]
Message-ID: <20160503042008.GB30529@sigill.intra.peff.net> (raw)
In-Reply-To: <CACsJy8C0mFfHQ+GSdJyXLc=SArnxKfZCFV7LJkoqEPs0ekzDZg@mail.gmail.com>
On Tue, May 03, 2016 at 07:20:27AM +0700, Duy Nguyen wrote:
> > I think it needs to be max(ours, theirs)
> >
> > "Your branch and '%s' have diverged,\n"
> > "and have 1 and 1 different commit each, "
> >
> > so singular for that too, no?
>
> I thought that would be "1 and 1 commits". English is complicated :-D
> I don't think Q_() is prepared to deal with this, other languages may
> have different interpretation of "x and y" too. But we can at least
> make the English version right.
Yes, it should still be "1 and 1 commits", I think. An actual human
would probably say something like "and each has %d commit(s)" when the
two values are the same, though.
Note that I do not think the singular case can ever trigger with your
new code. We know that both "ours" and "theirs" are non-zero to get to
this message, which means "ours + theirs" must be at least 2 (barring
negative commit counts, of course :) ).
So you could probably replace the Q_() with just a _().
-Peff
next prev parent reply other threads:[~2016-05-03 4:20 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-02 22:46 bug: incorrect plurality of "commit" in git status Alfonsogonzalez, Ernesto (GE Digital)
2016-05-03 0:12 ` [PATCH] remote.c: specify correct plural form in "commit diverge" message Nguyễn Thái Ngọc Duy
2016-05-03 0:16 ` Stefan Beller
2016-05-03 0:20 ` Duy Nguyen
2016-05-03 4:20 ` Jeff King [this message]
2016-05-03 4:43 ` Duy Nguyen
2016-05-03 4:48 ` Jeff King
2016-05-03 9:32 ` Duy Nguyen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160503042008.GB30529@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=ernesto.alfonsogonzalez@ge.com \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).