From: Jean-Noël Avila via GitGitGadget Date: Sun, 20 Mar 2022 21:54:49 GMT Subject: [PATCH 5/7] i18n: factorize "foo does not take arguments" messages Message-ID: <2e1bd504673e8e2ec77ac8e99edb9aac0fb82db2.1647813292.git.gitgitgadget@gmail.com> In-Reply-To: From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= Signed-off-by: Jean-Noël Avila --- contrib/scalar/scalar.c | 2 +- ref-filter.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/scalar/scalar.c b/contrib/scalar/scalar.c index 7db2a97416e..1aeecea1daa 100644 --- a/contrib/scalar/scalar.c +++ b/contrib/scalar/scalar.c @@ -502,7 +502,7 @@ cleanup: static int cmd_list(int argc, const char **argv) { if (argc != 1) - die(_("`scalar list` does not take arguments")); + die(_("%s does not take arguments"), "`scalar list`"); if (run_git("config", "--global", "--get-all", "scalar.repo", NULL) < 0) return -1; diff --git a/ref-filter.c b/ref-filter.c index 7838bd22b8d..74f84cc0ed7 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -317,7 +317,7 @@ static int objecttype_atom_parser(struct ref_format *format, struct used_atom *a const char *arg, struct strbuf *err) { if (arg) - return strbuf_addf_ret(err, -1, _("%%(objecttype) does not take arguments")); + return strbuf_addf_ret(err, -1, _("%s does not take arguments"), "%(objecttype)"); if (*atom->name == '*') oi_deref.info.typep = &oi_deref.type; else @@ -349,7 +349,7 @@ static int deltabase_atom_parser(struct ref_format *format, struct used_atom *at const char *arg, struct strbuf *err) { if (arg) - return strbuf_addf_ret(err, -1, _("%%(deltabase) does not take arguments")); + return strbuf_addf_ret(err, -1, _("%s does not take arguments"), "%(deltabase)"); if (*atom->name == '*') oi_deref.info.delta_base_oid = &oi_deref.delta_base_oid; else @@ -361,7 +361,7 @@ static int body_atom_parser(struct ref_format *format, struct used_atom *atom, const char *arg, struct strbuf *err) { if (arg) - return strbuf_addf_ret(err, -1, _("%%(body) does not take arguments")); + return strbuf_addf_ret(err, -1, _("%s does not take arguments"), "%(body)"); atom->u.contents.option = C_BODY_DEP; return 0; } @@ -565,7 +565,7 @@ static int rest_atom_parser(struct ref_format *format, struct used_atom *atom, const char *arg, struct strbuf *err) { if (arg) - return strbuf_addf_ret(err, -1, _("%%(rest) does not take arguments")); + return strbuf_addf_ret(err, -1, _("%s does not take arguments"), "%(rest)"); format->use_rest = 1; return 0; } -- gitgitgadget