diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-02-22 23:42:10 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-09 23:52:56 -0800 |
| commit | 7fbff25a539128f9940c03c9e975aad955f7e92a (patch) | |
| tree | d67d81c79583f0b5e4bdd0d4e5a0c0650c5254fa | |
| parent | d08ebf9972ec890bf1ebea802bb2590784a1199c (diff) | |
| download | git-7fbff25a539128f9940c03c9e975aad955f7e92a.tar.gz git-7fbff25a539128f9940c03c9e975aad955f7e92a.tar.xz | |
i18n: git-tag tag_template message
Mark the tag_template message as translatable with N_() and then use
it later with _(). We need to skip a test under GETTEXT_POISON that
relies on the output having a leading newline.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/tag.c | 6 | ||||
| -rwxr-xr-x | t/t7004-tag.sh | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/builtin/tag.c b/builtin/tag.c index 4bed7c2cf..4242e271a 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -213,10 +213,10 @@ static int do_sign(struct strbuf *buffer) } static const char tag_template[] = - "\n" + N_("\n" "#\n" "# Write a tag message\n" - "#\n"; + "#\n"); static void set_signingkey(const char *value) { @@ -305,7 +305,7 @@ static void create_tag(const unsigned char *object, const char *tag, if (!is_null_sha1(prev)) write_tag_body(fd, prev); else - write_or_die(fd, tag_template, strlen(tag_template)); + write_or_die(fd, _(tag_template), strlen(_(tag_template))); close(fd); if (launch_editor(path, buf, NULL)) { diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh index 3e7baaf89..1dedfd0c8 100755 --- a/t/t7004-tag.sh +++ b/t/t7004-tag.sh @@ -1121,6 +1121,7 @@ test_expect_success \ ' test_expect_success \ + C_LOCALE_OUTPUT \ 'message in editor has initial comment: first line' ' # check the first line --- should be empty echo >first.expect && |