[PATCH 50/72] gettextize: git-tag tag_template message
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Feb 19, 2011, 19:24 UTC
- Message-ID
- <1298143495-3681-51-git-send-email-avarab@gmail.com>
- In-Reply-To
- <1298143495-3681-1-git-send-email-avarab@gmail.com>
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> --- builtin/tag.c | 6 +++--- t/t7004-tag.sh | 1 + 2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/builtin/tag.c b/builtin/tag.c index 4bed7c2..4242e27 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 3e7baaf..99d1fbc 100755 --- a/t/t7004-tag.sh +++ b/t/t7004-tag.sh @@ -1121,6 +1121,7 @@ test_expect_success \ ' test_expect_success \ + NO_GETTEXT_POISON \ 'message in editor has initial comment: first line' ' # check the first line --- should be empty echo >first.expect &&
-- 1.7.2.3