From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 02 Mar 2026 16:53:44 GMT
Subject: Re: [PATCH v2] doc: diff-options.adoc: make *.noprefix split translatable
Message-ID: <xmqqldga2mw7.fsf@gitster.g>
In-Reply-To: <V2_better_for_translators.43b@msgid.xyz>

kristofferhaugsbakk@fastmail.com writes:

> From: Kristoffer Haugsbakk <code@khaugsbakk.name>
>
> We cannot split single words like what we did in the previous
> commit. That is because the doc translations are processed in
> bigger chunks.
>
> Instead write the two paragraphs with the only variations being this
> configuration variable.
>
> Reported-by: Jean-Noël Avila <jn.avila@free.fr>
> Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
> ---
>
> Notes (series):
>     Notes to the maintainer: based on topic kh/format-patch-noprefix-is-boolean
>     to fix the issue reported in <ff86f877-4b75-403d-a5a4-10ab528a9691@free.fr>
>     
>     v2:
>     • fix `endif`
>     • Don’t use `TRANSLATORS` callout

Thanks.  Looking good.  Will queue on top.



>  Documentation/diff-options.adoc | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/diff-options.adoc b/Documentation/diff-options.adoc
> index 8f632d5fe1a..fcfcdf0286e 100644
> --- a/Documentation/diff-options.adoc
> +++ b/Documentation/diff-options.adoc
> @@ -859,12 +859,18 @@ endif::git-format-patch[]
>  	Do not show any source or destination prefix.
>  
>  `--default-prefix`::
> +ifdef::git-format-patch[]
>  	Use the default source and destination prefixes ("a/" and "b/").
> -	This overrides configuration variables such as
> -ifndef::git-format-patch[`diff.noprefix`,]
> -ifdef::git-format-patch[`format.noprefix`,]
> +	This overrides configuration variables such as `format.noprefix`,
>  	`diff.srcPrefix`, `diff.dstPrefix`, and `diff.mnemonicPrefix`
>  	(see linkgit:git-config[1]).
> +endif::git-format-patch[]
> +ifndef::git-format-patch[]
> +	Use the default source and destination prefixes ("a/" and "b/").
> +	This overrides configuration variables such as `diff.noprefix`,
> +	`diff.srcPrefix`, `diff.dstPrefix`, and `diff.mnemonicPrefix`
> +	(see linkgit:git-config[1]).
> +endif::git-format-patch[]
>  
>  `--line-prefix=<prefix>`::
>  	Prepend an additional _<prefix>_ to every line of output.
>
> Interdiff against v1:
>   diff --git a/Documentation/diff-options.adoc b/Documentation/diff-options.adoc
>   index e4d02cc93a9..fcfcdf0286e 100644
>   --- a/Documentation/diff-options.adoc
>   +++ b/Documentation/diff-options.adoc
>   @@ -859,7 +859,6 @@ endif::git-format-patch[]
>    	Do not show any source or destination prefix.
>    
>    `--default-prefix`::
>   -// TRANSLATORS: format.noprefix / diff.noprefix
>    ifdef::git-format-patch[]
>    	Use the default source and destination prefixes ("a/" and "b/").
>    	This overrides configuration variables such as `format.noprefix`,
>   @@ -871,7 +870,7 @@ ifndef::git-format-patch[]
>    	This overrides configuration variables such as `diff.noprefix`,
>    	`diff.srcPrefix`, `diff.dstPrefix`, and `diff.mnemonicPrefix`
>    	(see linkgit:git-config[1]).
>   -ifndef::git-format-patch[]
>   +endif::git-format-patch[]
>    
>    `--line-prefix=<prefix>`::
>    	Prepend an additional _<prefix>_ to every line of output.
>
> Range-diff against v1:
> 1:  55e56c90959 ! 1:  07acc52c3bc doc: diff-options.adoc: make *.noprefix split translatable
>     @@ Commit message
>          Instead write the two paragraphs with the only variations being this
>          configuration variable.
>      
>     -    It’s not easy to spot the difference here. So let’s leave a comment
>     -    for translators.
>     -
>          Reported-by: Jean-Noël Avila <jn.avila@free.fr>
>          Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
>      
>     +
>     + ## Notes (series) ##
>     +    Notes to the maintainer: based on topic kh/format-patch-noprefix-is-boolean
>     +    to fix the issue reported in <ff86f877-4b75-403d-a5a4-10ab528a9691@free.fr>
>     +
>     +    v2:
>     +    • fix `endif`
>     +    • Don’t use `TRANSLATORS` callout
>     +
>       ## Documentation/diff-options.adoc ##
>      @@ Documentation/diff-options.adoc: endif::git-format-patch[]
>       	Do not show any source or destination prefix.
>       
>       `--default-prefix`::
>     -+// TRANSLATORS: format.noprefix / diff.noprefix
>      +ifdef::git-format-patch[]
>       	Use the default source and destination prefixes ("a/" and "b/").
>      -	This overrides configuration variables such as
>     @@ Documentation/diff-options.adoc: endif::git-format-patch[]
>      +	This overrides configuration variables such as `diff.noprefix`,
>      +	`diff.srcPrefix`, `diff.dstPrefix`, and `diff.mnemonicPrefix`
>      +	(see linkgit:git-config[1]).
>     -+ifndef::git-format-patch[]
>     ++endif::git-format-patch[]
>       
>       `--line-prefix=<prefix>`::
>       	Prepend an additional _<prefix>_ to every line of output.
>
> base-commit: b9b583bd007ca814ebd362bdd6441aac02e9414b