From: Johannes Sixt <j6t@kdbg.org>
Date: Thu, 13 Oct 2016 20:35:15 GMT
Subject: Re: [PATCH v3 25/25] sequencer: mark all error messages for translation
Message-ID: <4f283639-7cca-c62a-b8dc-5e7dbcf8315f@kdbg.org>
In-Reply-To: <alpine.DEB.2.20.1610131518220.197091@virtualbox>

Am 13.10.2016 um 16:56 schrieb Johannes Schindelin:
> On Wed, 12 Oct 2016, Junio C Hamano wrote:
>> You have at least two independent changes relative to Dscho's
>> version.
>>
>>  (1) Show line breaks more prominently by avoiding "\n\n" and
>>      breaking the string at "\n"; this matches the way how the
>>      result would be displayed more closely to how the source looks
>>      like.
>>
>>  (2) Ignore the usual indentation rule and have messages start at
>>      the left end of the source.
>>
>> Which one are you saying "makes sense" to?  Both?
>>
>> I guess both can be grouped together into one theme: match the way
>> the final output and the source code look like.

Yes, that summarizes it pretty well.

> I agree with that motivation, but I decided to go about it in a way that
> is more in line with the existing source code:
>
> -- snipsnap --
> diff --git a/sequencer.c b/sequencer.c
> index 8e10bb5..1cf70f7 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -483,6 +483,20 @@ static char **read_author_script(void)
>  	return env;
>  }
>
> +static const char staged_changes_advice[] =
> +N_("you have staged changes in your working tree\n"
> +"If these changes are meant to be squashed into the previous commit, run:\n"
> +"\n"
> +"  git commit --amend %s\n"
> +"\n"
> +"If they are meant to go into a new commit, run:\n"
> +"\n"
> +"  git commit %s\n"
> +"\n"
> +"In both cases, once you're done, continue with:\n"
> +"\n"
> +"  git rebase --continue\n");

Much better! Thank you.

-- Hannes