Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge po #631

Merged
merged 10 commits into from
Dec 18, 2024
Merged

Merge po #631

merged 10 commits into from
Dec 18, 2024

Conversation

doniks
Copy link
Collaborator

@doniks doniks commented Dec 16, 2024

No description provided.

@doniks doniks linked an issue Dec 16, 2024 that may be closed by this pull request
@doniks doniks marked this pull request as ready for review December 16, 2024 16:55
@doniks doniks requested a review from peat-psuwit December 16, 2024 16:59
@doniks
Copy link
Collaborator Author

doniks commented Dec 16, 2024

@peat-psuwit @Danfro ready for review

to demonstrate that the structure should be ok:

@doniks
Copy link
Collaborator Author

doniks commented Dec 16, 2024

btw. I'd prefer the commits not be squashed. they are not all 100% clean, but still explain the pot surgery better than if they were squashed

Copy link
Contributor

@peat-psuwit peat-psuwit left a comment

Choose a reason for hiding this comment

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

I think they look good. But if you prefer the commits not to be squashed, then please also cleanup git commit messages. For example, "unbreakeroo" is not a good commit message. git rebase -i is a good tool to do that.

Actually, preferably the commits themselves should also be cleaned up. But I guess that could be more complicated.

merge_po.sh Outdated Show resolved Hide resolved
merge_po.sh Outdated Show resolved Hide resolved
@doniks
Copy link
Collaborator Author

doniks commented Dec 17, 2024

okok. I'll clean it up

Peter Putz added 9 commits December 17, 2024 11:35
by running ./update-translations.sh
not sure what this was supposed to do, but right now it does nothing and seems unnecessary
remove bits that msgcat is complaining about in preparation to run merge_po.sh
instead of one per language AND section
just one per language

done by using merge_po.sh
by rerunning update-translations.sh again to make sphinx generate the single pot
then add this and remove the old ones
@doniks
Copy link
Collaborator Author

doniks commented Dec 17, 2024

ok. now it comes as a clean commit history that accurately documents the steps performed for this pot surgery. @peat-psuwit please re-review

@peat-psuwit peat-psuwit merged commit 161f849 into master Dec 18, 2024
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.

merge translations into a single file per language
2 participants