Re: [PATCH v2 0/9] Incremental po/git.pot update and new l10n workflow

From: Jiang Xin <worldhello.net@gmail.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: "Junio C Hamano" <gitster@pobox.com>,
	"Git List" <git@vger.kernel.org>,
	"Jiang Xin" <zhiyou.jx@alibaba-inc.com>,
	"Alexander Shopov" <ash@kambanaria.org>,
	"Jordi Mas" <jmas@softcatala.org>,
	"Matthias Rüster" <matthias.ruester@gmail.com>,
	"Jimmy Angelakos" <vyruss@hellug.gr>,
	"Christopher Díaz" <christopher.diaz.riv@gmail.com>,
	"Jean-Noël Avila" <jn.avila@free.fr>,
	"Bagas Sanjaya" <bagasdotme@gmail.com>,
	"Alessandro Menti" <alessandro.menti@alessandromenti.it>,
	"Gwan-gyeong Mun" <elongbug@gmail.com>, Arusekk <arek_koz@o2.pl>,
	"Daniel Santos" <dacs.git@brilhante.top>,
	"Dimitriy Ryazantcev" <DJm00n@mail.ru>,
	"Peter Krefting" <peter@softwolves.pp.se>,
	"Emir SARI" <bitigchi@me.com>,
	"Trần Ngọc Quân" <vnwildman@gmail.com>,
	"Fangyi Zhou" <me@fangyi.io>, "Yi-Jyun Pan" <pan93412@gmail.com>
Subject: Re: [PATCH v2 0/9] Incremental po/git.pot update and new l10n workflow
Date: Thu, 19 May 2022 22:32:31 +0800	[thread overview]
Message-ID: <CANYiYbEj_G=Zm4ybLB=DhwXSMo7jFC+rf57m=vnFObbgOnqzrg@mail.gmail.com> (raw)
In-Reply-To: <220519.864k1l6c2j.gmgdl@evledraar.gmail.com>

On Thu, May 19, 2022 at 6:39 PM Ævar Arnfjörð Bjarmason
<avarab@gmail.com> wrote:
> Thanks a lot for picking this up. I left some detailed comments on
> individual commits.
>
> My own latest WIP version of an approximation of this topic was
> https://github.com/avar/git/tree/avar/Makefile-incremental-po-git-pot-rule,
> which is what I used for some of the range-diffs.
>
> (I think the first E-Mail I sent had a range-diff against the latest
> version I found in your fork, but I found that was probably the v1
> version, but I think those comments applied to your v2 (which I read
> on-list))
>
> Aside from differences already noted I spotted that your "make pot" ends
> up with a po/git.pot that has a header, but I omitted it in
> mine. Perhaps that explains some of the headers in 8/9? I.e. we don't
> need the header on po/git.pot, perhaps that explains the difference
> noted in my comment in 8/9?
>
> Also: shouldn't "make clean" remove the generated po/git.pot and
> po/git-core.pot? I see you added it to "distclean", maybe that's better
> (or maybe that's from a version of mine...).
>
> Just from some last minute testing I think you want this squashed in
> (and move that "sed" to the "init" and/or "update" of the individual
> po/XX.po files):
>
>         diff --git a/Makefile b/Makefile
>         index 65a7558261a..57db37db556 100644
>         --- a/Makefile
>         +++ b/Makefile
>         @@ -2778,14 +2778,7 @@ $(LOCALIZED_PERL_GEN_PO): .build/pot/po/%.po: %
>                 $(QUIET_XGETTEXT)$(XGETTEXT) --omit-header \
>                         -o$@ $(XGETTEXT_FLAGS_PERL) $<
>
>         -.build/pot/git.header: $(LOCALIZED_ALL_GEN_PO)
>         -       $(call mkdir_p_parent_template)
>         -       $(QUIET_XGETTEXT)$(XGETTEXT) $(XGETTEXT_FLAGS_C) \
>         -               -o - /dev/null | \
>         -       sed -e 's|charset=CHARSET|charset=UTF-8|g' >$@ && \
>         -       echo '"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\\n"' >>$@
>         -
>         -po/git.pot: .build/pot/git.header $(LOCALIZED_ALL_GEN_PO)
>         +po/git.pot: $(LOCALIZED_ALL_GEN_PO)
>                 $(QUIET_GEN)$(MSGCAT) $(MSGCAT_FLAGS) $^ >$@
>
>          .PHONY: pot
>
> I.e. we can just msgcat po/git.pot without the header. For both
> "po-init" and "po-update" that seems to do the right thing for me...

Benefits of having a header for "po/git.pot" file:
1. Have a nice field "Project-Id-Version: Git" in the head of a new
    generated po file.
2. We can identify the base version of "po/git.pot" by inspecting
    the "POT-Creation-Date" field in the header of a po file.