From e3f54bff43e61934643108ee26bfe1ad0c19c6a3 Mon Sep 17 00:00:00 2001 From: Vasco Almeida Date: Thu, 15 Sep 2016 14:58:58 +0000 Subject: [PATCH] i18n: blame: mark error messages for translation Mark error messages for translation passed to die() function. Change "Cannot" to lowercase following the usual style. Reflect changes to test by using test_i18ngrep. Signed-off-by: Vasco Almeida Signed-off-by: Junio C Hamano --- builtin/blame.c | 18 ++++++++++-------- t/t8003-blame-corner-cases.sh | 4 ++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/builtin/blame.c b/builtin/blame.c index a5bbf91e49..27aea7944c 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -2601,7 +2601,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix) if (incremental || (output_option & OUTPUT_PORCELAIN)) { if (show_progress > 0) - die("--progress can't be used with --incremental or porcelain formats"); + die(_("--progress can't be used with --incremental or porcelain formats")); show_progress = 0; } else if (show_progress < 0) show_progress = isatty(2); @@ -2727,7 +2727,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix) sb.commits.compare = compare_commits_by_commit_date; } else if (contents_from) - die("--contents and --reverse do not blend well."); + die(_("--contents and --reverse do not blend well.")); else { final_commit_name = prepare_initial(&sb); sb.commits.compare = compare_commits_by_reverse_commit_date; @@ -2747,12 +2747,12 @@ int cmd_blame(int argc, const char **argv, const char *prefix) add_pending_object(&revs, &(sb.final->object), ":"); } else if (contents_from) - die("Cannot use --contents with final commit object name"); + die(_("cannot use --contents with final commit object name")); if (reverse && revs.first_parent_only) { final_commit = find_single_final(sb.revs, NULL); if (!final_commit) - die("--reverse and --first-parent together require specified latest commit"); + die(_("--reverse and --first-parent together require specified latest commit")); } /* @@ -2779,7 +2779,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix) } if (oidcmp(&c->object.oid, &sb.final->object.oid)) - die("--reverse --first-parent together require range along first-parent chain"); + die(_("--reverse --first-parent together require range along first-parent chain")); } if (is_null_oid(&sb.final->object.oid)) { @@ -2790,7 +2790,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix) else { o = get_origin(&sb, sb.final, path); if (fill_blob_sha1_and_mode(o)) - die("no such path %s in %s", path, final_commit_name); + die(_("no such path %s in %s"), path, final_commit_name); if (DIFF_OPT_TST(&sb.revs->diffopt, ALLOW_TEXTCONV) && textconv_object(path, o->mode, o->blob_sha1, 1, (char **) &sb.final_buf, @@ -2801,7 +2801,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix) &sb.final_buf_size); if (!sb.final_buf) - die("Cannot read blob %s for path %s", + die(_("cannot read blob %s for path %s"), sha1_to_hex(o->blob_sha1), path); } @@ -2820,7 +2820,9 @@ int cmd_blame(int argc, const char **argv, const char *prefix) &bottom, &top, sb.path)) usage(blame_usage); if (lno < top || ((lno || bottom) && lno < bottom)) - die("file %s has only %lu lines", path, lno); + die(Q_("file %s has only %lu line", + "file %s has only %lu lines", + lno), path, lno); if (bottom < 1) bottom = 1; if (top < 1) diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh index e48370dfa0..661f9d430d 100755 --- a/t/t8003-blame-corner-cases.sh +++ b/t/t8003-blame-corner-cases.sh @@ -212,12 +212,12 @@ EOF test_expect_success 'blame -L with invalid start' ' test_must_fail git blame -L5 tres 2>errors && - grep "has only 2 lines" errors + test_i18ngrep "has only 2 lines" errors ' test_expect_success 'blame -L with invalid end' ' test_must_fail git blame -L1,5 tres 2>errors && - grep "has only 2 lines" errors + test_i18ngrep "has only 2 lines" errors ' test_expect_success 'blame parses part of -L' '