Refs #37833 - Fix file timestamp handling when pulling translations #10326
Conversation
This file contains 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
The Ruby gettext library wants the .po.time_stamp file to be at least as
new as the .po file. If it doesn't exist or is older, it will remove the
.edit.po file and then copy the .po file to .edit.po. In practice the
Makefile doesn't guarantee this, causing translations to be ignored.
A more concrete example what ends up happening:
make -C locale tx-pull # updates $domain.edit.po
# This all assumes $domain.po exists
if [ ! -f $domain.po.time_stamp ] -o [ $domain.po -nt $domain.po.time_stamp ] ; then
rm -f $domain.edit.po
fi
if [ ! -f $domain.edit.po ] ; then
cp $domain.po $domain.edit.po
# Merge in the new messages from the template
msgmerge --update --sort-by-file --no-wrap $domain.edit.po $domain.pot
if [ -f $domain.po ] -a [ $domain.po -nt $domain.edit.po ] ; then
msgmerge --output $domain.edit.po --sort-by-file --no-wrap --no-obsolete-entries $domain.po $domain.edit.po
fi
fi
This ensures that $domain.po.time_stamp is always the same mtime as
$domain.po which prevents the gettext library from removing the updated
$domain.edit.po file.
It means there is no message merging and we rely on Transifex for doing
that part for us.
ehelms
approved these changes
Sep 18, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The Ruby gettext library wants the
.po.time_stampfile to be at least as new as the.pofile. If it doesn't exist or is older, it will remove the.edit.pofile and then copy the.pofile to.edit.po.A more concrete example what ends up happening:
This ensures that
$domain.po.time_stampis always the same mtime as$domain.powhich prevents the gettext library from removing the updated$domain.edit.pofile.It means there is no message merging and we rely on Transifex for doing that part for us.