From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Thu, 2 Sep 2010 16:53:27 +0000 (+0000)
Subject: gettextize: git-commit formatting messages
X-Git-Tag: ko-pu~10^2~115
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5de88e24cc668ef0d0b2864280c4a4c3049e7e63;p=git.git

gettextize: git-commit formatting messages

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---

diff --git a/builtin/commit.c b/builtin/commit.c
index cabf6e3ad..e6cbcc853 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -647,12 +647,12 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
 
 		if (in_merge)
 			fprintf(fp,
-				"#\n"
+				_("#\n"
 				"# It looks like you may be committing a MERGE.\n"
 				"# If this is not correct, please remove the file\n"
 				"#	%s\n"
 				"# and try again.\n"
-				"#\n",
+				"#\n"),
 				git_path("MERGE_HEAD"));
 
 		fprintf(fp,
@@ -677,16 +677,16 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
 					   getenv("GIT_COMMITTER_EMAIL"));
 		if (strcmp(author_ident, committer_ident))
 			fprintf(fp,
-				"%s"
-				"# Author:    %s\n",
+				_("%s"
+				"# Author:    %s\n"),
 				ident_shown++ ? "" : "#\n",
 				author_ident);
 		free(author_ident);
 
 		if (!user_ident_sufficiently_given())
 			fprintf(fp,
-				"%s"
-				"# Committer: %s\n",
+				_("%s"
+				"# Committer: %s\n"),
 				ident_shown++ ? "" : "#\n",
 				committer_ident);
 
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
index ac2e187a5..88904356b 100755
--- a/t/t7502-commit.sh
+++ b/t/t7502-commit.sh
@@ -234,7 +234,7 @@ echo "#
 # Author:    $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
 #" >> expect
 
-test_expect_success 'author different from committer' '
+test_expect_success NO_GETTEXT_POISON 'author different from committer' '
 
 	echo >>negative &&
 	git commit -e -m "sample"
@@ -248,7 +248,7 @@ rm -f expect.tmp
 echo "# Committer:
 #" >> expect
 
-test_expect_success 'committer is automatic' '
+test_expect_success NO_GETTEXT_POISON 'committer is automatic' '
 
 	echo >>negative &&
 	(