Re: [PATCH v3 25/25] sequencer: mark all error messages for translation
- From
Johannes Sixt <j6t@kdbg.org>
- Date
- Oct 12, 2016, 20:46 UTC
- Message-ID
- <d24a3823-1ed0-ad97-f02d-febab7a97590@kdbg.org>
- In-Reply-To
- <e38bf77ff57d06ca3250bc3ec71a34088b49abd0.1476120229.git.johannes.schindelin@gmx.de>
Am 10.10.2016 um 19:26 schrieb Johannes Schindelin:
Show 43 quoted lines
> There was actually only one error message that was not yet marked for
> translation.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> sequencer.c | 23 +++++++++++++----------
> 1 file changed, 13 insertions(+), 10 deletions(-)
>
> diff --git a/sequencer.c b/sequencer.c
> index 676f16c..86d86ce 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -515,16 +515,19 @@ static int run_git_commit(const char *defmsg, struct replay_opts *opts,
> if (!env) {
> const char *gpg_opt = gpg_sign_opt_quoted(opts);
>
> - return error("you have staged changes in your working "
> - "tree. If these changes are meant to be\n"
> - "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", gpg_opt, gpg_opt);
> + return error(_("you have staged changes in your "
> + "working tree. If these changes are "
> + "meant to be\n"
> + "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"),
> + gpg_opt, gpg_opt);
> }
> }
>
> Can we please have the following change instead? I think it makes sense to deviate from the usual conventions in a case like this.
Note that this is an error() text, hence, there should not be a fullstop on the first line. That's now a good excuse to start the next sentence on a new line; hence, this is not a faithful conversion to _() anymore (a will happily take authorship and all blame if you don't want to for this reason). Also note that _( is not moved to the beginning of the line because it would be picked up as hunk header by git diff.
---- 8< ---- From: Johannes Schindelin <johannes.schindelin@gmx.de> Subject: [PATCH] sequencer: mark all error messages for translation
There was actually only one error message that was not yet marked for translation.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Johannes Sixt <j6t@kdbg.org> --- sequencer.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/sequencer.c b/sequencer.c index 95a382e..79f7aa4 100644 --- a/sequencer.c +++ b/sequencer.c @@ -515,16 +515,20 @@ static int run_git_commit(const char *defmsg, struct replay_opts *opts, if (!env) { const char *gpg_opt = gpg_sign_opt_quoted(opts); - return error("you have staged changes in your working " - "tree. If these changes are meant to be\n" - "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", gpg_opt, gpg_opt); + return error(_( +"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"), + gpg_opt, gpg_opt); } }
-- 2.10.0.343.g37bc62b