Skip to content

fix: resolve {build_dir} in translated pages - #2198

Merged
dscho merged 1 commit into
git:gh-pagesfrom
yangzhg:fix/l10n-build-dir-includes
Aug 31, 2026
Merged

fix: resolve {build_dir} in translated pages#2198
dscho merged 1 commit into
git:gh-pagesfrom
yangzhg:fix/l10n-build-dir-includes

Conversation

@yangzhg

@yangzhg yangzhg commented Aug 27, 2026

Copy link
Copy Markdown
Contributor

The translated manual page updater leaves {build_dir} in include paths, so the command lists are replaced by missing-file warnings.

Resolve those includes from the language directory. Regular relative includes still use the directory of the source file.

I checked the current git-html-l10n data for es, fr, pt_BR, ru, sv, uk, and zh_HANS-CN, including nested config/merge.adoc files where available. The legacy .txt path still works as well.

Fixes #2197

@yangzhg yangzhg changed the title update-docs: resolve {build_dir} in translated pages fix: resolve {build_dir} in translated pages Aug 28, 2026
@yangzhg

yangzhg commented Aug 28, 2026

Copy link
Copy Markdown
Contributor Author

@dscho Could you please review this PR? Thanks!

Comment thread script/update-docs.rb Outdated
Comment thread script/update-docs.rb Outdated
Comment thread script/update-docs.rb
Comment thread script/update-docs.rb Outdated
Translated documents are stored below a language directory. Ordinary
includes are relative to the including file, while {build_dir} points
to that language directory.

Keep the directory from the initial document while recursively expanding
includes and use it only when {build_dir} is present.

Fixes git#2197

Signed-off-by: Yang Zhengguo <yangzhgg@gmail.com>
@yangzhg
yangzhg force-pushed the fix/l10n-build-dir-includes branch from 781aa13 to e7b87ae Compare August 31, 2026 03:29
@yangzhg

yangzhg commented Aug 31, 2026

Copy link
Copy Markdown
Contributor Author

@dscho I addressed the review comments and updated the commit. Could you take another look?

@humh25

This comment was marked as spam.

@dscho dscho left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! Thank you for addressing my comments!

@dscho
dscho merged commit 8f21dd2 into git:gh-pages Aug 31, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Localized git manpages fail to expand {build_dir} includes

3 participants