From: Jean-Noël Avila <jn.avila@free.fr>
Date: Wed, 14 Feb 2024 07:36:35 GMT
Subject: Re: [PATCH] diff: mark some diff parameters as placeholders
Message-ID: <6e33b2b2-f0b1-46ba-bbd8-3ae4c87d35ba@free.fr>
In-Reply-To: <1e33662683b43e93889b4b3493a0edc2e3483920.1707888478.git.zhiyou.jx@alibaba-inc.com>

Hello,

Some parameter placeholder slipped through...

Le 14/02/2024 à 06:31, Jiang Xin a écrit :
> From: Jiang Xin <zhiyou.jx@alibaba-inc.com>
> 
> 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).
> 
> Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com>
> ---
>   diff.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/diff.c b/diff.c
> index ccfa1fca0d..c256ef103e 100644
> --- a/diff.c
> +++ b/diff.c
> @@ -5599,7 +5599,7 @@ struct option *add_diff_options(const struct option *opts,
>   			       PARSE_OPT_NONEG | PARSE_OPT_NOARG,
>   			       diff_opt_dirstat),
>   		OPT_CALLBACK_F(0, "dirstat-by-file", options, N_("<param1,param2>..."),

This line also needs changes:
N_("<param1>,<param2>...")

> -			       N_("synonym for --dirstat=files,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,

Thanks

JN