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?
[PATCH 19/22] sequencer.c: mark more strings for translation
Signed-off-by: Nguyễn Thái Ngọc Duy
---
sequencer.c | 26 ++
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index cca968043e..1802b49626 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -714,7 +714,7 @@ static const char *read_author_ident(struct strbuf *buf)
/* dequote values and construct ident line in-place */
for (in = out = buf->buf; i < 3 && in - buf->buf < buf->len; i++) {
if (!skip_prefix(in, keys[i], (const char **))) {
- warning("could not parse '%s' (looking for '%s'",
+ warning(_("could not parse '%s' (looking for '%s'"),
rebase_path_author_script(), keys[i]);
return NULL;
}
@@ -736,7 +736,7 @@ static const char *read_author_ident(struct strbuf *buf)
}
if (i < 3) {
- warning("could not parse '%s' (looking for '%s')",
+ warning(_("could not parse '%s' (looking for '%s')"),
rebase_path_author_script(), keys[i]);
return NULL;
}
@@ -1442,7 +1442,7 @@ static const char *command_to_string(const enum
todo_command command)
{
if (command < TODO_COMMENT)
return todo_command_info[command].str;
- die("Unknown command: %d", command);
+ die(_("unknown command: %d"), command);
}
static char command_to_char(const enum todo_command command)
@@ -2597,15 +2597,17 @@ static int error_with_patch(struct commit *commit,
if (intend_to_amend())
return -1;
- 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"),
short_commit_name(commit), subject_len, subject);
return exit_code;
@@ -2716,7 +2718,7 @@ static int do_label(const char *name, int len)
struct object_id head_oid;
if (len == 1 && *name == '#')
- return error("Illegal label name: '%.*s'", len, name);
+ return error(_("illegal label name: '%.*s'"), len, name);
strbuf_addf(_name, "refs/rewritten/%.*s", len, name);
strbuf_addf(, "rebase -i (label) '%.*s'", len, name);
--
2.18.0.rc0.309.g77c7720784
