From: Duy Nguyen <pclouds@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Sandy Carter <sandy.carter@savoirfairelinux.com>
Subject: Re: [PATCH] status merge: guarentee space between msg and path
Date: Wed, 12 Mar 2014 06:33:25 +0700 [thread overview]
Message-ID: <CACsJy8DvBVxtP_+qbcxL0J8D3iokGeMVW0jxFtZD=Jk_A=mwQg@mail.gmail.com> (raw)
In-Reply-To: <xmqqwqg0o518.fsf@gitster.dls.corp.google.com>
On Wed, Mar 12, 2014 at 3:26 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Sandy Carter <sandy.carter@savoirfairelinux.com> writes:
>
>> Le 2014-03-11 15:59, Junio C Hamano a écrit :
>>> Sandy Carter <sandy.carter@savoirfairelinux.com> writes:
>>>
>>>> diff --git a/wt-status.c b/wt-status.c
>>>> index a452407..69e0dfc 100644
>>>> --- a/wt-status.c
>>>> +++ b/wt-status.c
>>>> @@ -264,7 +264,7 @@ static void wt_status_print_unmerged_data(struct wt_status *s,
>>>> case 6: how = _("both added:"); break;
>>>> case 7: how = _("both modified:"); break;
>>>> }
>>>> - status_printf_more(s, c, "%-20s%s\n", how, one);
>>>> + status_printf_more(s, c, "%-19s %s\n", how, one);
>>>> strbuf_release(&onebuf);
>>>> }
>>>
>>> Thanks; I have to wonder if we would want to do something similar to
>>> what 3651e45c (wt-status: take the alignment burden off translators,
>>> 2013-11-05) to the other parts of the output, though.
>>>
>>
>> I could, do this. It would be cleaner, but there's just the issue of
>> the colon (:) which requires a space before it in the french
>> language[1]. As you can see in po/fr.po, the french translators have
>> done a good job at including it [2].
>>
>> 3651e45c takes the colon out of the control of the translators.
>
> That is a separate bug we would need to address, then. Duy Cc'ed.
We went through this before
http://thread.gmane.org/gmane.linux.debian.devel.bugs.general/1109239/focus=239560
If the colon needs language specific treatment then it should be part
of the translatable strings.
--
Duy
next prev parent reply other threads:[~2014-03-11 23:34 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-11 16:30 [PATCH] status merge: guarentee space between msg and path Sandy Carter
2014-03-11 19:59 ` Junio C Hamano
2014-03-11 20:22 ` Sandy Carter
2014-03-11 20:26 ` Junio C Hamano
2014-03-11 23:33 ` Duy Nguyen [this message]
2014-03-12 18:39 ` Junio C Hamano
2014-03-11 23:23 ` [PATCH v2] " Sandy Carter
2014-03-12 19:28 ` Junio C Hamano
2014-03-12 20:08 ` Sandy Carter
2014-03-12 20:43 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CACsJy8DvBVxtP_+qbcxL0J8D3iokGeMVW0jxFtZD=Jk_A=mwQg@mail.gmail.com' \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sandy.carter@savoirfairelinux.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).