[PATCH v4 1/9] Makefile: sort "po/git.pot" by file location
- From
Jiang Xin <worldhello.net@gmail.com>
- Date
- May 23, 2022, 15:21 UTC
- Message-ID
- <20220523152128.26380-2-worldhello.net@gmail.com>
- In-Reply-To
- <20220523012531.4505-1-worldhello.net@gmail.com>
From: Jiang Xin <zhiyou.jx@alibaba-inc.com>
We will feed xgettext with more C source files and in different order in subsequent commit. To generate a stable "po/git.pot" regardless of the number and order of input source files, we pass the option "--sort-by-file" to xgettext program.
With this update, the newly generated "po/git.pot" will have the same entries while in a different order.
With the help of a custom diff driver as shown below,
git config --global diff.gettext-fmt.textconv \
"msgcat --no-location --sort-by-file"and appending a new entry "*.pot diff=gettext-fmt" to git attributes, we can see that there are no substantial changes in "po/git.pot".
We won't checkin the newly generated "po/git.pot", because we will remove it from tree in a later commit.
Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com> --- Makefile | 1 + 1 file changed, 1 insertion(+)
diff --git a/Makefile b/Makefile index f8bccfab5e..83e968e2a4 100644 --- a/Makefile +++ b/Makefile @@ -2706,6 +2706,7 @@ XGETTEXT_FLAGS = \ --force-po \ --add-comments=TRANSLATORS: \ --msgid-bugs-address="Git Mailing List <git@vger.kernel.org>" \ + --sort-by-file \ --from-code=UTF-8 XGETTEXT_FLAGS_C = $(XGETTEXT_FLAGS) --language=C \ --keyword=_ --keyword=N_ --keyword="Q_:1,2"
-- 2.36.0.1.g15c4090757