Skip to content

Commit 68e2ea0

Browse files
jnavilagitster
jnavila
authored and
gitster
committed
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>
1 parent 986cd65 commit 68e2ea0

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

‎ref-filter.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ static int objectsize_atom_parser(struct ref_format *format, struct used_atom *a
341341
else
342342
oi.info.disk_sizep = &oi.disk_size;
343343
} 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);
345345
return 0;
346346
}
347347

@@ -374,7 +374,7 @@ static int subject_atom_parser(struct ref_format *format, struct used_atom *atom
374374
else if (!strcmp(arg, "sanitize"))
375375
atom->u.contents.option = C_SUB_SANITIZE;
376376
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);
378378
return 0;
379379
}
380380

@@ -428,7 +428,7 @@ static int contents_atom_parser(struct ref_format *format, struct used_atom *ato
428428
if (strtoul_ui(arg, 10, &atom->u.contents.nlines))
429429
return strbuf_addf_ret(err, -1, _("positive value expected contents:lines=%s"), arg);
430430
} 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);
432432
return 0;
433433
}
434434

@@ -440,7 +440,7 @@ static int raw_atom_parser(struct ref_format *format, struct used_atom *atom,
440440
else if (!strcmp(arg, "size"))
441441
atom->u.raw_data.option = RAW_LENGTH;
442442
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);
444444
return 0;
445445
}
446446

@@ -459,7 +459,7 @@ static int oid_atom_parser(struct ref_format *format, struct used_atom *atom,
459459
if (atom->u.oid.length < MINIMUM_ABBREV)
460460
atom->u.oid.length = MINIMUM_ABBREV;
461461
} 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);
463463
return 0;
464464
}
465465

@@ -531,7 +531,7 @@ static int align_atom_parser(struct ref_format *format, struct used_atom *atom,
531531
else if ((position = parse_align_position(s)) >= 0)
532532
align->position = position;
533533
else {
534-
strbuf_addf(err, _("unrecognized %%(align) argument: %s"), s);
534+
strbuf_addf(err, _("unrecognized %%(%s) argument: %s"), "align", s);
535535
string_list_clear(&params, 0);
536536
return -1;
537537
}
@@ -557,7 +557,7 @@ static int if_atom_parser(struct ref_format *format, struct used_atom *atom,
557557
} else if (skip_prefix(arg, "notequals=", &atom->u.if_then_else.str)) {
558558
atom->u.if_then_else.cmp_status = COMPARE_UNEQUAL;
559559
} 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);
561561
return 0;
562562
}
563563

0 commit comments

Comments
 (0)