From: Junio C Hamano <gitster@pobox•com>
To: Vasco Almeida <vascomalmeida@sapo•pt>
Cc: git@vger•kernel.org, "Ævar Arnfjörð Bjarmason" <avarab@gmail•com>
Subject: Re: [PATCH v4] i18n: notes: mark comment for translation
Date: Thu, 28 Jul 2016 09:09:00 -0700 [thread overview]
Message-ID: <xmqq1t2du4mb.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1469705175-7503-1-git-send-email-vascomalmeida@sapo.pt> (Vasco Almeida's message of "Thu, 28 Jul 2016 11:26:15 +0000")
Vasco Almeida <vascomalmeida@sapo•pt> writes:
> Mark comment displayed when editing a note for translation.
>
> Signed-off-by: Vasco Almeida <vascomalmeida@sapo•pt>
> ---
>
> This patch follows the original output and Ævar Arnfjörð Bjarmason
> sugestion to remove \n from the source string in order to assure that the
> ouput layout is not change by one translator forgetting to add \n, for
> instance.
Well, that cuts both ways. A translater adding an extra \n would
also break the layout, so I am not convinced that is a very good
justification.
As a parameter to strbuf_add_commented_lines(), an extra or a
missing \n does not really matter, though, because the whole thing
is a line-oriented comment ;-)
As to the patch text, it looks like it would produce more correct
output than what I queued tentatively on 'pu', so I'd replace it
with this one.
> builtin/notes.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/notes.c b/builtin/notes.c
> index 0572051..f848b89 100644
> --- a/builtin/notes.c
> +++ b/builtin/notes.c
> @@ -91,7 +91,7 @@ static const char * const git_notes_get_ref_usage[] = {
> };
>
> 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_add_commented_lines(&buf, "\n", strlen("\n"));
> + strbuf_add_commented_lines(&buf, _(note_template), strlen(_(note_template)));
> strbuf_addch(&buf, '\n');
> write_or_die(fd, buf.buf, buf.len);
prev parent reply other threads:[~2016-07-28 16:09 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
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 [this message]
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=xmqq1t2du4mb.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=avarab@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=vascomalmeida@sapo$(echo .)pt \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox