From: Jiang Xin <worldhello.net@gmail.com>
To: "Git List" <git@vger.kernel.org>,
"Junio C Hamano" <gitster@pobox.com>,
"Jean-Noël Avila" <jn.avila@free.fr>
Cc: Jiang Xin <worldhello.net@gmail.com>
Subject: [PATCH v2 0/1] diff: mark param1 and param2 as placeholders
Date: Wed, 14 Feb 2024 16:46:40 +0800 [thread overview]
Message-ID: <cover.1707900029.git.worldhello.net@gmail.com> (raw)
In-Reply-To: <6e33b2b2-f0b1-46ba-bbd8-3ae4c87d35ba@free.fr>
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.
# range-diff v1...v2
1: c65bca7f6f ! 1: 3a82f72f33 diff: mark param1 and param2 as placeholders
@@ Commit message
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>
## diff.c ##
@@ diff.c: 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),
+@@ diff.c: 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>..."),
+- 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),
---
Jiang Xin (1):
diff: mark param1 and param2 as placeholders
diff.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
2.44.0.rc0
next prev parent reply other threads:[~2024-02-14 8:46 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-14 5:31 [PATCH] diff: mark some diff parameters as placeholders Jiang Xin
2024-02-14 7:36 ` Jean-Noël Avila
2024-02-14 8:46 ` Jiang Xin [this message]
2024-02-14 8:46 ` [PATCH v2 1/1] diff: mark param1 and param2 " Jiang Xin
2024-02-14 17:33 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1707900029.git.worldhello.net@gmail.com \
--to=worldhello.net@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jn.avila@free.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).