aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2011-02-22 23:41:46 +0000
committerJunio C Hamano <gitster@pobox.com>2011-03-09 23:52:54 -0800
commitfe8165cd4f201cbdc7e675a3227bd5a157f57181 (patch)
treed4f6c472c6001a9db036f194001285728e50057e
parent9c227655b02c8f84e319a57bb8dd7cff63e3fbf8 (diff)
downloadgit-fe8165cd4f201cbdc7e675a3227bd5a157f57181.tar.gz
git-fe8165cd4f201cbdc7e675a3227bd5a157f57181.tar.xz
i18n: git-commit formatting messages
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/commit.c12
-rwxr-xr-xt/t7502-commit.sh4
2 files changed, 8 insertions, 8 deletions
diff --git a/builtin/commit.c b/builtin/commit.c
index e944c4d77..c1da66c2d 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -695,12 +695,12 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
char *ai_tmp, *ci_tmp;
if (in_merge)
status_printf_ln(s, GIT_COLOR_NORMAL,
- "\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"
- "",
+ ""),
git_path("MERGE_HEAD"));
fprintf(s->fp, "\n");
@@ -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))
status_printf_ln(s, GIT_COLOR_NORMAL,
- "%s"
- "Author: %s",
+ _("%s"
+ "Author: %s"),
ident_shown++ ? "" : "\n",
author_ident->buf);
if (!user_ident_sufficiently_given())
status_printf_ln(s, GIT_COLOR_NORMAL,
- "%s"
- "Committer: %s",
+ _("%s"
+ "Committer: %s"),
ident_shown++ ? "" : "\n",
committer_ident.buf);
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
index 50da034cd..034b9c35a 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 C_LOCALE_OUTPUT '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 C_LOCALE_OUTPUT 'committer is automatic' '
echo >>negative &&
(