git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] status merge: guarentee space between msg and path

From
Duy Nguyen <pclouds@gmail.com>
Date
Mar 11, 2014, 23:33 UTC
Message-ID
<CACsJy8DvBVxtP_+qbcxL0J8D3iokGeMVW0jxFtZD=Jk_A=mwQg@mail.gmail.com>
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:
Show 31 quoted lines
> 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
Previous: Junio C HamanoNext: Junio C Hamano
Message 5 of 10 in “status merge: guarentee space between msg and path”
  1. status merge: guarentee space between msg and pathSandy Carter, Mar 11, 2014
  2. Junio C HamanoMar 11, 2014
  3. Sandy CarterMar 11, 2014
  4. Junio C HamanoMar 11, 2014
  5. Duy NguyenMar 11, 2014
  6. Junio C HamanoMar 12, 2014
  7. status merge: guarentee space between msg and pathSandy Carter, Mar 11, 2014
  8. Junio C HamanoMar 12, 2014
  9. Sandy CarterMar 12, 2014
  10. Junio C HamanoMar 12, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.