From: Vasco Almeida <vascomalmeida@sapo.pt>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git <git@vger.kernel.org>, "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: [PATCH v2] i18n: notes: mark comment for translation
Date: Tue, 26 Jul 2016 12:16:03 +0000 [thread overview]
Message-ID: <1469535363.1845.8.camel@sapo.pt> (raw)
In-Reply-To: <xmqqr3ah621l.fsf@gitster.mtv.corp.google.com>
A Seg, 25-07-2016 às 10:49 -0700, Junio C Hamano escreveu:
> Vasco Almeida <vascomalmeida@sapo.pt> writes:
>
> >
> > static const char note_template[] =
> > - "\nWrite/edit the notes for the following object:\n";
> > + N_("Write/edit the notes for the following object:");
> >
> > struct note_data {
> > int given;
> > @@ -179,7 +179,8 @@ static void prepare_note_data(const unsigned
> > char *object, struct note_data *d,
> > copy_obj_to_fd(fd, old_note);
> >
> > strbuf_addch(&buf, '\n');
> > - strbuf_add_commented_lines(&buf, note_template,
> > strlen(note_template));
> > + strbuf_addch(&buf, '\n');
> > + strbuf_add_commented_lines(&buf, _(note_template),
> > strlen(_(note_template)));
>
> I do not quite understand why you want the blank lines surrounding
> the message outside add_commented_lines() call. I think the intent
> is to produce
>
> #
> # Write/edit the notes for the following object:
> #
If this is what we want, I will send a re-roll accordingly.
> with the single call. If you pushed the newlines outside the
> message, wouldn't you end up having this instead (____ denoting an
> extra empty line each before and after the message)?
>
> ____
> # Write/edit the notes for the following object:
> ____
>
Yes, this was my intention. The original does:
#
# Write/edit the notes for the following object:
____
next prev parent reply other threads:[~2016-07-26 12:16 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-23 14:10 [PATCH v2] i18n: notes: mark comment for translation Vasco Almeida
2016-07-25 17:49 ` Junio C Hamano
2016-07-26 12:16 ` Vasco Almeida [this message]
2016-07-26 17:05 ` Junio C Hamano
2016-07-27 10:40 ` Vasco Almeida
2016-07-26 12:16 ` [PATCH v3] " Vasco Almeida
2016-07-26 16:57 ` Junio C Hamano
2016-07-27 10:53 ` Vasco Almeida
2016-07-27 19:33 ` Junio C Hamano
2016-07-28 11:26 ` [PATCH v4] " Vasco Almeida
2016-07-28 16:09 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1469535363.1845.8.camel@sapo.pt \
--to=vascomalmeida@sapo.pt \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.