Re: [PATCH 19/22] sequencer.c: mark more strings for translation
On Sun, Jun 3, 2018 at 11:14 AM, Duy Nguyen wrote: > On Sun, Jun 3, 2018 at 10:16 AM, Eric Sunshine > wrote: >> On Sat, Jun 2, 2018 at 12:32 AM, Nguyễn Thái Ngọc Duy >> wrote: >>> Signed-off-by: Nguyễn Thái Ngọc Duy >>> - fprintf(stderr, "Could not apply %s... %.*s\n", >>> + fprintf_ln(stderr, _("Could not apply %s... %.*s"), >> >> Did you want to downcase "Could" for consistency with other error >> messages, or was this left as-is intentionally? > > I'm not sure. Others start with a prefix (like "error:", > "warning:"). This is a bit different and makes me hesitate. Yep, I realized after hitting Send that this wasn't an error/warning message so probably shouldn't be changed.
Re: [PATCH 19/22] sequencer.c: mark more strings for translation
On Sun, Jun 3, 2018 at 10:16 AM, Eric Sunshine wrote: > On Sat, Jun 2, 2018 at 12:32 AM, Nguyễn Thái Ngọc Duy > wrote: >> Signed-off-by: Nguyễn Thái Ngọc Duy >> --- >> diff --git a/sequencer.c b/sequencer.c >> @@ -2597,15 +2597,17 @@ static int error_with_patch(struct commit *commit, >> - fprintf(stderr, "You can amend the commit now, with\n" >> - "\n" >> - " git commit --amend %s\n" >> - "\n" >> - "Once you are satisfied with your changes, run\n" >> - "\n" >> - " git rebase --continue\n", >> gpg_sign_opt_quoted(opts)); >> + fprintf(stderr, >> + _("You can amend the commit now, with\n" >> + "\n" >> + " git commit --amend %s\n" >> + "\n" >> + "Once you are satisfied with your changes, run\n" >> + "\n" >> + " git rebase --continue\n"), >> + gpg_sign_opt_quoted(opts)); >> } else if (exit_code) >> - fprintf(stderr, "Could not apply %s... %.*s\n", >> + fprintf_ln(stderr, _("Could not apply %s... %.*s"), > > Did you want to downcase "Could" for consistency with other error > messages, or was this left as-is intentionally? I'm not sure. Others start with a prefix (like "error:", "warning:"). This is a bit different and makes me hesitate. -- Duy
Re: [PATCH 19/22] sequencer.c: mark more strings for translation
On Sat, Jun 2, 2018 at 12:32 AM, Nguyễn Thái Ngọc Duy wrote: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > diff --git a/sequencer.c b/sequencer.c > @@ -2597,15 +2597,17 @@ static int error_with_patch(struct commit *commit, > - fprintf(stderr, "You can amend the commit now, with\n" > - "\n" > - " git commit --amend %s\n" > - "\n" > - "Once you are satisfied with your changes, run\n" > - "\n" > - " git rebase --continue\n", > gpg_sign_opt_quoted(opts)); > + fprintf(stderr, > + _("You can amend the commit now, with\n" > + "\n" > + " git commit --amend %s\n" > + "\n" > + "Once you are satisfied with your changes, run\n" > + "\n" > + " git rebase --continue\n"), > + gpg_sign_opt_quoted(opts)); > } else if (exit_code) > - fprintf(stderr, "Could not apply %s... %.*s\n", > + fprintf_ln(stderr, _("Could not apply %s... %.*s"), Did you want to downcase "Could" for consistency with other error messages, or was this left as-is intentionally?