Re: [PATCH] remote.c: specify correct plural form in "commit diverge" message

From: Duy Nguyen <pclouds@gmail.com>
Date: May 3, 2016, 00:20 UTC
Message-ID: <CACsJy8C0mFfHQ+GSdJyXLc=SArnxKfZCFV7LJkoqEPs0ekzDZg@mail.gmail.com>
In-Reply-To: <CAGZ79kayCBNn8e5TzD+zhPEopOVTvsTUfy=_9UGP43vktsdFLQ@mail.gmail.com>

On Tue, May 3, 2016 at 7:16 AM, Stefan Beller <sbeller@google.com> wrote:

Show 30 quoted lines

> On Mon, May 2, 2016 at 5:12 PM, Nguyễn Thái Ngọc Duy <pclouds@gmail.com> wrote:
>> We need to count both "ours" and "theirs" commits when selecting plural
>> form for this message. Note that even though in this block, both ours
>> and theirs must be positive (i.e. can't be in singular form), we still
>> keep Q_(singular, plural) because languages other than English may have
>> more than one plural form.
>>
>> Reported-by: Alfonsogonzalez, Ernesto (GE Digital) <ernesto.alfonsogonzalez@ge.com>
>> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
>> ---
>>  remote.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/remote.c b/remote.c
>> index 28fd676..212426e 100644
>> --- a/remote.c
>> +++ b/remote.c
>> @@ -2108,7 +2108,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)
>>                            "Your branch and '%s' have diverged,\n"
>>                                "and have %d and %d different commits each, "
>>                                "respectively.\n",
>> -                          theirs),
>> +                          ours + theirs),
>
> 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.

-- 
Duy