Improve i18n_tool.py update-from-weblate #5863
Merged
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
rmol
added
i18n
When committing changes to a .po file, the script assumed that it would always have committed the last change as part of the update-from-weblate task. If the file were changed outside of that workflow, and the commit message wasn't structured as expected, the script would be unable to gather translator credits correctly. This changes the script to look past the last commit until it finds one of its commit messages.
rmol
force-pushed
the
fix-update-from-weblate-credits
branch
from
7aa1302 to
12149f9
Compare
kushaldas
suggested changes
Apr 16, 2021
There was a problem hiding this comment.
During the test steps, all looked okay. But, git diff develop -- securedrop/translations showed me the difference between the branches. I think that is what it should show, but @rmol said it should not.
I will defer the approve part till we have a quick chat about it, but, otherwise the PR is great.
|
Ah, the translations have changed on develop since I wrote the test plan, and I should have asked you to compare to 1.8.0 in the first place. Use |
|
Merging per discussion in standup. |
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.
Status
Ready for review
Description of Changes
When committing changes to a .po file, the script assumed that it would always have committed the last change as part of the update-from-weblate task. If the file were changed outside of that workflow, and the commit message wasn't structured as expected, the script would be unable to gather translator credits correctly.
This changes the script to look past the last commit until it finds one of its commit messages.
Testing
git checkout -b credit-check aee4ffa6ci18n_tool.pyfrom this branch:git checkout origin/fix-update-from-weblate-credits -- securedrop/i18n_tool.pyHEADto avoid that change being picked up by theupdate-from-weblatetask (just speeds things up):git reset HEADsecuredrop/bin/dev-shell ./i18n_tool.py --verbose update-from-weblategit diff develop -- securedrop/translationsshould report no changessecuredrop/bin/dev-shell ./i18n_tool.py list-translators --target 2e52ab4e0 --since 1.7.1should match the lists of contributors per language in the commit messages shown bygit log aee4ffa6c..securedrop/bin/dev-shell ./i18n_tool.py list-translators --allshould work, reporting many many contributorsDeployment
No production implications.
Checklist
If you made non-trivial code changes:
Choose one of the following: