i18n: git-commit formatting messages

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/commit.c b/builtin/commit.c
index e944c4d77d657ab9c5e16ef1646ed68ab134a2f8..c1da66c2d7a9ce3c76be0f4b52f07fd4339c0d95 100644 (file)
--- 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,
                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"
                                "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");
                                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,
                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,
                                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);
 
                                ident_shown++ ? "" : "\n",
                                committer_ident.buf);
 

diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
index 50da034cd3934d0509e67a6f20e514a18e5659d4..034b9c35aad37f0f12f152c75980474038aa8b27 100755 (executable)
--- a/t/t7502-commit.sh
+++ b/t/t7502-commit.sh
@@ -234,7 +234,7 @@ echo "#
 # Author:    $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
 #" >> expect
 
 # 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"
 
        echo >>negative &&
        git commit -e -m "sample"


@@ -248,7 +248,7 @@ rm -f expect.tmp
 echo "# Committer:
 #" >> expect
 
 echo "# Committer:
 #" >> expect
 

-test_expect_success 'committer is automatic' '
+test_expect_success C_LOCALE_OUTPUT 'committer is automatic' '

 
        echo >>negative &&
        (
 
        echo >>negative &&
        (