threads / patch / 55911

patchgraph: improve grammar of "invalid color" error message

Subject: [PATCH resend] graph: improve grammar of "invalid color" error message

## tl;dr

3 messages between Jun 12, 2021 and Jun 15, 2021. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Alex Henrie· Jun 12, 2021, 18:41 UTC · lore

Without the "d", it sounds like a command, not an error, and is liable to be translated incorrectly.

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
---
Resending to make sure that this patch isn't forgotten.
---
 graph.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to graph.c +1 −1

diff --git a/graph.c b/graph.c
index c128ad0cce..e3828eb8f2 100644
--- a/graph.c
+++ b/graph.c
@@ -95,7 +95,7 @@ static void parse_graph_colors_config(struct strvec *colors, const char *string)
 		if (!color_parse_mem(start, comma - start, color))
 			strvec_push(colors, color);
 		else
-			warning(_("ignore invalid color '%.*s' in log.graphColors"),
+			warning(_("ignored invalid color '%.*s' in log.graphColors"),
 				(int)(comma - start), start);
 		start = comma + 1;
 	}

-- 
2.31.1

Bagas Sanjaya· Jun 13, 2021, 02:21 UTC · re: Alex Henrie · lore

Re: [PATCH resend] graph: improve grammar of "invalid color" error message

Hi,

On 13/06/21 01.41, Alex Henrie wrote:

> Without the "d", it sounds like a command, not an error, and is liable
> to be translated incorrectly.
>

s/liable/prone/

Show 21 quoted lines

> Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
> ---
> Resending to make sure that this patch isn't forgotten.
> ---
>   graph.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/graph.c b/graph.c
> index c128ad0cce..e3828eb8f2 100644
> --- a/graph.c
> +++ b/graph.c
> @@ -95,7 +95,7 @@ static void parse_graph_colors_config(struct strvec *colors, const char *string)
>   		if (!color_parse_mem(start, comma - start, color))
>   			strvec_push(colors, color);
>   		else
> -			warning(_("ignore invalid color '%.*s' in log.graphColors"),
> +			warning(_("ignored invalid color '%.*s' in log.graphColors"),
>   				(int)(comma - start), start);
>   		start = comma + 1;
>   	}
>

Why did you resend the patch?

-- 
An old man doll... just what I always wanted! - Clara

Junio C Hamano· Jun 15, 2021, 03:55 UTC · re: Alex Henrie · lore

Re: [PATCH resend] graph: improve grammar of "invalid color" error message

Alex Henrie <alexhenrie24@gmail.com> writes:

Show 6 quoted lines

> Without the "d", it sounds like a command, not an error, and is liable
> to be translated incorrectly.
>
> Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
> ---
> Resending to make sure that this patch isn't forgotten.

Thanks, will queue.

Show 17 quoted lines

> ---
>  graph.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/graph.c b/graph.c
> index c128ad0cce..e3828eb8f2 100644
> --- a/graph.c
> +++ b/graph.c
> @@ -95,7 +95,7 @@ static void parse_graph_colors_config(struct strvec *colors, const char *string)
>  		if (!color_parse_mem(start, comma - start, color))
>  			strvec_push(colors, color);
>  		else
> -			warning(_("ignore invalid color '%.*s' in log.graphColors"),
> +			warning(_("ignored invalid color '%.*s' in log.graphColors"),
>  				(int)(comma - start), start);
>  		start = comma + 1;
>  	}