Make cms.pot string order consistent, update .pot and .po files - #1512
Merged
Conversation
veluca93
approved these changes
Aug 16, 2025
Member
Author
|
looks like a majority of the diffs are because our babel setup is configured to word-wrap at 79 chars (whereas the previous .po files from onesky were unwrapped). reading Weblate docs, it seems they have options for a width of 77 chars, or only wrapping at \n, or no wrapping at all. I think it'd make sense to configure our babel to emit the same format that weblate would use, as otherwise weblate might try to reformat the .po files (again causing unnecessarily large diffs). So, I think we should probably just disable line wrapping altogether. It's not that useful for manual editing either; all text editors have word-wrap built in these days. @veluca93 what do you think? |
Contributor
|
I am fine with that. |
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
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.
By default,
./setup.py extract_messageswill generate the .pot file in basically a random order (depending on the order of os.listdir, which returns the files in whichever order they are actually stored on disk). This means running extract_messages effectively shuffles the .pot file, generating an unnecessarily large diff and introducing merge conflicts.To fix this, I added
sort_by_file: 1to the extract_messages settings in setup.cfg, which sorts the strings in the .pot file by the filepath they are used in.I then also ran extract_messages. Of course, because the order changed again, this commit once again does some arbitrary shuffling of the strings, but hopefully this is the last time it happens :)
I also ran update_catalog for all languages; hopefully this makes new strings show up on Weblate properly.