[PATCH 26/72] gettextize: git-commit formatting messages
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
builtin/commit.c | 12 ++++++------
t/t7502-commit.sh | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/builtin/commit.c b/builtin/commit.c
index 0198e90..c7c6c59 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -696,12 +696,12 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
char *ai_tmp, *ci_tmp;
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,
@@ -725,15 +725,15 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
ci_tmp = cut_ident_timestamp_part(committer_ident.buf);
if (strcmp(author_ident->buf, committer_ident.buf))
fprintf(fp,
- "%s"
- "# Author: %s\n",
+ _("%s"
+ "# Author: %s\n"),
ident_shown++ ? "" : "#\n",
author_ident->buf);
if (!user_ident_sufficiently_given())
fprintf(fp,
- "%s"
- "# Committer: %s\n",
+ _("%s"
+ "# Committer: %s\n"),
ident_shown++ ? "" : "#\n",
committer_ident.buf);
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
index 50da034..9204a4d 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 &&
(
--
1.7.2.3
Ævar Arnfjörð Bjarmason <avarab@gmail.com>