Skip to content

Commit d7d30ba

Browse files
jnavilagitster
authored andcommitted
i18n: ref-filter: factorize "%(foo) atom used without %(bar) atom"
Signed-off-by: Jean-Noël Avila <[email protected]> Reviewed-by: Johannes Sixt <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 59bb000 commit d7d30ba

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

ref-filter.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -841,7 +841,7 @@ static void if_then_else_handler(struct ref_formatting_stack **stack)
841841
struct if_then_else *if_then_else = (struct if_then_else *)cur->at_end_data;
842842

843843
if (!if_then_else->then_atom_seen)
844-
die(_("format: %%(if) atom used without a %%(then) atom"));
844+
die(_("format: %%(%s) atom used without a %%(%s) atom"), "if", "then");
845845

846846
if (if_then_else->else_atom_seen) {
847847
/*
@@ -907,7 +907,7 @@ static int then_atom_handler(struct atom_value *atomv, struct ref_formatting_sta
907907
if (cur->at_end == if_then_else_handler)
908908
if_then_else = (struct if_then_else *)cur->at_end_data;
909909
if (!if_then_else)
910-
return strbuf_addf_ret(err, -1, _("format: %%(then) atom used without an %%(if) atom"));
910+
return strbuf_addf_ret(err, -1, _("format: %%(%s) atom used without a %%(%s) atom"), "then", "if");
911911
if (if_then_else->then_atom_seen)
912912
return strbuf_addf_ret(err, -1, _("format: %%(then) atom used more than once"));
913913
if (if_then_else->else_atom_seen)
@@ -943,9 +943,9 @@ static int else_atom_handler(struct atom_value *atomv, struct ref_formatting_sta
943943
if (prev->at_end == if_then_else_handler)
944944
if_then_else = (struct if_then_else *)prev->at_end_data;
945945
if (!if_then_else)
946-
return strbuf_addf_ret(err, -1, _("format: %%(else) atom used without an %%(if) atom"));
946+
return strbuf_addf_ret(err, -1, _("format: %%(%s) atom used without a %%(%s) atom"), "else", "if");
947947
if (!if_then_else->then_atom_seen)
948-
return strbuf_addf_ret(err, -1, _("format: %%(else) atom used without a %%(then) atom"));
948+
return strbuf_addf_ret(err, -1, _("format: %%(%s) atom used without a %%(%s) atom"), "else", "then");
949949
if (if_then_else->else_atom_seen)
950950
return strbuf_addf_ret(err, -1, _("format: %%(else) atom used more than once"));
951951
if_then_else->else_atom_seen = 1;

0 commit comments

Comments
 (0)