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

From: Charvi Mendiratta <charvi077@gmail.com>
Date: Jan 14, 2021, 09:45 UTC
Message-ID: <CAPSFM5edZP90kYCf0fynpx+5oQ4pRuGBcrm2AmE5JKsXsS3fAQ@mail.gmail.com>
In-Reply-To: <CAP8UFD2G-2kEbajYpi7kGn=E2HriTuhKJRgs-vEDvHC7WYCGQQ@mail.gmail.com>

Hi Christian,

On Thu, 14 Jan 2021 at 14:54, Christian Couder <christian.couder@gmail.com> wrote:

Show 22 quoted lines

>
> On Fri, Jan 8, 2021 at 10:26 AM Charvi Mendiratta <charvi077@gmail.com> wrote:
>
> > @@ -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.");
>
> [...]
>
> > +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...

Show 7 quoted lines

>
> > +       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

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