From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Thu, 2 Sep 2010 18:55:40 +0000 (+0000)
Subject: gettextize: git-tag tag_template message
X-Git-Tag: ko-pu~10^2~91
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=996214e9a12bbf49f0e5110e992a37193b31c71e;p=git.git

gettextize: 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>
---

diff --git a/builtin/tag.c b/builtin/tag.c
index 0baa2079a..9da762cbf 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -215,10 +215,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)
 {
@@ -313,7 +313,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 700b556fe..99e867730 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -1055,6 +1055,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 &&