i18n: git-commit formatting messages
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Feb 22, 2011 at 23:41 UTC
fe8165cd4f201cbdc7e675a3227bd5a157f57181
2 files changed
+8
-8
builtin/commit.c
+6
-6
@@ -695,12 +695,12 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
695
char *ai_tmp, *ci_tmp;
696
if (in_merge)
697
status_printf_ln(s, GIT_COLOR_NORMAL,
698
- "\n"
698
+ _("\n"
699
"It looks like you may be committing a MERGE.\n"
700
"If this is not correct, please remove the file\n"
701
" %s\n"
702
"and try again.\n"
703
- "",
703
+ ""),
704
git_path("MERGE_HEAD"));
705
706
fprintf(s->fp, "\n");
@@ -725,15 +725,15 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
725
ci_tmp = cut_ident_timestamp_part(committer_ident.buf);
726
if (strcmp(author_ident->buf, committer_ident.buf))
727
status_printf_ln(s, GIT_COLOR_NORMAL,
728
- "%s"
729
- "Author: %s",
728
+ _("%s"
729
+ "Author: %s"),
730
ident_shown++ ? "" : "\n",
731
author_ident->buf);
732
733
if (!user_ident_sufficiently_given())
734
status_printf_ln(s, GIT_COLOR_NORMAL,
735
- "%s"
736
- "Committer: %s",
735
+ _("%s"
736
+ "Committer: %s"),
737
ident_shown++ ? "" : "\n",
738
committer_ident.buf);
739
t/t7502-commit.sh
+2
-2
@@ -234,7 +234,7 @@ echo "#
234
# Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
235
#" >> expect
236
237
-test_expect_success 'author different from committer' '
237
+test_expect_success C_LOCALE_OUTPUT 'author different from committer' '
238
239
echo >>negative &&
240
git commit -e -m "sample"
@@ -248,7 +248,7 @@ rm -f expect.tmp
248
echo "# Committer:
249
#" >> expect
250
251
-test_expect_success 'committer is automatic' '
251
+test_expect_success C_LOCALE_OUTPUT 'committer is automatic' '
252
253
echo >>negative &&
254
(