summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2022-05-26 14:50:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-05-26 17:30:28 (GMT)
commit6dd9a91c324a696a0d547ff57c1fc7f4e5e9938c (patch)
tree8c5854edeb2b555704fb6049627a301c2ad0cccb /ci
parent1cc0425a27c6de542a9f09e8c5451079e4a8c6ef (diff)
downloadgit-6dd9a91c324a696a0d547ff57c1fc7f4e5e9938c.zip
git-6dd9a91c324a696a0d547ff57c1fc7f4e5e9938c.tar.gz
git-6dd9a91c324a696a0d547ff57c1fc7f4e5e9938c.tar.bz2
i18n CI: stop allowing non-ASCII source messages in po/git.pot
In the preceding commit we moved away from using xgettext(1) to both generate the po/git.pot, and to merge the incrementally generated po/git.pot+ file as we sourced translations from C, shell and Perl. Doing it this way, which dates back to my initial implementation[1][2][3] was conflating two things: With xgettext(1) the --from-code both controls what encoding is specified in the po/git.pot's header, and what encoding we allow in source messages. We don't ever want to allow non-ASCII in *source messages*, and doing so has hid e.g. a buggy message introduced in a6226fd772b (submodule--helper: convert the bulk of cmd_add() to C, 2021-08-10) from us, we'd warn about it before, but only when running "make pot", but the operation would still succeed. Now we'll error out on it when running "make pot". Since the preceding Makefile changes made this easy: let's add a "make check-pot" target with the same prerequisites as the "po/git.pot" target, but without changing the file "po/git.pot". Running it as part of the "static-analysis" CI target will ensure that we catch any such issues in the future. E.g.: $ make check-pot XGETTEXT .build/pot/po/builtin/submodule--helper.c.po xgettext: Non-ASCII string at builtin/submodule--helper.c:3381. Please specify the source encoding through --from-code. make: *** [.build/pot/po/builtin/submodule--helper.c.po] Error 1 1. cd5513a7168 (i18n: Makefile: "pot" target to extract messages marked for translation, 2011-02-22) 2. adc3b2b2767 (Makefile: add xgettext target for *.sh files, 2011-05-14) 3. 5e9637c6297 (i18n: add infrastructure for translating Git with gettext, 2011-11-18) Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ci')
-rwxr-xr-xci/run-static-analysis.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/ci/run-static-analysis.sh b/ci/run-static-analysis.sh
index 65bcebd..0d51e5c 100755
--- a/ci/run-static-analysis.sh
+++ b/ci/run-static-analysis.sh
@@ -29,4 +29,6 @@ fi
make hdr-check ||
exit 1
+make check-pot
+
save_good_tree