undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mktag: mark strings for translation

Browse Source 
Mark the errors mktag might emit for translation. This is a plumbing
command, but the errors it emits are intended to be human-readable.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2021-01-05 20:42:51 +01:00 committed by Junio C Hamano
parent 3f390a366c
commit 2aa9425fbe
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
builtin/mktag.c
View File

@ -31,10 +31,10 @@ static int mktag_fsck_error_func(struct fsck_options *o,
* like missing "tagger" lines are "only" warnings * like missing "tagger" lines are "only" warnings
* under fsck, we've always considered them an error. * under fsck, we've always considered them an error.
*/ */
fprintf_ln(stderr, "error: tag input does not pass fsck: %s", message); fprintf_ln(stderr, _("error: tag input does not pass fsck: %s"), message);
return 1; return 1;
default: default:
BUG("%d (FSCK_IGNORE?) should never trigger this callback", BUG(_("%d (FSCK_IGNORE?) should never trigger this callback"),
msg_type); msg_type);
} }
} }
@ -49,10 +49,10 @@ static int verify_object_in_tag(struct object_id *tagged_oid, int *tagged_type)
buffer = read_object_file(tagged_oid, &type, &size); buffer = read_object_file(tagged_oid, &type, &size);
if (!buffer) if (!buffer)
die("could not read tagged object '%s'", die(_("could not read tagged object '%s'"),
oid_to_hex(tagged_oid)); oid_to_hex(tagged_oid));
if (type != *tagged_type) if (type != *tagged_type)
die("object '%s' tagged as '%s', but is a '%s' type", die(_("object '%s' tagged as '%s', but is a '%s' type"),
oid_to_hex(tagged_oid), oid_to_hex(tagged_oid),
type_name(*tagged_type), type_name(type)); type_name(*tagged_type), type_name(type));
@ -79,7 +79,7 @@ int cmd_mktag(int argc, const char **argv, const char *prefix)
builtin_mktag_usage, 0); builtin_mktag_usage, 0);
if (strbuf_read(&buf, 0, 0) < 0) if (strbuf_read(&buf, 0, 0) < 0)
die_errno("could not read from stdin"); die_errno(_("could not read from stdin"));
fsck_options.error_func = mktag_fsck_error_func; fsck_options.error_func = mktag_fsck_error_func;
fsck_set_msg_type(&fsck_options, "extraheaderentry", "warn"); fsck_set_msg_type(&fsck_options, "extraheaderentry", "warn");
@ -87,13 +87,13 @@ int cmd_mktag(int argc, const char **argv, const char *prefix)
git_config(mktag_config, NULL); git_config(mktag_config, NULL);
if (fsck_tag_standalone(NULL, buf.buf, buf.len, &fsck_options, if (fsck_tag_standalone(NULL, buf.buf, buf.len, &fsck_options,
&tagged_oid, &tagged_type)) &tagged_oid, &tagged_type))
die("tag on stdin did not pass our strict fsck check"); die(_("tag on stdin did not pass our strict fsck check"));
if (verify_object_in_tag(&tagged_oid, &tagged_type)) if (verify_object_in_tag(&tagged_oid, &tagged_type))
die("tag on stdin did not refer to a valid object"); die(_("tag on stdin did not refer to a valid object"));
if (write_object_file(buf.buf, buf.len, tag_type, &result) < 0) if (write_object_file(buf.buf, buf.len, tag_type, &result) < 0)
die("unable to write tag file"); die(_("unable to write tag file"));
strbuf_release(&buf); strbuf_release(&buf);
puts(oid_to_hex(&result)); puts(oid_to_hex(&result));