Vasco Almeida <vascomalmeida@xxxxxxx> writes:
> Mark comment displayed when editing a note for translation.
>
> Signed-off-by: Vasco Almeida <vascomalmeida@xxxxxxx>
> ---
>
> 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);
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html