mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-24 23:36:12 +02:00
Code

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 <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Vasco Almeida 2016-09-15 14:58:58 +00:00 committed by Junio C Hamano
parent 6ebdac1bab
commit e3f54bff43
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
builtin/blame.c
View File

@ -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)

4
t/t8003-blame-corner-cases.sh
View File

@ -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 <end> part of -L' '