]> git.ipfire.org Git - thirdparty/git.git/commitdiff
diff: mark param1 and param2 as placeholders
authorJiang Xin <worldhello.net@gmail.com>
Wed, 14 Feb 2024 08:46:41 +0000 (16:46 +0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Feb 2024 17:29:10 +0000 (09:29 -0800)
Some l10n translators translated the parameters "files", "param1" and
"param2" in the following message:

    "synonym for --dirstat=files,param1,param2..."

Translating "param1" and "param2" is OK, but changing the parameter
"files" is wrong. The parameters that are not meant to be used verbatim
should be marked as placeholders, but the verbatim parameter not marked
as a placeholder should be left as is.

This change is a complement for commit 51e846e673 (doc: enforce
placeholders in documentation, 2023-12-25).

With the help of Jean-Noël,some parameter combinations in one
placeholder (e.g. "<param1,param2>...") are splited into seperate
placeholders.

Helped-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff.c

diff --git a/diff.c b/diff.c
index bccb018da468480615c04d858909891ac59b69e5..20d39ccbe4b1752b9abb1d890bc892e23b896310 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -5567,7 +5567,7 @@ struct option *add_diff_options(const struct option *opts,
                OPT_BITOP(0, "shortstat", &options->output_format,
                          N_("output only the last line of --stat"),
                          DIFF_FORMAT_SHORTSTAT, DIFF_FORMAT_NO_OUTPUT),
-               OPT_CALLBACK_F('X', "dirstat", options, N_("<param1,param2>..."),
+               OPT_CALLBACK_F('X', "dirstat", options, N_("<param1>,<param2>..."),
                               N_("output the distribution of relative amount of changes for each sub-directory"),
                               PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
                               diff_opt_dirstat),
@@ -5575,8 +5575,8 @@ struct option *add_diff_options(const struct option *opts,
                               N_("synonym for --dirstat=cumulative"),
                               PARSE_OPT_NONEG | PARSE_OPT_NOARG,
                               diff_opt_dirstat),
-               OPT_CALLBACK_F(0, "dirstat-by-file", options, N_("<param1,param2>..."),
-                              N_("synonym for --dirstat=files,param1,param2..."),
+               OPT_CALLBACK_F(0, "dirstat-by-file", options, N_("<param1>,<param2>..."),
+                              N_("synonym for --dirstat=files,<param1>,<param2>..."),
                               PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
                               diff_opt_dirstat),
                OPT_BIT_F(0, "check", &options->output_format,