i18n: apply: mark error message for translation

Update test to reflect changes.

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/apply.c b/apply.c
index 82158742dd9e30b2ccbaea522a88f5fd31fb15cf..705cf562f07098aafcd9f6e27105d2105714751f 100644 (file)
--- a/apply.c
+++ b/apply.c
@@ -1586,8 +1586,8 @@ static int find_header(struct apply_state *state,
                                patch->new_name = xstrdup(patch->def_name);
                        }
                        if (!patch->is_delete && !patch->new_name) {
                                patch->new_name = xstrdup(patch->def_name);
                        }
                        if (!patch->is_delete && !patch->new_name) {

-                               error("git diff header lacks filename information "
-                                            "(line %d)", state->linenr);
+                               error(_("git diff header lacks filename information "
+                                            "(line %d)"), state->linenr);

                                return -128;
                        }
                        patch->is_toplevel_relative = 1;
                                return -128;
                        }
                        patch->is_toplevel_relative = 1;

diff --git a/t/t4254-am-corrupt.sh b/t/t4254-am-corrupt.sh
index 9bd7dd2ba15cfd1096d3e89b012f5979b1a01eee..168739c7214c764ef7f35a83063d369c1db22ec4 100755 (executable)
--- a/t/t4254-am-corrupt.sh
+++ b/t/t4254-am-corrupt.sh
@@ -31,7 +31,7 @@ test_expect_success 'try to apply corrupted patch' '
 test_expect_success 'compare diagnostic; ensure file is still here' '
        echo "error: git diff header lacks filename information (line 4)" >expected &&
        test_path_is_file f &&
 test_expect_success 'compare diagnostic; ensure file is still here' '
        echo "error: git diff header lacks filename information (line 4)" >expected &&
        test_path_is_file f &&

-       test_cmp expected actual
+       test_i18ncmp expected actual

 '
 
 test_done
 '
 
 test_done