i18n: refactor "unrecognized %(foo) argument" strings
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> Reviewed-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jean-Noël Avila committed
Jan 5, 2022 at 20:02 UTC
68e2ea0b3070d25d28fbaadc53aea25d028abf82
1 file changed
+7
-7
ref-filter.c
+7
-7
@@ -341,7 +341,7 @@ static int objectsize_atom_parser(struct ref_format *format, struct used_atom *a
341
else
342
oi.info.disk_sizep = &oi.disk_size;
343
} else
344
- return strbuf_addf_ret(err, -1, _("unrecognized %%(objectsize) argument: %s"), arg);
344
+ return strbuf_addf_ret(err, -1, _("unrecognized %%(%s) argument: %s"), "objectsize", arg);
345
return 0;
346
}
347
@@ -374,7 +374,7 @@ static int subject_atom_parser(struct ref_format *format, struct used_atom *atom
374
else if (!strcmp(arg, "sanitize"))
375
atom->u.contents.option = C_SUB_SANITIZE;
376
else
377
- return strbuf_addf_ret(err, -1, _("unrecognized %%(subject) argument: %s"), arg);
377
+ return strbuf_addf_ret(err, -1, _("unrecognized %%(%s) argument: %s"), "subject", arg);
378
return 0;
379
}
380
@@ -428,7 +428,7 @@ static int contents_atom_parser(struct ref_format *format, struct used_atom *ato
428
if (strtoul_ui(arg, 10, &atom->u.contents.nlines))
429
return strbuf_addf_ret(err, -1, _("positive value expected contents:lines=%s"), arg);
430
} else
431
- return strbuf_addf_ret(err, -1, _("unrecognized %%(contents) argument: %s"), arg);
431
+ return strbuf_addf_ret(err, -1, _("unrecognized %%(%s) argument: %s"), "contents", arg);
432
return 0;
433
}
434
@@ -440,7 +440,7 @@ static int raw_atom_parser(struct ref_format *format, struct used_atom *atom,
440
else if (!strcmp(arg, "size"))
441
atom->u.raw_data.option = RAW_LENGTH;
442
else
443
- return strbuf_addf_ret(err, -1, _("unrecognized %%(raw) argument: %s"), arg);
443
+ return strbuf_addf_ret(err, -1, _("unrecognized %%(%s) argument: %s"), "raw", arg);
444
return 0;
445
}
446
@@ -459,7 +459,7 @@ static int oid_atom_parser(struct ref_format *format, struct used_atom *atom,
459
if (atom->u.oid.length < MINIMUM_ABBREV)
460
atom->u.oid.length = MINIMUM_ABBREV;
461
} else
462
- return strbuf_addf_ret(err, -1, _("unrecognized argument '%s' in %%(%s)"), arg, atom->name);
462
+ return strbuf_addf_ret(err, -1, _("unrecognized %%(%s) argument: %s"), atom->name, arg);
463
return 0;
464
}
465
@@ -531,7 +531,7 @@ static int align_atom_parser(struct ref_format *format, struct used_atom *atom,
531
else if ((position = parse_align_position(s)) >= 0)
532
align->position = position;
533
else {
534
- strbuf_addf(err, _("unrecognized %%(align) argument: %s"), s);
534
+ strbuf_addf(err, _("unrecognized %%(%s) argument: %s"), "align", s);
535
string_list_clear(¶ms, 0);
536
return -1;
537
}
@@ -557,7 +557,7 @@ static int if_atom_parser(struct ref_format *format, struct used_atom *atom,
557
} else if (skip_prefix(arg, "notequals=", &atom->u.if_then_else.str)) {
558
atom->u.if_then_else.cmp_status = COMPARE_UNEQUAL;
559
} else
560
- return strbuf_addf_ret(err, -1, _("unrecognized %%(if) argument: %s"), arg);
560
+ return strbuf_addf_ret(err, -1, _("unrecognized %%(%s) argument: %s"), "if", arg);
561
return 0;
562
}
563