Re: [PATCH v3 11/11] i18n: turn even more messages into "cannot be used together" ones
From: Junio C Hamano <hidden>
Date: 2021-12-30 22:36:51
"Jean-Noël Avila via GitGitGadget" [off-list ref] writes:
From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <redacted> Even if some of these messages are not subject to gettext i18n, this helps bring a single style of message for a given error type.
Makes sense, but ...
quoted hunk ↗ jump to hunk
diff --git a/builtin/add.c b/builtin/add.c index 067ec53d69f..dcaa3b5f395 100644 --- a/builtin/add.c +++ b/builtin/add.c@@ -566,7 +566,7 @@ int cmd_add(int argc, const char **argv, const char *prefix) if (pathspec_from_file) { if (pathspec.nr) - die(_("--pathspec-from-file is incompatible with pathspec arguments")); + die(_("'--pathspec-from-file' and pathspec arguments cannot be used together"));
Don't we want the literal `--pathspec-from-file` outside the format
string to prevent it from l10n? Or have all the changes in this
series to turn _("use '--concrete-option-name' in message") into
_("use '%s' in message") with '--concrete-option-name' as an
argument done only to reduce the number of distinct format strings?
I just skimmed the rest of the patch but the above comment seems to
apply to all the hunks.
Thanks.