Re: [RFC PATCH 6/9] rebase -i: add fixup [-C | -c] command

Hi Christian,

On Thu, 14 Jan 2021 at 14:54, Christian Couder
[off-list ref] wrote:

On Fri, Jan 8, 2021 at 10:26 AM Charvi Mendiratta [off-list ref] wrote:

quoted

@@ -1740,34 +1746,177 @@ static const char first_commit_msg_str[] =
 N_("This is the 1st commit message:");
 static const char nth_commit_msg_fmt[] =
 N_("This is the commit message #%d:");
+static const char skip_first_commit_msg_str[] =
+N_("The 1st commit message will be skipped:");
 static const char skip_nth_commit_msg_fmt[] =
 N_("The commit message #%d will be skipped:");
 static const char combined_commit_msg_str[] =
 N_("This is a combination of %d commits.");

[...]

quoted

+static void update_comment_bufs(struct strbuf *buf1, struct strbuf *buf2, int n)
+{
+       strbuf_setlen(buf1, 2);
+       strbuf_addf(buf1, nth_commit_msg_fmt, n);

Should "_(...)" be used around "nth_commit_msg_fmt" here...

quoted

+       strbuf_addch(buf1, '\n');
+       strbuf_setlen(buf2, 2);
+       strbuf_addf(buf2, skip_nth_commit_msg_fmt, n);

...and around "skip_nth_commit_msg_fmt" here?

Yes, I forgot to put  "_(...)" here for translation. I will add it, thanks.

Thanks and Regards,
Charvi

quoted

+       strbuf_addch(buf2, '\n');
+}