kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

fsck: reduce word legos to help i18n 

These messages will be marked for translation later. Reduce word legos
and give translators almost full phrases. describe_object() is updated
so that it can be called from printf() twice.

While at there, remove \n from the strings to reduce a bit of work
from translators.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Nguyễn Thái Ngọc Duy 2018-11-10 06:16:14 +01:00 committed by Junio C Hamano
parent 8900342628
commit bbb15c5193
1 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
builtin/fsck.c
View File

@ -52,16 +52,24 @@ static int name_objects;


static const char *describe_object(struct object *obj) static const char *describe_object(struct object *obj)
{ {
static struct strbuf buf = STRBUF_INIT; static struct strbuf bufs[] = {
char *name = name_objects ? STRBUF_INIT, STRBUF_INIT, STRBUF_INIT, STRBUF_INIT
lookup_decoration(fsck_walk_options.object_names, obj) : NULL; };
static int b = 0;
struct strbuf *buf;
char *name = NULL;


strbuf_reset(&buf); if (name_objects)
strbuf_addstr(&buf, oid_to_hex(&obj->oid)); name = lookup_decoration(fsck_walk_options.object_names, obj);

buf = bufs + b;
b = (b + 1) % ARRAY_SIZE(bufs);
strbuf_reset(buf);
strbuf_addstr(buf, oid_to_hex(&obj->oid));
if (name) if (name)
strbuf_addf(&buf, " (%s)", name); strbuf_addf(buf, " (%s)", name);


return buf.buf; return buf->buf;
} }


static const char *printable_type(struct object *obj) static const char *printable_type(struct object *obj)
@ -105,25 +113,29 @@ static int fsck_config(const char *var, const char *value, void *cb)
return git_default_config(var, value, cb); return git_default_config(var, value, cb);
} }


static void objreport(struct object *obj, const char *msg_type,
const char *err)
{
fprintf(stderr, "%s in %s %s: %s\n",
msg_type, printable_type(obj), describe_object(obj), err);
}

static int objerror(struct object *obj, const char *err) static int objerror(struct object *obj, const char *err)
{ {
errors_found |= ERROR_OBJECT; errors_found |= ERROR_OBJECT;
objreport(obj, "error", err); fprintf_ln(stderr, "error in %s %s: %s",
printable_type(obj), describe_object(obj), err);
return -1; return -1;
} }


static int fsck_error_func(struct fsck_options *o, static int fsck_error_func(struct fsck_options *o,
struct object *obj, int type, const char *message) struct object *obj, int type, const char *message)
{ {
objreport(obj, (type == FSCK_WARN) ? "warning" : "error", message); switch (type) {
return (type == FSCK_WARN) ? 0 : 1; case FSCK_WARN:
fprintf_ln(stderr, "warning in %s %s: %s",
printable_type(obj), describe_object(obj), message);
return 0;
case FSCK_ERROR:
fprintf_ln(stderr, "error in %s %s: %s",
printable_type(obj), describe_object(obj), message);
return 1;
default:
BUG("%d (FSCK_IGNORE?) should never trigger this callback", type);
}
} }


static struct object_array pending; static struct object_array pending;
@ -165,10 +177,12 @@ static int mark_object(struct object *obj, int type, void *data, struct fsck_opt


if (!(obj->flags & HAS_OBJ)) { if (!(obj->flags & HAS_OBJ)) {
if (parent && !has_object_file(&obj->oid)) { if (parent && !has_object_file(&obj->oid)) {
printf("broken link from %7s %s\n", printf_ln("broken link from %7s %s\n"
printable_type(parent), describe_object(parent)); " to %7s %s",
printf(" to %7s %s\n", printable_type(parent),
printable_type(obj), describe_object(obj)); describe_object(parent),
printable_type(obj),
describe_object(obj));
errors_found |= ERROR_REACHABLE; errors_found |= ERROR_REACHABLE;
} }
return 1; return 1;
@ -371,10 +385,11 @@ static int fsck_obj(struct object *obj, void *buffer, unsigned long size)
struct tag *tag = (struct tag *) obj; struct tag *tag = (struct tag *) obj;


if (show_tags && tag->tagged) { if (show_tags && tag->tagged) {
printf("tagged %s %s", printable_type(tag->tagged), printf_ln("tagged %s %s (%s) in %s",
describe_object(tag->tagged)); printable_type(tag->tagged),
printf(" (%s) in %s\n", tag->tag, describe_object(tag->tagged),
describe_object(&tag->object)); tag->tag,
describe_object(&tag->object));
} }
} }