Add build rules for po4a based documentation translation#1686
Merged
hansu merged 9 commits intoLinuxCNC:docs-develfrom Apr 13, 2022
Merged
Add build rules for po4a based documentation translation#1686hansu merged 9 commits intoLinuxCNC:docs-develfrom
hansu merged 9 commits intoLinuxCNC:docs-develfrom
Conversation
Collaborator
Author
|
This is the continuation of #1356 which was closed by mistake when it was pulled into a feature branch for testing on the buildbot system. |
petterreinholdtsen
force-pushed
the
translate-po4a-close
branch
from
9ba814f to
67f4c56
Compare
petterreinholdtsen
force-pushed
the
translate-po4a-close
branch
10 times, most recently
from
bd35b03 to
ccb90f8
Compare
petterreinholdtsen
changed the title
petterreinholdtsen
force-pushed
the
translate-po4a-close
branch
from
975d080 to
ccb90f8
Compare
Collaborator
Author
|
I believe this is ready to go into production now. The only unsolved issue is how to handle translated help texts, which can be solved at a later time. I know @smoe and @silopolis is working on updated PO files for spanish and french, and we might want to wait for those before merging into master or a documentation branch. |
petterreinholdtsen
added a commit
to petterreinholdtsen/linuxcnc
that referenced
this pull request
Apr 5, 2022
This script help with combining source and translated adoc and manual pages to generate PO files for use with po4a. Related to LinuxCNC#1686 .
petterreinholdtsen
force-pushed
the
translate-po4a-close
branch
2 times, most recently
from
3518d9e to
26666c2
Compare
andypugh
changed the base branch from
master
to
petterreinholdtsen/translate-po4a
andypugh
changed the base branch from
petterreinholdtsen/translate-po4a
to
master
Collaborator
|
How do you want to do it? Straight in to Master, or into a docs/po4a testing branch? |
Member
|
Good question. We thought to master after Jérémies changes are merged to master. |
petterreinholdtsen
added a commit
to petterreinholdtsen/linuxcnc
that referenced
this pull request
Apr 6, 2022
This script help with combining source and translated adoc and manual pages to generate PO files for use with po4a. Related to LinuxCNC#1686 .
petterreinholdtsen
force-pushed
the
translate-po4a-close
branch
from
26666c2 to
0b264e2
Compare
Collaborator
Author
|
[Hans]
Good question. We thought to master **after** Jérémies changes are
merged to master. But we can also have this in a test branch before.
|
Member
Collaborator
Author
|
[Hans]
Yes. But with Jérémies changes the po files have to be generated
again, so I thought it would be better to have them first in master.
Well, my reduced branch do not have the French and Spanish PO files any
more, so we can add them independent of my pull request. :)
My pull request only contain some nb translations, the rest of the PO
files included are empty.
…--
Happy hacking
Petter Reinholdtsen
|
silopolis
pushed a commit
to silopolis/linuxcnc
that referenced
this pull request
Apr 11, 2022
This script help with combining source and translated adoc and manual pages to generate PO files for use with po4a. Related to LinuxCNC#1686 .
silopolis
pushed a commit
to silopolis/linuxcnc
that referenced
this pull request
Apr 11, 2022
This script help with combining source and translated adoc and manual pages to generate PO files for use with po4a. Related to LinuxCNC#1686 .
Use 'make translateddocs' to build the translations and 'make pofiles' to update the POT and PO files. 'make postatus' show translation statistics. Run 'make manpages' before updating translations to make sure the generated manpages are available for po4a. The translateddocs target is now a prerequisit for the docs target, to make sure the translated files are available when checking links in the HTML pages. Added code to copy images into translated adoc directories. Added po4a as new build dependency. Require 0 translated strings to generate files, to make sure the documents are buildable even if nothing is unfuzzied yet. Drop translated files from docs.xml and use the same list for all languages. This change need po4a 0.62 or newer to handle UTF-8 properly in input and output files. Added configure check to enforce this.
Remove the use of roff macro definitions, as po4a do not understand this.
Link checking for non-english is not working, and as all documents are derived from the english source, it is no need to check the translated links.
petterreinholdtsen
force-pushed
the
translate-po4a-close
branch
from
9cc62e3 to
c025d9d
Compare
Member
|
Is this ok for you if it goes in |
Contributor
|
Le mar. 12 avr. 2022 à 23:27, Hans ***@***.***> a écrit :
Is this ok for you if it goes in docs-devel ?
Good for me
|
Collaborator
Author
|
[Hans]
Is this ok for you if it goes in `docs-devel` ?
Sure, as long as docs-devel end up in master when we are ready. :)
--
Happy hacking
Petter Reinholdtsen
|
Member
That's the plan :) But isn't this the merge that generates the initial po files? |
Contributor
|
Was thinking of providing initial _fr po file in the last commit of my fr_migration PR. And as I'll have to make a last pass on _es after that, I can do the same there. |
Member
|
As far as I understood, with this change to the Submakefile, the po files are generated from the existing adoc files if no po files are existing. So as long as we haven't commit any po files, this shouldn't affect your syncronization work, right? |
Contributor
|
Le mer. 13 avr. 2022 à 10:11, Hans ***@***.***> a écrit :
As far as I understood, with this change to the Submakefile, the po files
are generated from the existing adoc files if no po files are existing. So
as long as we haven't commit any po files, this shouldn't affect your
syncronization work, right?
So I'll merge it right now?
Good for me !
|
silopolis
pushed a commit
to silopolis/linuxcnc
that referenced
this pull request
May 3, 2022
This script help with combining source and translated adoc and manual pages to generate PO files for use with po4a. Related to LinuxCNC#1686 .
petterreinholdtsen
added a commit
to petterreinholdtsen/linuxcnc
that referenced
this pull request
May 31, 2022
This script help with combining source and translated adoc and manual pages to generate PO files for use with po4a. Related to LinuxCNC#1686 .
silopolis
pushed a commit
to silopolis/linuxcnc
that referenced
this pull request
May 31, 2022
This script help with combining source and translated adoc and manual pages to generate PO files for use with po4a. Related to LinuxCNC#1686 .
hansu
pushed a commit
to hansu/linuxcnc
that referenced
this pull request
Jun 1, 2022
This script help with combining source and translated adoc and manual pages to generate PO files for use with po4a. Related to LinuxCNC#1686 .
hansu
pushed a commit
to hansu/linuxcnc
that referenced
this pull request
Jun 1, 2022
This script help with combining source and translated adoc and manual pages to generate PO files for use with po4a. Related to LinuxCNC#1686 .
hansu
pushed a commit
that referenced
this pull request
Jun 3, 2022
This script help with combining source and translated adoc and manual pages to generate PO files for use with po4a. Related to #1686 .
Collaborator
Author
|
[andypugh]
How do you want to do it? Straight in to Master, or into a docs/po4a
testing branch?
Up to you, really. I am aiming for master, of course, but am happy to
get more exposure in a testing branch first as well. :)
…--
Happy hacking
Petter Reinholdtsen
|
Contributor
|
Le mar. 11 oct. 2022 à 09:10, petterreinholdtsen
***@***.***> a écrit :
[andypugh]
> How do you want to do it? Straight in to Master, or into a docs/po4a
> testing branch?
Up to you, really. I am aiming for master, of course, but am happy to
get more exposure in a testing branch first as well. :)
Already merged, isn't it ?
|
Collaborator
Author
|
[Jérémie Tarot]
Already merged, isn't it ?
Yes, 2022-04-13 by Hans.
…--
Happy hacking
Petter Reinholdtsen
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Use 'make translateddocs' to build the translations and 'make pofiles'
to update the POT and PO files. 'make postatus' show translation
statistics. Run 'make manpages' before updating translations to make sure
the generated manpages are available for po4a.
Added code to copy images into translated adoc directories.
Added po4a as new build dependency.
Require 0 translated strings to generate files, to make sure the documents are
buildable even if nothing is unfuzzied yet.
Drop translated files from docs.xml and use the same list for all languages.