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 cabf6e3ad09e11728944e57e8360f82e548ccaf2..e6cbcc853ce10a3c911ec5697ddb9afe126a5724 100644 (file)
--- 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 ac2e187a5720d1ff947e58073dd6cc403ef40d5d..88904356bd847ab92a0826569c27b28525937922 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
 
-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 &&
        (