Re: [PATCH v2] commit-template: change a message to be more intuitive
- From
Michael J Gruber <git@grubix.eu>
- Date
- Sep 14, 2017, 07:36 UTC
- Message-ID
- <862e71a1-2dee-4a20-d828-69a0547fa5ec@grubix.eu>
- In-Reply-To
- <0102015e7b585037-5f88e775-2696-49ec-8dd9-5e1635a34607-000000@eu-west-1.amazonses.com>
Kaartic Sivaraam venit, vidit, dixit 13.09.2017 15:05:
Show 24 quoted lines
> It's not good to use the phrase 'do not touch' to convey the information
> that the cut-line should not be modified or removed as it could possibly
> be mis-interpreted by a person who doesn't know that the word 'touch' has
> the meaning of 'tamper with'. Further, it could make translations a little
> difficult as it might not have the intended meaning in a few languages when
> translated as such.
>
> So, use more intuitive terms in the sentence.
>
> Signed-off-by: Kaartic Sivaraam <kaarticsivaraam91196@gmail.com>
> ---
> wt-status.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/wt-status.c b/wt-status.c
> index 77c27c51134d2..be53579760ee7 100644
> --- a/wt-status.c
> +++ b/wt-status.c
> @@ -934,7 +934,7 @@ size_t wt_status_locate_end(const char *s, size_t len)
>
> void wt_status_add_cut_line(FILE *fp)
> {
> - const char *explanation = _("Do not touch the line above.\nEverything below will be removed.");
> + const char *explanation = _("Do not modify or remove the line above.\nEverything below will be removed.");I don't want to complicate things. But now - due to the repeated usage of "remove" - these two sentences seem to be connected by an invisible "or else" ("will" vs. "would" not withstanding). i.e. "or else everything below will be removed, too", which is wrong. Before, they were separated more clearly.
Also, given all the translations that we have, it seems somewhat strange to try and foresee and workaround possible misunderstandings of commonly used English phrases.
Show 7 quoted lines
> struct strbuf buf = STRBUF_INIT; > > fprintf(fp, "%c %s", comment_line_char, cut_line); > > -- > https://github.com/git/git/pull/401 >