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

Re: [PATCH 1/2] advice: extract function to print messages with prefix

From
Ralf Thielow <ralf.thielow@gmail.com>
Date
Sep 7, 2012, 19:56 UTC
Message-ID
<CAN0XMOK5QnNn8471RF4y7u_X0rfda=-J-KrCtyMsgCGHXNrwVw@mail.gmail.com>
In-Reply-To
<7v1uidy6ga.fsf@alter.siamese.dyndns.org>
On Fri, Sep 7, 2012 at 9:32 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 43 quoted lines
> Ralf Thielow <ralf.thielow@gmail.com> writes:
>
>> Extract a function that allows to print messages
>> with a prefix.
>>
>> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
>> ---
>>  advice.c | 14 ++++++++++----
>>  advice.h |  1 +
>>  2 Dateien geändert, 11 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-)
>>
>> diff --git a/advice.c b/advice.c
>> index edfbd4a..e73d53b 100644
>> --- a/advice.c
>> +++ b/advice.c
>> @@ -25,25 +25,31 @@ static struct {
>>       { "detachedhead", &advice_detached_head },
>>  };
>>
>> -void advise(const char *advice, ...)
>> +void print_with_prefix(const char *prefix, const char *msg, ...)
>>  {
>>       struct strbuf buf = STRBUF_INIT;
>>       va_list params;
>>       const char *cp, *np;
>>
>> -     va_start(params, advice);
>> -     strbuf_vaddf(&buf, advice, params);
>> +     va_start(params, msg);
>> +     strbuf_vaddf(&buf, msg, params);
>>       va_end(params);
>>
>>       for (cp = buf.buf; *cp; cp = np) {
>>               np = strchrnul(cp, '\n');
>> -             fprintf(stderr, _("hint: %.*s\n"), (int)(np - cp), cp);
>> +             fprintf(stderr,  "%s %.*s\n", prefix, (int)(np - cp), cp);
>
> Hrm, naively, printf("%s: %.*s\n", _("hint"), ...) might look more
> natural, but I vaguely recall that the current code places _()
> around the entire "hint: %.*s\n" on purpose.  IIRC, it was to allow
> translations that flow from RTL e.g. ".siht od t'nod :tnih".
>
> Doesn't this patch break it?

Sorry but I don't know what you mean with "translations that flow from RTL e.g. ".siht od t'nod :tnih"." so I can't check this. As far as I can see the callers only put a simple message in it, e.g. advise(_("Commit your changes or stash them to proceed.")); So I don't think that this patch would break anything.

Previous: Junio C HamanoNext: Junio C Hamano
Message 13 of 18 in “l10n: de.po: translate 2 new messages”
  1. l10n: de.po: translate 2 new messagesRalf Thielow, Sep 5, 2012
  2. Ralf ThielowSep 5, 2012
  3. Thomas RastSep 6, 2012
  4. Ralf ThielowSep 6, 2012
  5. Jiang XinSep 7, 2012
  6. Ralf ThielowSep 7, 2012
  7. Ralf ThielowSep 7, 2012
  8. Ralf ThielowSep 7, 2012
  9. Junio C HamanoSep 7, 2012
  10. 0/2 multiline prefixes on messagesRalf Thielow, Sep 7, 2012
  11. 1/2 advice: extract function to print messages with prefixRalf Thielow, Sep 7, 2012
  12. Junio C HamanoSep 7, 2012
  13. Ralf ThielowSep 7, 2012
  14. Junio C HamanoSep 7, 2012
  15. Ralf ThielowSep 7, 2012
  16. Junio C HamanoSep 7, 2012
  17. Junio C HamanoSep 7, 2012
  18. 2/2 i18n: mark prefix "warning:" for translationRalf Thielow, Sep 7, 2012

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.