git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* [PATCH] graph: improve grammar of "invalid color" error message
@ 2021-05-09 21:22 Alex Henrie
  2021-05-09 22:02 ` Eric Sunshine
  0 siblings, 1 reply; 4+ messages in thread
From: Alex Henrie @ 2021-05-09 21:22 UTC (permalink / raw)
  To: git, pclouds, gitster; +Cc: Alex Henrie

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>
---
 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;
 	}
-- 
2.31.1


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] graph: improve grammar of "invalid color" error message
  2021-05-09 21:22 [PATCH] graph: improve grammar of "invalid color" error message Alex Henrie
@ 2021-05-09 22:02 ` Eric Sunshine
  2021-05-09 23:06   ` Alex Henrie
  2021-05-10  6:10   ` Junio C Hamano
  0 siblings, 2 replies; 4+ messages in thread
From: Eric Sunshine @ 2021-05-09 22:02 UTC (permalink / raw)
  To: Alex Henrie
  Cc: Git List, Nguyễn Thái Ngọc Duy, Junio C Hamano

On Sun, May 9, 2021 at 5:23 PM Alex Henrie <alexhenrie24@gmail.com> wrote:
> 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>
> ---
> diff --git a/graph.c b/graph.c
> @@ -95,7 +95,7 @@ static void parse_graph_colors_config(struct strvec *colors, const char *string)
> -                       warning(_("ignore invalid color '%.*s' in log.graphColors"),
> +                       warning(_("ignored invalid color '%.*s' in log.graphColors"),

Another possibility: "ignoring invalid color ... in ..."

Even better: "invalid color ... in ..."

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] graph: improve grammar of "invalid color" error message
  2021-05-09 22:02 ` Eric Sunshine
@ 2021-05-09 23:06   ` Alex Henrie
  2021-05-10  6:10   ` Junio C Hamano
  1 sibling, 0 replies; 4+ messages in thread
From: Alex Henrie @ 2021-05-09 23:06 UTC (permalink / raw)
  To: Eric Sunshine
  Cc: Git List, Nguyễn Thái Ngọc Duy, Junio C Hamano

On Sun, May 9, 2021 at 4:03 PM Eric Sunshine <sunshine@sunshineco.com> wrote:
>
> On Sun, May 9, 2021 at 5:23 PM Alex Henrie <alexhenrie24@gmail.com> wrote:
> > 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>
> > ---
> > diff --git a/graph.c b/graph.c
> > @@ -95,7 +95,7 @@ static void parse_graph_colors_config(struct strvec *colors, const char *string)
> > -                       warning(_("ignore invalid color '%.*s' in log.graphColors"),
> > +                       warning(_("ignored invalid color '%.*s' in log.graphColors"),
>
> Another possibility: "ignoring invalid color ... in ..."
>
> Even better: "invalid color ... in ..."

Any of those would be fine. I don't have a strong opinion.

-Alex

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] graph: improve grammar of "invalid color" error message
  2021-05-09 22:02 ` Eric Sunshine
  2021-05-09 23:06   ` Alex Henrie
@ 2021-05-10  6:10   ` Junio C Hamano
  1 sibling, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2021-05-10  6:10 UTC (permalink / raw)
  To: Eric Sunshine
  Cc: Alex Henrie, Git List, Nguyễn Thái Ngọc Duy

Eric Sunshine <sunshine@sunshineco.com> writes:

> On Sun, May 9, 2021 at 5:23 PM Alex Henrie <alexhenrie24@gmail.com> wrote:
>> 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>
>> ---
>> diff --git a/graph.c b/graph.c
>> @@ -95,7 +95,7 @@ static void parse_graph_colors_config(struct strvec *colors, const char *string)
>> -                       warning(_("ignore invalid color '%.*s' in log.graphColors"),
>> +                       warning(_("ignored invalid color '%.*s' in log.graphColors"),
>
> Another possibility: "ignoring invalid color ... in ..."
>
> Even better: "invalid color ... in ..."

The last one, if it does not say what we did to that invalid thing,
is not as helpful as Alex's or your "another possibility".

Betweein "ignored" vs "ignoring", I do not have a preference, but
whichever one is more prevalent in our existing messages should be
used, I would think.

Thanks.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-05-10  6:10 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-09 21:22 [PATCH] graph: improve grammar of "invalid color" error message Alex Henrie
2021-05-09 22:02 ` Eric Sunshine
2021-05-09 23:06   ` Alex Henrie
2021-05-10  6:10   ` Junio C Hamano

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).