{"thread":{"id":"53122","subject":"[PATCH] sequencer: mark messages for translation","startedAt":"2020-03-28T13:05:51Z","lastAt":"2020-03-30T23:59:54Z","messageCount":2,"participants":["Alban Gruin","Taylor Blau"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"394223","messageId":"20200328130515.17550-1-alban.gruin@gmail.com","threadId":"53122","inReplyTo":null,"subject":"[PATCH] sequencer: mark messages for translation","fromName":"Alban Gruin","fromEmail":"alban.gruin@gmail.com","sentAt":"2020-03-28T13:05:15Z","receivedAt":"2020-03-28T13:05:51Z","isPatch":true,"sender":{"key":"alban.gruin@gmail.com","avatar":"https://avatars.githubusercontent.com/u/6310153?v=4"},"body":"Signed-off-by: Alban Gruin <alban.gruin@gmail.com>\n---\n sequencer.c | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/sequencer.c b/sequencer.c\nindex 6fd2674632..ba13a9a63b 100644\n--- a/sequencer.c\n+++ b/sequencer.c\n@@ -3128,7 +3128,7 @@ static int do_exec(struct repository *r, const char *command_line)\n \tconst char *child_argv[] = { NULL, NULL };\n \tint dirty, status;\n \n-\tfprintf(stderr, \"Executing: %s\\n\", command_line);\n+\tfprintf(stderr, _(\"Executing: %s\\n\"), command_line);\n \tchild_argv[0] = command_line;\n \targv_array_pushf(&child_env, \"GIT_DIR=%s\", absolute_path(get_git_dir()));\n \targv_array_pushf(&child_env, \"GIT_WORK_TREE=%s\",\n@@ -3841,7 +3841,7 @@ static int pick_commits(struct repository *r,\n \t\t\t\t\tfclose(f);\n \t\t\t\t}\n \t\t\t\tif (!opts->quiet)\n-\t\t\t\t\tfprintf(stderr, \"Rebasing (%d/%d)%s\",\n+\t\t\t\t\tfprintf(stderr, _(\"Rebasing (%d/%d)%s\"),\n \t\t\t\t\t\ttodo_list->done_nr,\n \t\t\t\t\t\ttodo_list->total_nr,\n \t\t\t\t\t\topts->verbose ? \"\\n\" : \"\\r\");\n@@ -4093,7 +4093,7 @@ static int pick_commits(struct repository *r,\n \t\t\tif (!opts->verbose)\n \t\t\t\tterm_clear_line();\n \t\t\tfprintf(stderr,\n-\t\t\t\t\"Successfully rebased and updated %s.\\n\",\n+\t\t\t\t_(\"Successfully rebased and updated %s.\\n\"),\n \t\t\t\thead_ref.buf);\n \t\t}\n \n-- \n2.25.0\n\n"},{"id":"394396","messageId":"20200330235949.GC83990@syl.local","threadId":"53122","inReplyTo":"20200328130515.17550-1-alban.gruin@gmail.com","subject":"Re: [PATCH] sequencer: mark messages for translation","fromName":"Taylor Blau","fromEmail":"me@ttaylorr.com","sentAt":"2020-03-30T23:59:49Z","receivedAt":"2020-03-30T23:59:54Z","isPatch":true,"sender":{"key":"me@ttaylorr.com","avatar":"https://avatars.githubusercontent.com/u/301000140?v=4"},"body":"Hi Alban,\n\nThis looks good to me. I scratched my head for a little while wondering\nabout why these weren't marked for translation originally. They were\nadded back during the initial conversion to C. Some of the strings had\nEnglish-ism's such as \"1st\", \"2nd\", and so on, but weren't.\n\nJohannes notes in [1] that marking those strings for translation was a\ntopic to be left until after v2.10.1, but I think he is busy enough that\nthis was easy to drop in the shuffle :-).\n\nSo, I am glad that you're addressing this. If you wanted, it may be\nworthwhile to distill some of this into the patch message. But the\nchanges themselves look good to me.\n\nOn Sat, Mar 28, 2020 at 02:05:15PM +0100, Alban Gruin wrote:\n> Signed-off-by: Alban Gruin <alban.gruin@gmail.com>\n> ---\n>  sequencer.c | 6 +++---\n>  1 file changed, 3 insertions(+), 3 deletions(-)\n>\n> diff --git a/sequencer.c b/sequencer.c\n> index 6fd2674632..ba13a9a63b 100644\n> --- a/sequencer.c\n> +++ b/sequencer.c\n> @@ -3128,7 +3128,7 @@ static int do_exec(struct repository *r, const char *command_line)\n>  \tconst char *child_argv[] = { NULL, NULL };\n>  \tint dirty, status;\n>\n> -\tfprintf(stderr, \"Executing: %s\\n\", command_line);\n> +\tfprintf(stderr, _(\"Executing: %s\\n\"), command_line);\n>  \tchild_argv[0] = command_line;\n>  \targv_array_pushf(&child_env, \"GIT_DIR=%s\", absolute_path(get_git_dir()));\n>  \targv_array_pushf(&child_env, \"GIT_WORK_TREE=%s\",\n> @@ -3841,7 +3841,7 @@ static int pick_commits(struct repository *r,\n>  \t\t\t\t\tfclose(f);\n>  \t\t\t\t}\n>  \t\t\t\tif (!opts->quiet)\n> -\t\t\t\t\tfprintf(stderr, \"Rebasing (%d/%d)%s\",\n> +\t\t\t\t\tfprintf(stderr, _(\"Rebasing (%d/%d)%s\"),\n>  \t\t\t\t\t\ttodo_list->done_nr,\n>  \t\t\t\t\t\ttodo_list->total_nr,\n>  \t\t\t\t\t\topts->verbose ? \"\\n\" : \"\\r\");\n> @@ -4093,7 +4093,7 @@ static int pick_commits(struct repository *r,\n>  \t\t\tif (!opts->verbose)\n>  \t\t\t\tterm_clear_line();\n>  \t\t\tfprintf(stderr,\n> -\t\t\t\t\"Successfully rebased and updated %s.\\n\",\n> +\t\t\t\t_(\"Successfully rebased and updated %s.\\n\"),\n\n>  \t\t\t\thead_ref.buf);\n>  \t\t}\n>\n> --\n> 2.25.0\n\nEither way, if you decide to add more context to the commit message I'd\nbe glad, but this is probably just fine as-is, so please have my:\n\n  Reviewed-by: Taylor Blau <me@ttaylorr.com>\n\nThanks,\nTaylor\n\n[1]: https://lore.kernel.org/git/alpine.DEB.2.20.1609011658300.129229@virtualbox/\n"}]}