[PATCH] sequencer: mark messages for translation

[PATCH] sequencer: mark messages for translation

[Alban Gruin]

Signed-off-by: Alban Gruin <alban.gruin@gmail.com>
---
 sequencer.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sequencer.c b/sequencer.c
index 6fd2674632..ba13a9a63b 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -3128,7 +3128,7 @@ static int do_exec(struct repository *r, const char *command_line)
 	const char *child_argv[] = { NULL, NULL };
 	int dirty, status;
 
-	fprintf(stderr, "Executing: %s\n", command_line);
+	fprintf(stderr, _("Executing: %s\n"), command_line);
 	child_argv[0] = command_line;
 	argv_array_pushf(&child_env, "GIT_DIR=%s", absolute_path(get_git_dir()));
 	argv_array_pushf(&child_env, "GIT_WORK_TREE=%s",
@@ -3841,7 +3841,7 @@ static int pick_commits(struct repository *r,
 					fclose(f);
 				}
 				if (!opts->quiet)
-					fprintf(stderr, "Rebasing (%d/%d)%s",
+					fprintf(stderr, _("Rebasing (%d/%d)%s"),
 						todo_list->done_nr,
 						todo_list->total_nr,
 						opts->verbose ? "\n" : "\r");
@@ -4093,7 +4093,7 @@ static int pick_commits(struct repository *r,
 			if (!opts->verbose)
 				term_clear_line();
 			fprintf(stderr,
-				"Successfully rebased and updated %s.\n",
+				_("Successfully rebased and updated %s.\n"),
 				head_ref.buf);
 		}
 
-- 
2.25.0

Re: [PATCH] sequencer: mark messages for translation

[Taylor Blau]

Hi Alban,

This looks good to me. I scratched my head for a little while wondering
about why these weren't marked for translation originally. They were
added back during the initial conversion to C. Some of the strings had
English-ism's such as "1st", "2nd", and so on, but weren't.

Johannes notes in [1] that marking those strings for translation was a
topic to be left until after v2.10.1, but I think he is busy enough that
this was easy to drop in the shuffle :-).

So, I am glad that you're addressing this. If you wanted, it may be
worthwhile to distill some of this into the patch message. But the
changes themselves look good to me.

On Sat, Mar 28, 2020 at 02:05:15PM +0100, Alban Gruin wrote:
> Signed-off-by: Alban Gruin <alban.gruin@gmail.com>
> ---
>  sequencer.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/sequencer.c b/sequencer.c
> index 6fd2674632..ba13a9a63b 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -3128,7 +3128,7 @@ static int do_exec(struct repository *r, const char *command_line)
>  	const char *child_argv[] = { NULL, NULL };
>  	int dirty, status;
>
> -	fprintf(stderr, "Executing: %s\n", command_line);
> +	fprintf(stderr, _("Executing: %s\n"), command_line);
>  	child_argv[0] = command_line;
>  	argv_array_pushf(&child_env, "GIT_DIR=%s", absolute_path(get_git_dir()));
>  	argv_array_pushf(&child_env, "GIT_WORK_TREE=%s",
> @@ -3841,7 +3841,7 @@ static int pick_commits(struct repository *r,
>  					fclose(f);
>  				}
>  				if (!opts->quiet)
> -					fprintf(stderr, "Rebasing (%d/%d)%s",
> +					fprintf(stderr, _("Rebasing (%d/%d)%s"),
>  						todo_list->done_nr,
>  						todo_list->total_nr,
>  						opts->verbose ? "\n" : "\r");
> @@ -4093,7 +4093,7 @@ static int pick_commits(struct repository *r,
>  			if (!opts->verbose)
>  				term_clear_line();
>  			fprintf(stderr,
> -				"Successfully rebased and updated %s.\n",
> +				_("Successfully rebased and updated %s.\n"),

>  				head_ref.buf);
>  		}
>
> --
> 2.25.0

Either way, if you decide to add more context to the commit message I'd
be glad, but this is probably just fine as-is, so please have my:

  Reviewed-by: Taylor Blau <me@ttaylorr.com>

Thanks,
Taylor

[1]: https://lore.kernel.org/git/alpine.DEB.2.20.1609011658300.129229@virtualbox/