Translation: Auto-generate po4a config file #2351
Conversation
.. whenever a new squid package is distributed. This fixes issues with outdated config files missing languages to translate and deprecated package name/version details. The file can be regenerated manually with: make -C doc/manuals manuals.conf Used by running po4a in the top-level directory from a git checkout, or release tarball: po4a [--verbose] doc/manuals/manuals.conf
yadij
added
M-cleared-for-merge
| manuals.conf: Makefile | ||
| ( \ | ||
| echo "[po4a_langs] $(LANGUAGE_FILES)" | sed -e 's%[.]lang%%g'; \ | ||
| echo -n "[options] --no-translations -o groff_code=verbatim "; \ |
There was a problem hiding this comment.
According to 2024 commit 9732312 and echo manual page on MacOS, we should avoid echo -n. I recommend merging the two echo lines instead of using -n to split them. The merged echo command will be longer, of course, but not prohibitively long.
doc/manuals/Makefile.am
Outdated
| echo -n "[options] --no-translations -o groff_code=verbatim "; \ | ||
| echo " --package-name=$(PACKAGE) --package-version=$(VERSION) "; \ | ||
| echo "[po4a_paths] doc/manuals/manuals.pot \$$lang:doc/manuals/\$$lang.po"; \ | ||
| for fname in `cd $(top_srcdir) ; git ls-files *.8 *.8.in`; do \ |
There was a problem hiding this comment.
Does make dist already depend on being run from a git repository? If not, please do not introduce that dependency.
| ( \ | ||
| echo "[po4a_langs] $(LANGUAGE_FILES)" | sed -e 's%[.]lang%%g'; \ | ||
| echo -n "[options] --no-translations -o groff_code=verbatim "; \ | ||
| echo " --package-name=$(PACKAGE) --package-version=$(VERSION) "; \ |
There was a problem hiding this comment.
Is there a way to avoid hard-coding Squid version in one more versioned controlled file (i.e. manuals.conf)? Perhaps we can keep these two options in scripts/update-pot.sh?
PR description: This fixes issues with outdated config files missing languages to translate and deprecated package name/version details.
If I change the above details (e.g., modify AC_INIT in configure.ac), bootstrap, configure, and build Squid, but do not run make dist or equivalent, then versioned manuals.conf would remain stale, right? What would prevent me from running scripts/update-pot.sh that would then use stale manuals.conf?
|
|
||
| ## po4a conversion of all doc/manuals man files... | ||
| po4a --no-translations -o groff_code=verbatim --verbose po4a.conf | ||
| po4a --verbose doc/manuals/manuals.conf |
There was a problem hiding this comment.
Please post a "diff" showing the differences between the old po4a.conf file and the new manuals.conf file (both generated in the same representative build environment). Please instruct diff to Ignore differences in space and empty lines.
rousskov
added
S-waiting-for-author
Co-authored-by: Alex Rousskov <[email protected]>
2 participants
.. whenever a new squid package is distributed.
This fixes issues with outdated config files
missing languages to translate and deprecated
package name/version details.
The file can be regenerated manually with:
make -C doc/manuals manuals.conf
Used by running po4a in the top-level directory
from a git checkout, or release tarball:
po4a [--verbose] doc/manuals/manuals.conf